fix(module): miscellaneous fixes

webdevstar · webdevstar · commit 8719d48bba2f · 2019-01-14T21:25:01.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## v2.0.3
+
+* Prevent error when carousel has only one child (thanks [@kevinvandijk](https://github.com/kevinvandijk) !)
+* Fix issue when appending dynamic slides (the first one was ignored)
+* Fix edge case that prevented the first slide from being focused when swiping back with momentum enabled
+* Bump example's RN version to 0.42.3
+
 ## v2.0.2
 
 * Make sure that scroll indicator is hidden by default
diff --git a/example/.flowconfig b/example/.flowconfig
@@ -22,6 +22,8 @@ node_modules/react-native/flow
 flow/
 
 [options]
+emoji=true
+
 module.system=haste
 
 experimental.strict_type_args=true
@@ -34,11 +36,11 @@ suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
 suppress_type=$FixMe
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-7]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-7]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-8]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-8]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 
 unsafe.enable_getters_and_setters=true
 
 [version]
-^0.37.0
+^0.38.0
diff --git a/example/.gitignore b/example/.gitignore
@@ -39,7 +39,6 @@ yarn-error.log
 # BUCK
 buck-out/
 \.buckd/
-android/app/libs
 *.keystore
 
 # fastlane
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -87,7 +87,7 @@ android {
     buildToolsVersion "23.0.1"
 
     defaultConfig {
-        applicationId "fr.archriss.example.snap.carousel"
+        applicationId "com.example"
         minSdkVersion 16
         targetSdkVersion 22
         versionCode 1
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -19,7 +19,8 @@
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
+        android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+        android:windowSoftInputMode="adjustResize">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />
diff --git a/example/android/app/src/main/java/com/example/MainApplication.java b/example/android/app/src/main/java/com/example/MainApplication.java
@@ -1,10 +1,8 @@
 package com.example;
 
 import android.app.Application;
-import android.util.Log;
 
 import com.facebook.react.ReactApplication;
-import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.1'
+        classpath 'com.android.tools.build:gradle:2.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/example/package.json b/example/package.json
@@ -8,7 +8,7 @@
 	},
 	"dependencies": {
 		"react": "15.4.2",
-		"react-native": "0.41.2",
+		"react-native": "0.42.3",
 		"react-native-snap-carousel": "file:.."
 	},
 	"devDependencies": {
diff --git a/example/src/index.js b/example/src/index.js
@@ -69,7 +69,11 @@ export default class example extends Component {
     render () {
         return (
             <View style={styles.container}>
-                <StatusBar backgroundColor={'transparent'} barStyle={'light-content'} />
+                <StatusBar
+                  translucent={true}
+                  backgroundColor={'rgba(0, 0, 0, 0.3)'}
+                  barStyle={'light-content'}
+                />
                 <View style={styles.colorsContainer}>
                     <View style={styles.color1} />
                     <View style={styles.color2} />
diff --git a/example/yarn.lock b/example/yarn.lock
@@ -893,18 +893,12 @@ browser-resolve@^1.11.2:
   dependencies:
     resolve "1.1.7"
 
-bser@1.0.2:
+bser@1.0.2, bser@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bser/-/bser-1.0.2.tgz#381116970b2a6deea5646dd15dd7278444b56169"
   dependencies:
     node-int64 "^0.4.0"
 
-bser@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/bser/-/bser-1.0.3.tgz#d63da19ee17330a0e260d2a34422b21a89520317"
-  dependencies:
-    node-int64 "^0.4.0"
-
 bser@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
@@ -2871,13 +2865,13 @@ mime-db@~1.23.0:
   version "1.23.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.23.0.tgz#a31b4070adaea27d732ea333740a64d0ec9a6659"
 
-mime-types@2.1.11, mime-types@~2.1.7, mime-types@~2.1.9:
+mime-types@2.1.11, mime-types@~2.1.7:
   version "2.1.11"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.11.tgz#c259c471bda808a85d6cd193b430a5fae4473b3c"
   dependencies:
     mime-db "~1.23.0"
 
-mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.6:
+mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.6, mime-types@~2.1.9:
   version "2.1.14"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.14.tgz#f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee"
   dependencies:
@@ -3311,15 +3305,14 @@ react-deep-force-update@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-1.0.1.tgz#f911b5be1d2a6fe387507dd6e9a767aa2924b4c7"
 
-react-native-snap-carousel@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/react-native-snap-carousel/-/react-native-snap-carousel-2.0.1.tgz#c8c720365a8beea7ed9ebf0b2d278adf614c5a9c"
+"react-native-snap-carousel@file:..":
+  version "2.0.2"
   dependencies:
     react-addons-shallow-compare latest
 
-react-native@0.41.2:
-  version "0.41.2"
-  resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.41.2.tgz#c6f486b8450a9909e6fed2dfd2c2af946563bf4f"
+react-native@0.42.3:
+  version "0.42.3"
+  resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.42.3.tgz#450c8a03a5e3e991a08a426f22776dd8feb80b26"
   dependencies:
     absolute-path "^0.0.0"
     art "^0.10.0"
diff --git a/index.js b/index.js
@@ -154,10 +154,11 @@ export default class Carousel extends Component {
     }
 
     componentWillReceiveProps (nextProps) {
-        const { firstItem } = nextProps;
         const { interpolators } = this.state;
+        const { firstItem } = nextProps;
+        const childrenLength = React.Children.count(nextProps.children);
 
-        if (interpolators && interpolators.length !== nextProps.children.length) {
+        if (childrenLength && interpolators.length !== childrenLength) {
             this._positions = [];
             this._calcCardPositions(nextProps);
             this._initInterpolators(nextProps);
@@ -184,19 +185,19 @@ export default class Carousel extends Component {
     _calcCardPositions (props = this.props) {
         const { itemWidth } = props;
 
-        this.props.children.map((item, index) => {
+        this._children(props).map((item, index) => {
             this._positions[index] = {
-                start: index * itemWidth
+                start: index * itemWidth,
+                end: index * itemWidth + itemWidth
             };
-            this._positions[index].end = this._positions[index].start + itemWidth;
         });
     }
 
     _initInterpolators (props = this.props) {
         const { firstItem } = props;
         let interpolators = [];
 
-        this.props.children.map((item, index) => {
+        this._children(props).map((item, index) => {
             interpolators.push(new Animated.Value(index === firstItem ? 1 : 0));
         });
         this.setState({ interpolators });
@@ -278,20 +279,18 @@ export default class Carousel extends Component {
             this._enableAutoplayTimeout =
                 setTimeout(() => {
                     this.startAutoplay(true);
-                }, autoplayDelay + 1000);
+                }, autoplayDelay + 200);
         }
     }
 
     // Due to a bug, this event is only fired on iOS
     // https://github.com/facebook/react-native/issues/6791
     // it's fine since we're only fixing an iOS bug in it, so ...
     _onTouchRelease (event) {
-        const { enableMomentum } = this.props;
-
-        if (enableMomentum && Platform.OS === 'ios') {
+        if (this.props.enableMomentum && Platform.OS === 'ios') {
             this._snapNoMomentumTimeout =
                 setTimeout(() => {
-                    this._snapScroll(0);
+                    this.snapToItem(this.state.activeItem);
                 }, 100);
         }
     }
@@ -301,7 +300,7 @@ export default class Carousel extends Component {
 
         // When using momentum and releasing the touch with
         // no velocity, scrollEndActive will be undefined (iOS)
-        if (!this._scrollEndActive && Platform.OS === 'ios') {
+        if (!this._scrollEndActive && this._scrollEndActive !== 0 && Platform.OS === 'ios') {
             this._scrollEndActive = this._scrollStartActive;
         }
 
@@ -359,6 +358,10 @@ export default class Carousel extends Component {
     snapToItem (index, animated = true, fireCallback = true, initial = false) {
         const itemsLength = this._positions.length;
 
+        if (!index) {
+            index = 0;
+        }
+
         if (index >= itemsLength) {
             index = itemsLength - 1;
             fireCallback = false;
@@ -367,7 +370,7 @@ export default class Carousel extends Component {
             fireCallback = false;
         }
 
-        const snapX = this._positions[index].start;
+        const snapX = itemsLength && this._positions[index].start;
 
         // Make sure the component hasn't been unmounted
         if (this.refs.scrollview) {
@@ -401,8 +404,8 @@ export default class Carousel extends Component {
         this.snapToItem(newIndex, animated);
     }
 
-    _children (children = this.props.children) {
-        return React.Children.map(children, (child) => child);
+    _children (props = this.props) {
+        return React.Children.map(props.children, (child) => child);
     }
 
     _childSlides () {
@@ -463,8 +466,7 @@ export default class Carousel extends Component {
               onResponderRelease={this._onTouchRelease}
               onScroll={this._onScroll}
               onTouchStart={this._onTouchStart}
-              scrollEventThrottle={50}
-              showsHorizontalScrollIndicator={false}
+              scrollEventThrottle={100}
               {...this.props}
               >
                 { this._childSlides() }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`jcenter()`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:1.3.1'`
	`8`	`+ classpath 'com.android.tools.build:gradle:2.2.3'`
`9`	`9`
`10`	`10`	`// NOTE: Do not place your application dependencies here; they belong`
`11`	`11`	`// in the individual module build.gradle files`