1.修改了AsyncStorage的导入

2.修改了iOS刷新回弹不自然的问题

Author: bolan9999

Examples/RefreshAndLoadingExample.js

@@ -45,8 +45,8 @@ export class RefreshAndLoadingExample extends React.Component {
         onLoading={this._onLoading}
         // onScroll={()=>console.log("RefreshAndLoadingExample onScroll")}
         // allLoaded={this.state.allLoaded}
-        refreshHeader={CommonLottieHeader}
-        loadingFooter={CommonLottieFooter}>
+        refreshHeader={ChineseWithLastDateHeader}
+        loadingFooter={ChineseWithLastDateFooter}>
         <TouchableOpacity
           style={styles.text}
           onPress={() => this._scrollView.beginRefresh()}>

docs/zh-cn/_sidebar.md

@@ -1,18 +1,26 @@
-* [Version 2 (Latest)](zh-cn/README)
+<!--
+ * @Author: 石破天惊
+ * @email: shanshang130@gmail.com
+ * @Date: 2020-11-05 10:44:46
+ * @LastEditTime: 2021-07-22 10:23:40
+ * @LastEditors: 石破天惊
+ * @Description: 
+-->
+* [Version 3 (Latest)](zh-cn/README)
     * [欢迎](zh-cn/README)
-    * [快速接入](zh-cn/V2/GettingStart)
-    * [简单使用](zh-cn/V2/Usage)
+    * [快速接入](zh-cn/V3/GettingStart)
+    * [简单使用](zh-cn/V3/Usage)
     * SpringScrollView
-        * [概述](zh-cn/V2/BasicContent)
-        * [基本控制](zh-cn/V2/BasicControl)
-        * [下拉刷新](zh-cn/V2/Refresh)
-        * [自定义下拉刷新](zh-cn/V2/CustomRefresh)
-        * [上拉加载](zh-cn/V2/Loading)
-        * [自定义上拉加载](zh-cn/V2/CustomLoading)
-        * [滑动 & 监听滑动](zh-cn/V2/Scroll)
-        * [其他事件](zh-cn/V2/Event)
-        * [处理键盘遮挡](zh-cn/V2/TextInput)
-        * [已知问题](zh-cn/V2/KnownIssues)
+        * [概述](zh-cn/V3/BasicContent)
+        * [基本控制](zh-cn/V3/BasicControl)
+        * [下拉刷新](zh-cn/V3/Refresh)
+        * [自定义下拉刷新](zh-cn/V3/CustomRefresh)
+        * [上拉加载](zh-cn/V3/Loading)
+        * [自定义上拉加载](zh-cn/V3/CustomLoading)
+        * [滑动 & 监听滑动](zh-cn/V3/Scroll)
+        * [其他事件](zh-cn/V3/Event)
+        * [处理键盘遮挡](zh-cn/V3/TextInput)
+        * [已知问题](zh-cn/V3/KnownIssues)
     * [LargeList](https://bolan9999.github.io/react-native-largelist/#/)
     * 注意事项
 

ios/Podfile

@@ -21,7 +21,7 @@ target 'SSVExample' do
   #
   # Note that if you have use_frameworks! enabled, Flipper will not work and
   # you should disable the next line.
-  use_flipper!()
+  use_flipper!({'Flipper' => '0.75.1', 'Flipper-Folly' => '2.5.3', 'Flipper-RSocket' => '1.3.1'})
 
   post_install do |installer|
     react_native_post_install(installer)

ios/Podfile.lock

@@ -336,6 +336,8 @@ PODS:
     - React-cxxreact (= 0.64.2)
     - React-jsi (= 0.64.2)
     - React-perflogger (= 0.64.2)
+  - RNCAsyncStorage (1.15.5):
+    - React-Core
   - Yoga (1.14.0)
   - YogaKit (1.18.1):
     - Yoga (~> 1.14)
@@ -344,25 +346,25 @@ DEPENDENCIES:
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
-  - Flipper (~> 0.75.1)
+  - Flipper (= 0.75.1)
   - Flipper-DoubleConversion (= 1.1.7)
-  - Flipper-Folly (~> 2.5.3)
+  - Flipper-Folly (= 2.5.3)
   - Flipper-Glog (= 0.3.6)
   - Flipper-PeerTalk (~> 0.0.4)
-  - Flipper-RSocket (~> 1.3)
-  - FlipperKit (~> 0.75.1)
-  - FlipperKit/Core (~> 0.75.1)
-  - FlipperKit/CppBridge (~> 0.75.1)
-  - FlipperKit/FBCxxFollyDynamicConvert (~> 0.75.1)
-  - FlipperKit/FBDefines (~> 0.75.1)
-  - FlipperKit/FKPortForwarding (~> 0.75.1)
-  - FlipperKit/FlipperKitHighlightOverlay (~> 0.75.1)
-  - FlipperKit/FlipperKitLayoutPlugin (~> 0.75.1)
-  - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.75.1)
-  - FlipperKit/FlipperKitNetworkPlugin (~> 0.75.1)
-  - FlipperKit/FlipperKitReactPlugin (~> 0.75.1)
-  - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.75.1)
-  - FlipperKit/SKIOSNetworkPlugin (~> 0.75.1)
+  - Flipper-RSocket (= 1.3.1)
+  - FlipperKit (= 0.75.1)
+  - FlipperKit/Core (= 0.75.1)
+  - FlipperKit/CppBridge (= 0.75.1)
+  - FlipperKit/FBCxxFollyDynamicConvert (= 0.75.1)
+  - FlipperKit/FBDefines (= 0.75.1)
+  - FlipperKit/FKPortForwarding (= 0.75.1)
+  - FlipperKit/FlipperKitHighlightOverlay (= 0.75.1)
+  - FlipperKit/FlipperKitLayoutPlugin (= 0.75.1)
+  - FlipperKit/FlipperKitLayoutTextSearchable (= 0.75.1)
+  - FlipperKit/FlipperKitNetworkPlugin (= 0.75.1)
+  - FlipperKit/FlipperKitReactPlugin (= 0.75.1)
+  - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.75.1)
+  - FlipperKit/SKIOSNetworkPlugin (= 0.75.1)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
   - hermes-engine (~> 0.7.2)
   - libevent (~> 2.1.12)
