@momo-kits/carousel 0.151.1-test.4 → 0.151.2-beta.2

package/index.tsx

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/carousel",
-    "version": "0.151.1-test.4",
+    "version": "0.151.2-beta.2",
     "private": false,
     "main": "index.tsx",
     "peerDependencies": {