@mpxjs/webpack-plugin 2.9.70 → 2.9.72

package/lib/runtime/components/react/dist/mpx-movable-view.jsx

@@ -11,7 +11,7 @@
  * ✘ scale-min
  * ✘ scale-max
  * ✘ scale-value
- * ✘ animation
+ * ✔ animation
  * ✔ bindchange
  * ✘ bindscale
  * ✔ htouchmove
@@ -19,12 +19,13 @@
  */
 import { useEffect, forwardRef, useContext, useCallback, useRef, useMemo, createElement } from 'react';
 import { StyleSheet } from 'react-native';
-import { getCustomEvent } from './getInnerListeners';
+import useInnerProps, { getCustomEvent } from './getInnerListeners';
 import useNodesRef from './useNodesRef';
 import { MovableAreaContext } from './context';
-import { useTransformStyle, splitProps, splitStyle, HIDDEN_STYLE, wrapChildren, flatGesture, extendObject } from './utils';
+import { useTransformStyle, splitProps, splitStyle, HIDDEN_STYLE, wrapChildren, flatGesture, extendObject, omit } from './utils';
 import { GestureDetector, Gesture } from 'react-native-gesture-handler';
 import Animated, { useSharedValue, useAnimatedStyle, withDecay, runOnJS, runOnUI, useAnimatedReaction, withSpring } from 'react-native-reanimated';
+import { collectDataset, noop } from '@mpxjs/utils';
 const styles = StyleSheet.create({
     container: {
         position: 'absolute',
@@ -233,8 +234,7 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
         });
         props.onLayout && props.onLayout(e);
     };
