@momo-kits/date-picker 0.80.9 → 0.81.1

package/WheelPicker.tsx

@@ -36,10 +36,29 @@ const WheelPicker: FC<WheelPickerProps> = ({
     return () => {
       debouncedScrollEnd.cancel();
     };
-  }, []);
+  }, [data.length]);
+
+  const findClosestIndex = (array: string[], value: string) => {
+    let closest = array.reduce((a, b) => {
+      let aDiff = Math.abs(Number(a) - Number(value));
+      let bDiff = Math.abs(Number(b) - Number(value));
+
+      if (aDiff == bDiff) {
+        return a < b ? a : b;
+      } else {
+        return bDiff < aDiff ? b : a;
+      }
+    });
+
+    return array.indexOf(closest);
+  };
 
   const debouncedScrollEnd = debounce(() => {
-    let selectedIndex = data.findIndex(item => item === selectedData);
+    let selectedIndex = data.indexOf(selectedData);
+
+    if (selectedIndex === -1) {
+      selectedIndex = findClosestIndex(data, selectedData);
+    }
 
     if (selectedIndex < 2) {
       selectedIndex = 2;
@@ -47,14 +66,17 @@ const WheelPicker: FC<WheelPickerProps> = ({
     if (selectedIndex > data.length - 3) {
       selectedIndex = data.length - 3;
     }
-    if (selectedIndex >= 2) {
-      flatListRef.current?.scrollToIndex({
-        index: selectedIndex - 2,
-        animated: true,
-      });
-    }
+    flatListRef.current?.scrollToIndex({
+      index: selectedIndex - 2,
+      animated: true,
+    });
   }, 100);
 
+  const onMomentumScrollEnd = () => {
+    let index = Math.round(active.current / itemSize);
+    onChange?.(name, data[index + 2]);
+  };
+
   const ItemComponent: FC<any> = React.memo(props => {
     const {item, opacity, scale} = props;
 
@@ -170,10 +192,7 @@ const WheelPicker: FC<WheelPickerProps> = ({
             useNativeDriver: true,
           },
         )}
-        onMomentumScrollEnd={() => {
-          const index = Math.round(active.current / itemSize);
-          onChange?.(name, data[index + 2]);
-        }}
+        onMomentumScrollEnd={onMomentumScrollEnd}
         ref={flatListRef}
         keyExtractor={(item, index) => `Wheel picker item ${item}-${index}`}
         showsVerticalScrollIndicator={false}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/date-picker",
-    "version": "0.80.9",
+    "version": "0.81.1",
     "private": false,
     "main": "index.tsx",
     "peerDependencies": {