@momo-kits/carousel 0.0.1-beta → 0.0.1

package/Carousel.js

@@ -78,6 +78,7 @@ export default class Carousel extends PureComponent {
         // This bool aims at fixing an iOS bug due to scrollTo that triggers onMomentumScrollEnd.
         // onMomentumScrollEnd fires this._snapScroll, thus creating an infinite loop.
         this._ignoreNextMomentum = false;
+        this._animated = false;
 
         // Warnings
         if (!ViewPropTypes) {
@@ -424,6 +425,12 @@ export default class Carousel extends PureComponent {
     }
 
     _getWrappedRef() {
+        if (this._carouselRef && (
+            (this._needsScrollView() && this._carouselRef.scrollTo)
+            || (!this._needsScrollView() && this._carouselRef.scrollToOffset)
+        )) {
+            return this._carouselRef;
+        }
         // https://github.com/facebook/react-native/issues/10635
         // https://stackoverflow.com/a/48786374/8412141
         return this._carouselRef && this._carouselRef.getNode && this._carouselRef.getNode();
@@ -547,7 +554,7 @@ export default class Carousel extends PureComponent {
                     interpolator = tinderScrollInterpolator(_index, props);
                 }
 
-                if (!interpolator || !interpolator.inputRange || !interpolator.outputRange) {
+                if (!interpolator || !interpolator?.inputRange || !interpolator?.outputRange) {
                     interpolator = defaultScrollInterpolator(_index, props);
                 }
 
@@ -697,11 +704,15 @@ export default class Carousel extends PureComponent {
             animated
         };
 
-        if (this._needsScrollView()) {
-            wrappedRef.scrollTo(options);
-        } else {
-            wrappedRef.scrollToOffset(options);
-        }
+        setTimeout(() => {
+            if (this._needsScrollView()) {
+                wrappedRef.scrollTo(options);
+            } else {
+                wrappedRef.scrollToOffset(options);
+            }
+        }, (!animated && this._animated) ? 200 : 0);
+
+        this._animated = animated;
     }
 
     _onScroll(event) {

package/package.json

@@ -1,17 +1,16 @@
 {
-    "name": "@momo-kits/carousel",
-    "version": "0.0.1-beta",
-    "private": false,
-    "main": "index.js",
-    "dependencies": {
-      "prop-types": "^15.7.2",
-      "react": "16.9.0"
-    },
-    "peerDependencies": {
-      "react": "16.9.0",
-      "react-native": ">=0.55"
-    },
-    "devDependencies": {},
-    "license": "MOMO"
-  }
-  
+  "name": "@momo-kits/carousel",
+  "version": "0.0.1",
+  "private": false,
+  "main": "index.js",
+  "dependencies": {
+    "prop-types": "^15.7.2",
+    "react": "16.9.0"
+  },
+  "peerDependencies": {
+    "react": "16.9.0",
+    "react-native": ">=0.55"
+  },
+  "devDependencies": {},
+  "license": "MoMo"
+}

package/publish.sh

@@ -12,7 +12,7 @@ echo VERSION: $VERSION
 rsync -r --verbose --exclude '*.mdx' --exclude '*Demo.js'  --exclude 'props-type.js' --exclude 'prop-types.js' ./* dist
 
 # #babel component to dist
-babel ./dist -d dist --copy-files
+#babel ./dist -d dist --copy-files
 
 #copy option
 #cp -r ./src/ dist

package/utils/animation.js

@@ -1,7 +1,8 @@
 /* eslint-disable no-param-reassign */
-import { Platform } from 'react-native';
+import { Platform, Dimensions } from 'react-native';
 
 const IS_ANDROID = Platform.OS === 'android';
+const { width: viewportWidth = 0, height: viewportHeight = 0 } = Dimensions.get('window') || {};
 
 // Get scroll interpolator's input range from an array of slide indexes
 // Indexes are relative to the current active slide (index 0)
@@ -14,9 +15,10 @@ const IS_ANDROID = Platform.OS === 'android';
 //     (index + 1) * sizeRef // active - 1
 // ]
 export function getInputRangeFromIndexes(range, index, carouselProps) {
-    const sizeRef = carouselProps.vertical ? carouselProps.itemHeight : carouselProps.itemWidth;
+    const sizeRef = carouselProps.vertical ? carouselProps.itemHeight <= 0 ? (viewportHeight || 680) : carouselProps.itemHeight:
+     carouselProps.itemWidth <= 0 ? (viewportWidth || 375) : carouselProps.itemWidth;
     const inputRange = [];
-
+    
     for (let i = 0; i < range.length; i += 1) {
         inputRange.push((index - range[i]) * sizeRef);
     }