2.0.16

修正iOS上偶尔的initialContentOffset错误的问题。

Author: ATShiTou

src/ios/SpringScrollView/STSpringScrollView.m

@@ -17,6 +17,7 @@ @interface STSpringScrollView ()
 @property(nonatomic, assign) BOOL orgScrollEnabled;
 @property(nonatomic, copy) NSDictionary *initialContentOffset;
 @property(nonatomic, assign) BOOL allLoaded;
+@property(nonatomic, assign) BOOL initialed;
 @end
 
 @implementation STSpringScrollView
@@ -29,9 +30,22 @@ - (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher{
 }
 
 - (void)setInitialContentOffset:(NSDictionary *)initialContentOffset{
- if (!_initialContentOffset && initialContentOffset) {
- _initialContentOffset = initialContentOffset;
- [self.scrollView setContentOffset:CGPointMake([[initialContentOffset objectForKey:@"x"] floatValue], [[initialContentOffset objectForKey:@"y"] floatValue])];
+ _initialContentOffset = initialContentOffset;
+ if (!self.initialed) {
+ self.initialed = YES;
+ [self.scrollView addObserver:self forKeyPath:@"contentSize" options:NSKeyValueObservingOptionNew context:nil];
+ }
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context{
+ CGSize size = [change[NSKeyValueChangeNewKey] CGSizeValue];
+ float x = [[self.initialContentOffset objectForKey:@"x"] floatValue];
+ float y = [[self.initialContentOffset objectForKey:@"y"] floatValue];
+ if ([keyPath isEqualToString:@"contentSize"] && size.width > x && size.height>y ) {
+ [self.scrollView removeObserver:self forKeyPath:@"contentSize"];
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self.scrollView setContentOffset:CGPointMake(x, y)];
+ });
  }
 }
 
@@ -73,7 +87,7 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
 - (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView{
  if (!UIEdgeInsetsEqualToEdgeInsets(scrollView.contentInset, self.orgInsets) && ([self hitRefreshStatus:@[@"waiting"]] || [self hitLoadingStatus:@[@"waiting"]])) {
  scrollView.contentInset = self.orgInsets;
-// scrollView.scrollEnabled = self.orgScrollEnabled;
+ // scrollView.scrollEnabled = self.orgScrollEnabled;
  }
 }
 
@@ -82,16 +96,16 @@ - (void)endRefresh {
  self.refreshStatus = @"rebound";
  [self.scrollView setContentOffset:CGPointMake(0, 0) animated:YES];
  self.orgScrollEnabled = self.scrollView.scrollEnabled;
-// self.scrollView.scrollEnabled = NO;
+ // self.scrollView.scrollEnabled = NO;
  }
 }
 
 - (void)endLoading {
  if ([self hitLoadingStatus:@[@"loading"]]) {
  self.loadingStatus = @"rebound";
  [self.scrollView setContentOffset:CGPointMake(0, self.scrollView.contentSize.height-self.bounds.size.height) animated:YES];
-// self.orgScrollEnabled = self.scrollView.scrollEnabled;
-// self.scrollView.scrollEnabled = NO;
+ // self.orgScrollEnabled = self.scrollView.scrollEnabled;
+ // self.scrollView.scrollEnabled = NO;
  }
 }
 

src/package.json

@@ -1,6 +1,6 @@
 {
  "name": "react-native-spring-scrollview",
- "version": "2.0.15",
+ "version": "2.0.16",
  "description": "An cross-platform (iOS & Android) spring ScrollView",
  "main": "index.js",
  "scripts": {