fix(PickView): pickview wheel direction

src/components/picker-view/utils/index.tsx

@@ -0,0 +1,22 @@
+// useWheel 的滚动数据特殊处理
+export function wheelBound(
+  position: number,
+  min: number | undefined,
+  max: number | undefined
+) {
+  let ret = position
+
+  if (min !== undefined && max !== undefined) {
+    if (ret > 0) {
+      ret = Math.max(ret, min)
+
+      ret = Math.min(ret, max)
+    }
+    if (ret < 0) {
+      ret = Math.min(ret, min)
+      ret = Math.max(ret, min)
+    }
+  }
+
+  return ret
+}

src/components/picker-view/wheel.tsx

@@ -13,6 +13,7 @@
 import { useIsomorphicLayoutEffect } from 'ahooks'
 import { measureCSSLength } from '../../utils/measure-css-length'
 import { supportsPassive } from '../../utils/supports-passive'
+import { wheelBound } from './utils'
 
 const classPrefix = `adm-picker-view`
 
@@ -86,13 +87,9 @@
     }
 
     const handleDrag = (
-      state:
-        | (Omit<FullGestureState<'wheel'>, 'event'> & {
-            event: EventTypes['wheel']
-          })
-        | (Omit<FullGestureState<'drag'>, 'event'> & {
-            event: EventTypes['drag']
-          })
+      state: Omit<FullGestureState<'drag'>, 'event'> & {
+        event: EventTypes['drag']
+      }
     ) => {
       draggingRef.current = true
       const min = -((column.length - 1) * itemHeight.current)
@@ -101,10 +98,10 @@
         draggingRef.current = false
         const position =
           state.offset[1] + state.velocity[1] * state.direction[1] * 50
-        const targetIndex =
-          min < max
-            ? -Math.round(bound(position, min, max) / itemHeight.current)
-            : 0
+        const targetIndex = -Math.round(
+          bound(position, min, max) / itemHeight.current
+        )
+
         scrollSelect(targetIndex)
       } else {
         const position = state.offset[1]
@@ -120,6 +117,26 @@
       }
     }
 
+    const handleWheel = (
+      state: Omit<FullGestureState<'wheel'>, 'event'> & {
+        event: EventTypes['wheel']
+      }
+    ) => {
+      draggingRef.current = true
+      const min = -((column.length - 1) * itemHeight.current)
+      const max = 0
+
+      if (state.last) {
+        draggingRef.current = false
+        const position =
+          state.offset[1] + state.velocity[1] * state.direction[1] * 50
+        const wheelNum = wheelBound(-position, min, max)
+        const targetIndex = -Math.round(wheelNum / itemHeight.current)
+
+        scrollSelect(targetIndex)
+      }
+    }
+
     useDrag(
       state => {
         state.event.stopPropagation()
@@ -137,7 +154,7 @@
     useWheel(
       state => {
         state.event.stopPropagation()
-        handleDrag(state)
+        handleWheel(state)
       },
       {
         axis: 'y',
@@ -245,9 +262,8 @@
     if (prev.onSelect !== next.onSelect) return false
     if (prev.renderLabel !== next.renderLabel) return false
     if (prev.mouseWheel !== next.mouseWheel) return false
-    if (!isEqual(prev.column, next.column)) {
-      return false
-    }
+    if (!isEqual(prev.column, next.column)) return false
+
     return true
   }
 )