* [iOS] bugfix that waterfall component cannot scroll

apache · Apr 19, 2018 · 44cf4f5 · 44cf4f5
1 parent a8de438
commit 44cf4f5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
@@ -166,11 +166,11 @@ - (void)save:(WXKeepAliveCallback)resultCallback
 
     // iOS 11 needs a NSPhotoLibraryUsageDescription key for permission
     if (WX_SYS_VERSION_GREATER_THAN_OR_EQUAL_TO(@"11.0")) {
-        if (!info[@"NSPhotoLibraryUsageDescription"]) {
+        if (!info[@"NSPhotoLibraryAddUsageDescription"]) {
             if (resultCallback) {
                 resultCallback(@{
                                  @"success" : @(false),
-                                 @"errorDesc": @"This maybe crash above iOS 10 because it attempted to access privacy-sensitive data without a usage description.  The app's Info.plist must contain an NSPhotoLibraryUsageDescription key with a string value explaining to the user how the app uses this data."
+                                 @"errorDesc": @"This maybe crash above iOS 11 because it attempted to save image without a usage description.  The app's Info.plist must contain an NSPhotoLibraryAddUsageDescription key with a string value explaining to the user how the app uses this data."
                                  }, NO);
             }
             return;

diff --git a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
@@ -196,7 +196,11 @@ - (void)viewDidLoad
     scrollView.showsHorizontalScrollIndicator = _showScrollBar;
     scrollView.scrollEnabled = _scrollable;
     scrollView.pagingEnabled = _pagingEnabled;
-    scrollView.bounces = _bounces;
+
+    if (scrollView.bounces != _bounces) {
+        scrollView.bounces = _bounces;
+    }
+
     if (_alwaysScrollableHorizontal) {
         scrollView.alwaysBounceHorizontal = [WXConvert BOOL:_alwaysScrollableHorizontal];
     }