Merge pull request #406 from ifsnow/fixed-incorrect-snap

Fixed incorrect snap issue after scrollEnabled was changed.
meliorence · Oct 5, 2018 · 27783a5 · 27783a5
2 parents 20a874a + ac68f65
commit 27783a5
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/src/carousel/Carousel.js b/src/carousel/Carousel.js
@@ -310,8 +310,8 @@ export default class Carousel extends Component {
     }
 
     _canLockScroll () {
-        const { enableMomentum, lockScrollWhileSnapping } = this.props;
-        return !enableMomentum && lockScrollWhileSnapping;
+        const { scrollEnabled, enableMomentum, lockScrollWhileSnapping } = this.props;
+        return scrollEnabled && !enableMomentum && lockScrollWhileSnapping;
     }
 
     _enableLoop () {
@@ -468,19 +468,17 @@ export default class Carousel extends Component {
         return this._scrollEnabled;
     }
 
-    _setScrollEnabled (value = true) {
-        const { scrollEnabled } = this.props;
+    _setScrollEnabled (scrollEnabled = true) {
         const wrappedRef = this._getWrappedRef();
 
         if (!wrappedRef || !wrappedRef.setNativeProps) {
             return;
         }
 
-        value = value && scrollEnabled
         // 'setNativeProps()' is used instead of 'setState()' because the latter
         // really takes a toll on Android behavior when momentum is disabled
-        wrappedRef.setNativeProps({ scrollEnabled: value });
-        this._scrollEnabled = value;
+        wrappedRef.setNativeProps({ scrollEnabled });
+        this._scrollEnabled = scrollEnabled;
     }
 
     _getKeyExtractor (item, index) {