-    const extendEvent = useCallback((e) => {
-        'worklet';
+    const extendEvent = useCallback((e, obj) => {
         const touchArr = [e.changedTouches, e.allTouches];
         touchArr.forEach(touches => {
             touches && touches.forEach((item) => {
@@ -242,45 +242,65 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
                 item.pageY = item.absoluteY;
             });
         });
-        e.touches = e.allTouches;
+        Object.assign(e, {
+            touches: e.allTouches,
+            detail: {
+                x: e.changedTouches[0].absoluteX,
+                y: e.changedTouches[0].absoluteY
+            },
+            currentTarget: {
+                id: props.id || '',
+                dataset: collectDataset(props),
+                offsetLeft: 0,
+                offsetTop: 0
+            }
+        }, obj);
     }, []);
+    const triggerStartOnJS = ({ e }) => {
+        extendEvent(e);
+        bindtouchstart && bindtouchstart(e);
+        catchtouchstart && catchtouchstart(e);
+    };
+    const triggerMoveOnJS = ({ e, hasTouchmove, hasCatchTouchmove, touchEvent }) => {
+        extendEvent(e);
+        if (hasTouchmove) {
+            if (touchEvent === 'htouchmove') {
+                bindhtouchmove && bindhtouchmove(e);
+            }
+            else if (touchEvent === 'vtouchmove') {
+                bindvtouchmove && bindvtouchmove(e);
+            }
+            bindtouchmove && bindtouchmove(e);
+        }
+        if (hasCatchTouchmove) {
+            if (touchEvent === 'htouchmove') {
+                catchhtouchmove && catchhtouchmove(e);
+            }
+            else if (touchEvent === 'vtouchmove') {
+                catchvtouchmove && catchvtouchmove(e);
+            }
+            catchtouchmove && catchtouchmove(e);
+        }
+    };
+    const triggerEndOnJS = ({ e }) => {
+        extendEvent(e);
+        bindtouchend && bindtouchend(e);
+        catchtouchend && catchtouchend(e);
+    };
     const gesture = useMemo(() => {
-        const handleTriggerStart = (e) => {
-            'worklet';
-            extendEvent(e);
-            bindtouchstart && runOnJS(bindtouchstart)(e);
-            catchtouchstart && runOnJS(catchtouchstart)(e);
-        };
         const handleTriggerMove = (e) => {
             'worklet';
-            extendEvent(e);
             const hasTouchmove = !!bindhtouchmove || !!bindvtouchmove || !!bindtouchmove;
             const hasCatchTouchmove = !!catchhtouchmove || !!catchvtouchmove || !!catchtouchmove;
-            if (hasTouchmove) {
-                if (touchEvent.value === 'htouchmove') {
-                    bindhtouchmove && runOnJS(bindhtouchmove)(e);
-                }
-                else if (touchEvent.value === 'vtouchmove') {
-                    bindvtouchmove && runOnJS(bindvtouchmove)(e);
-                }
-                bindtouchmove && runOnJS(bindtouchmove)(e);
-            }
-            if (hasCatchTouchmove) {
-                if (touchEvent.value === 'htouchmove') {
-                    catchhtouchmove && runOnJS(catchhtouchmove)(e);
-                }
-                else if (touchEvent.value === 'vtouchmove') {
-                    catchvtouchmove && runOnJS(catchvtouchmove)(e);
-                }
-                catchtouchmove && runOnJS(catchtouchmove)(e);
+            if (hasTouchmove || hasCatchTouchmove) {
+                runOnJS(triggerMoveOnJS)({
+                    e,
+                    touchEvent: touchEvent.value,
+                    hasTouchmove,
+                    hasCatchTouchmove
+                });
             }
         };
-        const handleTriggerEnd = (e) => {
-            'worklet';
-            extendEvent(e);
-            bindtouchend && runOnJS(bindtouchend)(e);
-            catchtouchend && runOnJS(catchtouchend)(e);
-        };
         const gesturePan = Gesture.Pan()
             .onTouchesDown((e) => {
             'worklet';
@@ -290,12 +310,14 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
                 x: changedTouches.x,
                 y: changedTouches.y
             };
-            handleTriggerStart(e);
+            if (bindtouchstart || catchtouchstart) {
+                runOnJS(triggerStartOnJS)({ e });
+            }
         })
             .onTouchesMove((e) => {
             'worklet';
-            isMoving.value = true;
             const changedTouches = e.changedTouches[0] || { x: 0, y: 0 };
+            isMoving.value = true;
             if (isFirstTouch.value) {
                 touchEvent.value = Math.abs(changedTouches.x - startPosition.value.x) > Math.abs(changedTouches.y - startPosition.value.y) ? 'htouchmove' : 'vtouchmove';
                 isFirstTouch.value = false;
@@ -330,7 +352,9 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
             'worklet';
             isFirstTouch.value = true;
             isMoving.value = false;
-            handleTriggerEnd(e);
+            if (bindtouchend || catchtouchend) {
+                runOnJS(triggerEndOnJS)({ e });
+            }
             if (disabled)
                 return;
             if (!inertia) {
@@ -355,9 +379,9 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
         })
             .onFinalize((e) => {
             'worklet';
+            isMoving.value = false;
             if (!inertia || disabled || !animation)
                 return;
-            isMoving.value = false;
             if (direction === 'horizontal' || direction === 'all') {
                 xInertialMotion.value = true;
                 offsetX.value = withDecay({
@@ -396,31 +420,42 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
             ]
         };
     });
-    const injectCatchEvent = (props) => {
-        const eventHandlers = {};
-        const catchEventList = [
-            { name: 'onTouchStart', value: ['catchtouchstart'] },
-            { name: 'onTouchMove', value: ['catchtouchmove', 'catchvtouchmove', 'catchhtouchmove'] },
-            { name: 'onTouchEnd', value: ['catchtouchend'] }
+    const rewriteCatchEvent = () => {
+        const handlers = {};
+        const events = [
+            { type: 'touchstart' },
+            { type: 'touchmove', alias: ['vtouchmove', 'htouchmove'] },
+            { type: 'touchend' }
         ];
-        catchEventList.forEach(event => {
-            event.value.forEach(name => {
-                if (props[name] && !eventHandlers[event.name]) {
-                    eventHandlers[event.name] = (e) => {
-                        e.stopPropagation();
-                    };
-                }
-            });
+        events.forEach(({ type, alias = [] }) => {
+            const hasCatchEvent = props[`catch${type}`] ||
+                alias.some(name => props[`catch${name}`]);
+            if (hasCatchEvent)
+                handlers[`catch${type}`] = noop;
         });
-        return eventHandlers;
+        return handlers;
     };
-    const catchEventHandlers = injectCatchEvent(props);
     const layoutStyle = !hasLayoutRef.current && hasSelfPercent ? HIDDEN_STYLE : {};
-    return createElement(GestureDetector, { gesture: gesture }, createElement(Animated.View, extendObject({
+    // bind 相关 touch 事件直接由 gesture 触发，无须重复挂载
+    // catch 相关 touch 事件需要重写并通过 useInnerProps 注入阻止冒泡逻辑
+    const filterProps = omit(props, [
+        'bindtouchstart',
+        'bindtouchmove',
+        'bindvtouchmove',
+        'bindhtouchmove',
+        'bindtouchend',
+        'catchtouchstart',
+        'catchtouchmove',
+        'catchvtouchmove',
+        'catchhtouchmove',
+        'catchtouchend'
+    ]);
+    const innerProps = useInnerProps(filterProps, extendObject({
         ref: nodeRef,
         onLayout: onLayout,
         style: [innerStyle, animatedStyles, layoutStyle]
-    }, catchEventHandlers), wrapChildren(props, {
+    }, rewriteCatchEvent()));
+    return createElement(GestureDetector, { gesture: gesture }, createElement(Animated.View, innerProps, wrapChildren(props, {
         hasVarDec,
         varContext: varContextRef.current,
         textStyle,

package/lib/runtime/components/react/dist/mpx-navigator.jsx

@@ -3,7 +3,7 @@ import useInnerProps from './getInnerListeners';
 import { redirectTo, navigateTo, navigateBack, reLaunch, switchTab } from '@mpxjs/api-proxy';
 import MpxView from './mpx-view';
 const _Navigator = forwardRef((props, ref) => {
-    const { children, 'open-type': openType, url, delta } = props;
+    const { children, 'open-type': openType, url = '', delta } = props;
     const handleClick = useCallback(() => {
         switch (openType) {
             case 'navigateBack':

package/lib/runtime/components/react/dist/mpx-picker-view-column-item.jsx

@@ -0,0 +1,35 @@
+import React, { useEffect } from 'react';
+import Reanimated, { Extrapolation, interpolate, useAnimatedStyle, useSharedValue } from 'react-native-reanimated';
+import { extendObject } from './utils';
+import { createFaces } from './pickerFaces';
+import { usePickerViewColumnAnimationContext, usePickerViewStyleContext } from './pickerVIewContext';
+const PickerViewColumnItem = ({ item, index, itemHeight, itemWidth = '100%', textStyle, textProps, visibleCount, onItemLayout }) => {
+    const textStyleFromAncestor = usePickerViewStyleContext();
+    const offsetYShared = usePickerViewColumnAnimationContext();
+    const facesShared = useSharedValue(createFaces(itemHeight, visibleCount));
+    useEffect(() => {
+        facesShared.value = createFaces(itemHeight, visibleCount);
+    }, [itemHeight]);
+    const animatedStyles = useAnimatedStyle(() => {
+        const inputRange = facesShared.value.map((f) => itemHeight * (index + f.index));
+        return {
+            opacity: interpolate(offsetYShared.value, inputRange, facesShared.value.map((x) => x.opacity), Extrapolation.CLAMP),
+            transform: [
+                { translateY: interpolate(offsetYShared.value, inputRange, facesShared.value.map((x) => x.offsetY), Extrapolation.EXTEND) },
+                { rotateX: interpolate(offsetYShared.value, inputRange, facesShared.value.map((x) => x.deg), Extrapolation.CLAMP) + 'deg' },
+                { scale: interpolate(offsetYShared.value, inputRange, facesShared.value.map((x) => x.scale), Extrapolation.EXTEND) }
+            ]
+        };
+    });
+    const strKey = `picker-column-item-${index}`;
+    const restProps = index === 0 ? { onLayout: onItemLayout } : {};
+    const itemProps = extendObject({
+        style: extendObject({ height: itemHeight, width: '100%' }, textStyleFromAncestor, textStyle, item.props.style)
+    }, textProps, restProps);
+    const realItem = React.cloneElement(item, itemProps);
+    return (<Reanimated.View key={strKey} style={[{ height: itemHeight, width: itemWidth }, animatedStyles]}>
+      {realItem}
+    </Reanimated.View>);
+};
+PickerViewColumnItem.displayName = 'MpxPickerViewColumnItem';
+export default PickerViewColumnItem;

package/lib/runtime/components/react/dist/mpx-picker-view-column.jsx

@@ -1,42 +1,68 @@
-import { Animated, SafeAreaView } from 'react-native';
-import React, { forwardRef, useRef, useState, useMemo, useCallback, useEffect } from 'react';
-import { useTransformStyle, splitStyle, splitProps, wrapChildren, useLayout, usePrevious } from './utils';
+import React, { forwardRef, useRef, useState, useMemo, useEffect, useCallback } from 'react';
+import { StyleSheet, View } from 'react-native';
+import Reanimated, { useAnimatedRef, useScrollViewOffset } from 'react-native-reanimated';
+import { useTransformStyle, splitStyle, splitProps, useLayout, usePrevious, isAndroid, isIOS } from './utils';
 import useNodesRef from './useNodesRef';
-import { createFaces } from './pickerFaces';
-import PickerOverlay from './pickerOverlay';
-// 默认的单个选项高度
-const DefaultPickerItemH = 36;
-// 默认一屏可见选项个数
+import PickerIndicator from './pickerViewIndicator';
+import PickerMask from './pickerViewMask';
+import MpxPickerVIewColumnItem from './mpx-picker-view-column-item';
+import { PickerViewColumnAnimationContext } from './pickerVIewContext';
 const visibleCount = 5;
 const _PickerViewColumn = forwardRef((props, ref) => {
-    const { columnData, columnIndex, initialIndex, onSelectChange, onColumnItemRawHChange, getInnerLayout, style, wrapperStyle, pickerOverlayStyle, 'enable-var': enableVar, 'external-var-context': externalVarContext } = props;
-    const { normalStyle, hasVarDec, varContextRef, hasSelfPercent, setWidth, setHeight } = useTransformStyle(style, { enableVar, externalVarContext });
-    const { textStyle } = splitStyle(normalStyle);
-    const { textProps } = splitProps(props);
-    const scrollViewRef = useRef(null);
+    const { columnData, columnIndex, initialIndex, onSelectChange, style, wrapperStyle, pickerMaskStyle, pickerIndicatorStyle, 'enable-var': enableVar, 'external-var-context': externalVarContext } = props;
+    const { normalStyle, hasSelfPercent, setWidth, setHeight } = useTransformStyle(style, { enableVar, externalVarContext });
+    const { textStyle = {} } = splitStyle(normalStyle);
+    const { textProps = {} } = splitProps(props);
+    const scrollViewRef = useAnimatedRef();
+    const offsetYShared = useScrollViewOffset(scrollViewRef);
     useNodesRef(props, ref, scrollViewRef, {
         style: normalStyle
     });
-    const { height: pickerH, itemHeight = DefaultPickerItemH } = wrapperStyle;
-    const [itemRawH, setItemRawH] = useState(0); // 单个选项真实渲染高度
+    const { height: pickerH, itemHeight } = wrapperStyle;
+    const [itemRawH, setItemRawH] = useState(itemHeight);
     const maxIndex = useMemo(() => columnData.length - 1, [columnData]);
+    const prevScrollingInfo = useRef({ index: initialIndex, y: 0 });
     const touching = useRef(false);
     const scrolling = useRef(false);
+    const timerResetPosition = useRef(null);
+    const timerScrollTo = useRef(null);
     const activeIndex = useRef(initialIndex);
     const prevIndex = usePrevious(initialIndex);
     const prevMaxIndex = usePrevious(maxIndex);
-    const initialOffset = useMemo(() => ({
-        x: 0,
-        y: itemRawH * initialIndex
-    }), [itemRawH]);
-    const snapToOffsets = useMemo(() => columnData.map((_, i) => i * itemRawH), [columnData, itemRawH]);
+    const { layoutProps } = useLayout({
+        props,
+        hasSelfPercent,
+        setWidth,
+        setHeight,
+        nodeRef: scrollViewRef
+    });
+    const paddingHeight = useMemo(() => Math.round((pickerH - itemHeight) / 2), [pickerH, itemHeight]);
+    const snapToOffsets = useMemo(() => Array.from({ length: maxIndex + 1 }, (_, i) => i * itemRawH), [maxIndex, itemRawH]);
     const contentContainerStyle = useMemo(() => {
-        return [
-            {
-                paddingVertical: Math.round(pickerH - itemRawH) / 2
-            }
-        ];
-    }, [pickerH, itemRawH]);
+        return [{ paddingVertical: paddingHeight }];
+    }, [paddingHeight]);
+    const getIndex = useCallback((y) => {
+        const calc = Math.round(y / itemRawH);
+        return Math.max(0, Math.min(calc, maxIndex));
+    }, [itemRawH, maxIndex]);
+    const clearTimerResetPosition = useCallback(() => {
+        if (timerResetPosition.current) {
+            clearTimeout(timerResetPosition.current);
+            timerResetPosition.current = null;
+        }
+    }, []);
+    const clearTimerScrollTo = useCallback(() => {
+        if (timerScrollTo.current) {
+            clearTimeout(timerScrollTo.current);
+            timerScrollTo.current = null;
+        }
+    }, []);
+    useEffect(() => {
+        return () => {
+            clearTimerResetPosition();
+            clearTimerScrollTo();
+        };
+    }, []);
     useEffect(() => {
         if (!scrollViewRef.current ||
             !itemRawH ||
@@ -48,122 +74,120 @@ const _PickerViewColumn = forwardRef((props, ref) => {
             maxIndex !== prevMaxIndex) {
             return;
         }
+        clearTimerScrollTo();
+        timerScrollTo.current = setTimeout(() => {
+            scrollViewRef.current?.scrollTo({
+                x: 0,
+                y: initialIndex * itemRawH,
+                animated: false
+            });
+        }, isAndroid ? 200 : 0);
         activeIndex.current = initialIndex;
-        scrollViewRef.current.scrollTo({
-            x: 0,
-            y: itemRawH * initialIndex,
-            animated: false
-        });
+    }, [itemRawH, maxIndex, initialIndex]);
+    const onContentSizeChange = useCallback((_w, h) => {
+        const y = initialIndex * itemRawH;
+        if (y <= h) {
+            clearTimerScrollTo();
+            timerScrollTo.current = setTimeout(() => {
+                scrollViewRef.current?.scrollTo({ x: 0, y, animated: false });
+            }, 0);
+        }
     }, [itemRawH, initialIndex]);
-    const onScrollViewLayout = () => {
-        getInnerLayout && getInnerLayout(layoutRef);
-    };
-    const { layoutRef, layoutProps } = useLayout({
-        props,
-        hasSelfPercent,
-        setWidth,
-        setHeight,
-        nodeRef: scrollViewRef,
-        onLayout: onScrollViewLayout
-    });
-    const onContentSizeChange = (w, h) => {
-        scrollViewRef.current?.scrollTo({
-            x: 0,
-            y: itemRawH * initialIndex,
-            animated: false
-        });
-    };
-    const onItemLayout = (e) => {
+    const onItemLayout = useCallback((e) => {
         const { height: rawH } = e.nativeEvent.layout;
-        if (rawH && itemRawH !== rawH) {
-            setItemRawH(rawH);
-            onColumnItemRawHChange(rawH);
+        const roundedH = Math.round(rawH);
+        if (roundedH && roundedH !== itemRawH) {
+            setItemRawH(roundedH);
         }
-    };
-    const onTouchStart = () => {
-        touching.current = true;
-    };
-    const onTouchEnd = () => {
-        touching.current = false;
-    };
-    const onTouchCancel = () => {
-        touching.current = false;
-    };
-    const onMomentumScrollBegin = () => {
-        scrolling.current = true;
-    };
-    const onMomentumScrollEnd = (e) => {
-        scrolling.current = false;
-        if (!itemRawH) {
+    }, [itemRawH]);
+    const resetScrollPosition = useCallback((y) => {
+        if (touching.current || scrolling.current) {
             return;
         }
+        scrolling.current = true;
+        const targetIndex = getIndex(y);
+        scrollViewRef.current?.scrollTo({ x: 0, y: targetIndex * itemRawH, animated: false });
+    }, [itemRawH, getIndex]);
+    const onMomentumScrollBegin = useCallback(() => {
+        isIOS && clearTimerResetPosition();
+        scrolling.current = true;
+    }, []);
+    const onMomentumScrollEnd = useCallback((e) => {
+        scrolling.current = false;
         const { y: scrollY } = e.nativeEvent.contentOffset;
-        let calcIndex = Math.round(scrollY / itemRawH);
-        activeIndex.current = calcIndex;
-        if (calcIndex !== initialIndex) {
-            calcIndex = Math.max(0, Math.min(calcIndex, maxIndex)) || 0;
+        if (isIOS && scrollY % itemRawH !== 0) {
+            return resetScrollPosition(scrollY);
+        }
+        const calcIndex = getIndex(scrollY);
+        if (calcIndex !== activeIndex.current) {
+            activeIndex.current = calcIndex;
             onSelectChange(calcIndex);
         }
-    };
-    const offsetY = useRef(new Animated.Value(0)).current;
-    const onScroll = useMemo(() => Animated.event([{ nativeEvent: { contentOffset: { y: offsetY } } }], {
-        useNativeDriver: true
-    }), [offsetY]);
-    const faces = useMemo(() => createFaces(itemRawH, visibleCount), [itemRawH]);
-    const getTransform = useCallback((index) => {
-        const inputRange = faces.map((f) => itemRawH * (index + f.index));
-        return {
-            opacity: offsetY.interpolate({
-                inputRange: inputRange,
-                outputRange: faces.map((x) => x.opacity),
-                extrapolate: 'clamp'
-            }),
-            rotateX: offsetY.interpolate({
-                inputRange: inputRange,
-                outputRange: faces.map((x) => `${x.deg}deg`),
-                extrapolate: 'extend'
-            }),
-            translateY: offsetY.interpolate({
-                inputRange: inputRange,
-                outputRange: faces.map((x) => x.offsetY),
-                extrapolate: 'extend'
-            })
+    }, [itemRawH, getIndex, onSelectChange, resetScrollPosition]);
+    const onScrollBeginDrag = useCallback(() => {
+        isIOS && clearTimerResetPosition();
+        touching.current = true;
+        prevScrollingInfo.current = {
+            index: activeIndex.current,
+            y: activeIndex.current * itemRawH
         };
-    }, [offsetY, faces, itemRawH]);
-    const renderInnerchild = () => columnData.map((item, index) => {
-        const InnerProps = index === 0 ? { onLayout: onItemLayout } : {};
-        const strKey = `picker-column-${columnIndex}-${index}`;
-        const { opacity, rotateX, translateY } = getTransform(index);
-        return (<Animated.View key={strKey} {...InnerProps} style={[
-                {
-                    height: itemHeight || DefaultPickerItemH,
-                    width: '100%',
-                    opacity,
-                    transform: [
-                        { translateY },
-                        { rotateX },
-                        { perspective: 1000 } // 适配 Android
-                    ]
+    }, [itemRawH]);
+    const onScrollEndDrag = useCallback((e) => {
+        touching.current = false;
+        if (isIOS) {
+            const { y } = e.nativeEvent.contentOffset;
+            if (y % itemRawH === 0) {
+                onMomentumScrollEnd({ nativeEvent: { contentOffset: { y } } });
+            }
+            else if (y > 0 && y < snapToOffsets[maxIndex]) {
+                timerResetPosition.current = setTimeout(() => {
+                    resetScrollPosition(y);
+                }, 10);
+            }
+        }
+    }, [itemRawH, maxIndex, snapToOffsets, onMomentumScrollEnd, resetScrollPosition]);
+    const onScroll = useCallback((e) => {
+        // 全局注册的振动触感 hook
+        const pickerVibrate = global.__mpx?.config?.rnConfig?.pickerVibrate;
+        if (typeof pickerVibrate !== 'function') {
+            return;
+        }
+        const { y } = e.nativeEvent.contentOffset;
+        const { index: prevIndex, y: _y } = prevScrollingInfo.current;
+        if (touching.current || scrolling.current) {
+            if (Math.abs(y - _y) >= itemRawH) {
+                const currentId = getIndex(y);
+                if (currentId !== prevIndex) {
+                    prevScrollingInfo.current = {
+                        index: currentId,
+                        y: currentId * itemRawH
+                    };
+                    // vibrateShort({ type: 'selection' })
+                    pickerVibrate();
                 }
-            ]}>
-          {wrapChildren({ children: item }, {
-                hasVarDec,
-                varContext: varContextRef.current,
-                textStyle,
-                textProps
-            })}
-        </Animated.View>);
+            }
+        }
+    }, [itemRawH, getIndex]);
+    const renderInnerchild = () => columnData.map((item, index) => {
+        return (<MpxPickerVIewColumnItem key={index} item={item} index={index} itemHeight={itemHeight} textStyle={textStyle} textProps={textProps} visibleCount={visibleCount} onItemLayout={onItemLayout}/>);
     });
     const renderScollView = () => {
-        return (<Animated.ScrollView ref={scrollViewRef} bounces={true} horizontal={false} pagingEnabled={false} nestedScrollEnabled={true} removeClippedSubviews={true} showsVerticalScrollIndicator={false} showsHorizontalScrollIndicator={false} {...layoutProps} scrollEventThrottle={16} contentContainerStyle={contentContainerStyle} contentOffset={initialOffset} snapToOffsets={snapToOffsets} onContentSizeChange={onContentSizeChange} onScroll={onScroll} onTouchStart={onTouchStart} onTouchEnd={onTouchEnd} onTouchCancel={onTouchCancel} onMomentumScrollBegin={onMomentumScrollBegin} onMomentumScrollEnd={onMomentumScrollEnd}>
-        {renderInnerchild()}
-      </Animated.ScrollView>);
+        return (<PickerViewColumnAnimationContext.Provider value={offsetYShared}>
+        <Reanimated.ScrollView ref={scrollViewRef} bounces={true} horizontal={false} nestedScrollEnabled={true} removeClippedSubviews={false} showsVerticalScrollIndicator={false} showsHorizontalScrollIndicator={false} scrollEventThrottle={16} {...layoutProps} style={[{ width: '100%' }]} decelerationRate="fast" snapToOffsets={snapToOffsets} onScroll={onScroll} onScrollBeginDrag={onScrollBeginDrag} onScrollEndDrag={onScrollEndDrag} onMomentumScrollBegin={onMomentumScrollBegin} onMomentumScrollEnd={onMomentumScrollEnd} onContentSizeChange={onContentSizeChange} contentContainerStyle={contentContainerStyle}>
+          {renderInnerchild()}
+        </Reanimated.ScrollView>
+      </PickerViewColumnAnimationContext.Provider>);
     };
-    const renderOverlay = () => (<PickerOverlay itemHeight={itemHeight} overlayItemStyle={pickerOverlayStyle}/>);
-    return (<SafeAreaView style={[{ display: 'flex', flex: 1 }]}>
+    const renderIndicator = () => (<PickerIndicator itemHeight={itemHeight} indicatorItemStyle={pickerIndicatorStyle}/>);
+    const renderMask = () => (<PickerMask itemHeight={itemHeight} maskContainerStyle={pickerMaskStyle}/>);
+    return (<View style={[styles.wrapper, normalStyle]}>
       {renderScollView()}
-      {renderOverlay()}
-    </SafeAreaView>);
+      {renderMask()}
+      {renderIndicator()}
+    </View>);
+});
+const styles = StyleSheet.create({
+    wrapper: { display: 'flex', flex: 1 }
 });
 _PickerViewColumn.displayName = 'MpxPickerViewColumn';
 export default _PickerViewColumn;