@momo-kits/carousel 0.150.2-beta.4 → 0.150.2-beta.40

package/index.tsx

@@ -398,25 +398,18 @@ class Carousel extends React.PureComponent<CarouselProps, CarouselState> {
       return 0;
     }
 
-    if (
-      this._positions[lastIndex] &&
-      offset >= this._positions[lastIndex].start
-    ) {
-      return lastIndex;
-    }
-
+    let minDistance = Infinity;
     for (let i = 0; i < this._positions.length; i++) {
       const { start, end } = this._positions[i];
-      if (
-        center + activeSlideOffset >= start &&
-        center - activeSlideOffset <= end
-      ) {
+      const itemCenter = (start + end) / 2;
+      const distance = Math.abs(itemCenter - center);
+      if (distance < minDistance) {
+        minDistance = distance;
         itemIndex = i;
-        break;
       }
     }
 
-    return itemIndex || 0;
+    return itemIndex !== undefined ? itemIndex : 0;
   }
 
   _initPositionsAndInterpolators(props = this.props) {
@@ -515,10 +508,10 @@ class Carousel extends React.PureComponent<CarouselProps, CarouselState> {
 
     if (nextActiveItem !== this._onScrollActiveItem) {
       this._onScrollActiveItem = nextActiveItem;
-      onScrollIndexChanged &&
-        onScrollIndexChanged(this._getDataIndex(nextActiveItem));
+      const dataIndex = this._getDataIndex(nextActiveItem);
 
-      onSnapToItem && onSnapToItem(this._getDataIndex(nextActiveItem));
+      onScrollIndexChanged && onScrollIndexChanged(dataIndex);
+      onSnapToItem && onSnapToItem(dataIndex);
     }
 
     if (

package/package.json

@@ -1,21 +1,21 @@
 {
-    "name": "@momo-kits/carousel",
-    "version": "0.150.2-beta.4",
-    "private": false,
-    "main": "index.tsx",
-    "peerDependencies": {
-        "@momo-kits/foundation": "latest",
-        "react": "*",
-        "react-native": "*"
-    },
-    "devDependencies": {
-        "@momo-platform/versions": "4.1.11"
-    },
-    "license": "MoMo",
-    "publishConfig": {
-        "registry": "https://registry.npmjs.org/"
-    },
-    "dependencies": {
-        "moment": "^2.24.0"
-    }
-}
+  "name": "@momo-kits/carousel",
+  "version": "0.150.2-beta.40",
+  "private": false,
+  "main": "index.tsx",
+  "peerDependencies": {
+    "@momo-kits/foundation": "latest",
+    "react": "*",
+    "react-native": "*"
+  },
+  "devDependencies": {
+    "@momo-platform/versions": "4.1.11"
+  },
+  "license": "MoMo",
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
+  "dependencies": {
+    "moment": "^2.24.0"
+  }
+}