@@ -394,6 +396,7 @@ DEPENDENCIES:
   - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
   - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
+  - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
@@ -471,6 +474,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/runtimeexecutor"
   ReactCommon:
     :path: "../node_modules/react-native/ReactCommon"
+  RNCAsyncStorage:
+    :path: "../node_modules/@react-native-async-storage/async-storage"
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
@@ -516,9 +521,10 @@ SPEC CHECKSUMS:
   React-RCTVibration: 24600e3b1aaa77126989bc58b6747509a1ba14f3
   React-runtimeexecutor: a9904c6d0218fb9f8b19d6dd88607225927668f9
   ReactCommon: 149906e01aa51142707a10665185db879898e966
+  RNCAsyncStorage: 56a3355a10b5d660c48c6e37325ac85ebfd09885
   Yoga: 575c581c63e0d35c9a83f4b46d01d63abc1100ac
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 447da2e27626338924b8bd96eef9f5189c84b5ec
+PODFILE CHECKSUM: 40bc489f0bc8dc46e82b34bda8328e7ba2641418
 
 COCOAPODS: 1.10.1

ios/SSVExample.xcodeproj/project.pbxproj

@@ -536,6 +536,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = U38WZMUDZ2;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = SSVExample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -563,6 +564,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = U38WZMUDZ2;
 				INFOPLIST_FILE = SSVExample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

package.json

@@ -10,6 +10,7 @@
     "lint": "eslint ."
   },
   "dependencies": {
+    "@react-native-async-storage/async-storage": "^1.15.5",
     "lottie-ios": "3.1.8",
     "lottie-react-native": "^4.0.2",
     "react": "17.0.1",

src/Customize/WithLastDateFooter.js

@@ -8,9 +8,10 @@
  */
 
 import React from "react";
-import { Text, StyleSheet, AsyncStorage } from "react-native";
+import { Text, StyleSheet } from "react-native";
 import { HeaderStatus } from "../RefreshHeader";
 import {NormalFooter} from "../NormalFooter";
+import AsyncStorage from '@react-native-async-storage/async-storage';
 
 const LoadingKey = "org.bolan9999.spring_scrollview.loading_time";
 

src/Customize/WithLastDateHeader.js

@@ -8,9 +8,10 @@
  */
 
 import React from "react";
-import { Text, StyleSheet, AsyncStorage } from "react-native";
+import { Text, StyleSheet } from "react-native";
 import { NormalHeader } from "../NormalHeader";
 import { HeaderStatus } from "../RefreshHeader";
+import AsyncStorage from '@react-native-async-storage/async-storage';
 
 const RefreshKey = "org.bolan9999.spring_scrollview.refresh_time";
 

src/Customize/index.js

@@ -13,3 +13,5 @@ export * from "./WithLastDateHeader";
 export * from "./ChineseWithLastDateHeader";
 export * from "./WithLastDateFooter";
 export * from "./ChineseWithLastDateFooter";
+export * from "./CommonLottieHeader";
+export * from "./CommonLottieFooter";

src/ios/SpringScrollView/STSpringScrollView.m

@@ -69,7 +69,6 @@ - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView{
 
 - (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate{
   [super scrollViewDidEndDragging:scrollView willDecelerate:decelerate];
-  self.dragging = NO;
   if ([self shouldLoad]) {
     self.loadingStatus = @"loading";
     CGFloat fill = .0f;
@@ -107,6 +106,12 @@ - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView
     targetContentOffset->y = round((self.scrollView.contentOffset.y - displacement)/[self getPageHeight])*[self getPageHeight];
     return;
   }
+  self.dragging = NO;
+  if([self shouldRefresh]){
+    self.scrollView.contentInset = UIEdgeInsetsMake(self.refreshHeaderHeight, 0, 0, 0);
+    targetContentOffset->y = -self.refreshHeaderHeight;
+    self.refreshStatus = @"refreshing";
+  }
   [super scrollViewWillEndDragging:scrollView withVelocity:velocity targetContentOffset:targetContentOffset];
 }
 

src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-spring-scrollview",
-  "version": "3.0.1",
+  "version": "3.0.1-rc.1",
   "description": "A cross-platform (iOS & Android) spring ScrollView",
   "main": "index.js",
   "scripts": {
@@ -21,7 +21,11 @@
   "license": "MIT",
   "peerDependencies": {
     "react": "^16.3.1",
-    "react-native": "^0.50.0",
-    "lottie-react-native":"latest"
+    "react-native": "^0.60.0"
+  },
+  "optionalDependencies":{
+    "lottie-ios": "3.1.8",
+    "lottie-react-native": "^4.0.2",
+    "@react-native-community/async-storage": "^1.12.1"
   }
 }