@mpxjs/webpack-plugin 2.10.17 → 2.10.18

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

@@ -14,9 +14,12 @@ const KeyboardAvoidingView = ({ children, style, contentContainerStyle }) => {
     // 比如机型 iPhone 11 Pro，可能会导致显隐动画冲突
     // 因此增加状态标记 + cancelAnimation 来优化
     const isShow = useRef(false);
+    const keybaordHandleTimerRef = useRef(null);
     const animatedStyle = useAnimatedStyle(() => ({
-        // translate/position top可能会导致底部渲染区域缺失
-        marginTop: -offset.value,
+        // translate/position top+ overflow hidden 在 android 上时因为键盘顶起让页面高度变小，同时元素位置上移
+        // 此时最底部的区域是超出了页面高度的，hidden生效就被隐藏掉，因此需要 android 配置聚焦时禁用高度缩小
+        // margin-top 因为在 react-native 上和 flex 1 同时存在时，负值只会让容器高度整体变高，不会让元素上移
+        transform: [{ translateY: -offset.value }],
         flexBasis: basic.value
     }));
     const resetKeyboard = () => {
@@ -26,11 +29,20 @@ const KeyboardAvoidingView = ({ children, style, contentContainerStyle }) => {
         isShow.current = false;
         if (keyboardAvoid?.current) {
             const inputRef = keyboardAvoid.current.ref?.current;
-            if (inputRef && inputRef.isFocused()) {
+            if (inputRef && inputRef.isFocused() && !keyboardAvoid.current.readyToShow) {
                 // 修复 Android 点击键盘收起按钮时当前 input 没触发失焦的问题
+                // keyboardAvoid.current.readyToShow = true 表示聚焦到了新的输入框，不需要手动触发失焦
                 inputRef.blur();
             }
-            keyboardAvoid.current = null;
+            if (!keyboardAvoid.current.onKeyboardShow) {
+                // 修复部分 Android 机型可能时序问题：当从 input 已聚焦状态，聚焦到另一个 input 时，可能时序：
+                // - 新的 Input `onTouchStart` -> 新的 Input `onFocus` -> 旧输入框键盘 `keyboardDidHide` -> 新输入框键盘 `keyboardDidShow`
+                // - 此时 keyboardAvoid.current 如果清空 null，会导致新输入框键盘 `keyboardDidShow` 回调 keybaordAvoding 执行失败。
+                // 修复方案：
+                // 如果出现时序问题，那么新的 Input `onFocus` 会更早执行，那么 `keyboardAvoid.current.onKeyboardShow` 存在，
+                // 那么不应该重置为 null，反之，说明时正常情况，应当重置为 null。
+                keyboardAvoid.current = null;
+            }
         }
         cancelAnimation(offset);
         offset.value = withTiming(0, { duration, easing });
@@ -38,13 +50,20 @@ const KeyboardAvoidingView = ({ children, style, contentContainerStyle }) => {
     };
     const onTouchEnd = ({ nativeEvent }) => {
         if (nativeEvent.origin !== 'input') {
+            if (keyboardAvoid?.current?.holdKeyboard) {
+                return;
+            }
             Keyboard.isVisible() && Keyboard.dismiss();
         }
     };
     useEffect(() => {
         let subscriptions = [];
         function keybaordAvoding(evt) {
-            if (!keyboardAvoid?.current || isShow.current) {
+            if (keyboardAvoid?.current?.readyToShow) {
+                // 重置标记位
+                keyboardAvoid.current.readyToShow = false;
+            }
+            if (!keyboardAvoid?.current) {
                 return;
             }
             isShow.current = true;
@@ -84,13 +103,23 @@ const KeyboardAvoidingView = ({ children, style, contentContainerStyle }) => {
             }
         }
         if (isIOS) {
-            subscriptions = [Keyboard.addListener('keyboardWillShow', keybaordAvoding), Keyboard.addListener('keyboardWillHide', resetKeyboard)];
+            subscriptions = [
+                Keyboard.addListener('keyboardWillShow', (evt) => {
+                    if (keybaordHandleTimerRef.current) {
+                        clearTimeout(keybaordHandleTimerRef.current);
+                    }
+                    // iphone 在input聚焦时长按滑动后会导致 show 事件先于 focus 事件发生，因此等一下，等 focus 先触发拿到 input，避免键盘出现但input没顶上去
+                    keybaordHandleTimerRef.current = setTimeout(() => keybaordAvoding(evt), 32);
+                }),
+                Keyboard.addListener('keyboardWillHide', resetKeyboard)
+            ];
         }
         else {
             subscriptions = [Keyboard.addListener('keyboardDidShow', keybaordAvoding), Keyboard.addListener('keyboardDidHide', resetKeyboard)];
         }
         return () => {
             subscriptions.forEach(subscription => subscription.remove());
+            keybaordHandleTimerRef.current && clearTimeout(keybaordHandleTimerRef.current);
         };
     }, [keyboardAvoid]);
     return (<View style={style} onTouchEnd={onTouchEnd} onTouchMove={onTouchEnd}>

package/lib/runtime/components/react/dist/mpx-label.d.ts

@@ -18,4 +18,3 @@ export interface LabelProps {
 }
 declare const Label: import("react").ForwardRefExoticComponent<LabelProps & import("react").RefAttributes<HandlerRef<View, LabelProps>>>;
 export default Label;
-//# sourceMappingURL=mpx-label.d.ts.map

package/lib/runtime/components/react/dist/mpx-movable-area.d.ts

@@ -18,4 +18,3 @@ interface MovableAreaProps {
 }
 declare const _MovableArea: import("react").ForwardRefExoticComponent<MovableAreaProps & import("react").RefAttributes<HandlerRef<View, MovableAreaProps>>>;
 export default _MovableArea;
-//# sourceMappingURL=mpx-movable-area.d.ts.map

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

@@ -63,4 +63,3 @@ interface MovableViewProps {
 }
 declare const _MovableView: import("react").ForwardRefExoticComponent<MovableViewProps & import("react").RefAttributes<HandlerRef<View, MovableViewProps>>>;
 export default _MovableView;
-//# sourceMappingURL=mpx-movable-view.d.ts.map

package/lib/runtime/components/react/dist/mpx-nav.d.ts

@@ -6,4 +6,3 @@ export interface MpxNavProps {
 }
 declare const MpxNav: import("react").MemoExoticComponent<({ pageConfig, navigation }: MpxNavProps) => import("react").JSX.Element>;
 export default MpxNav;
-//# sourceMappingURL=mpx-nav.d.ts.map

package/lib/runtime/components/react/dist/mpx-navigator.d.ts

@@ -7,4 +7,3 @@ interface _NavigatorProps extends _ViewProps {
 }
 declare const _Navigator: import("react").ForwardRefExoticComponent<_NavigatorProps & import("react").RefAttributes<any>>;
 export default _Navigator;
-//# sourceMappingURL=mpx-navigator.d.ts.map

package/lib/runtime/components/react/dist/mpx-picker/date.d.ts

@@ -4,4 +4,3 @@ import { DateProps } from './type';
 import { HandlerRef } from '../useNodesRef';
 declare const PickerDate: React.ForwardRefExoticComponent<Omit<DateProps, "ref"> & React.RefAttributes<HandlerRef<View, DateProps>>>;
 export default PickerDate;
-//# sourceMappingURL=date.d.ts.map

package/lib/runtime/components/react/dist/mpx-picker/dateData.d.ts

@@ -5,4 +5,3 @@ export declare const years: string[];
 export declare const months: string[];
 export declare const daysInMonthLength: (year: number, month: number) => 30 | 28 | 29 | 31;
 export declare const daysInMonth: (year: number, month: number) => string[];
-//# sourceMappingURL=dateData.d.ts.map

package/lib/runtime/components/react/dist/mpx-picker/index.d.ts

@@ -4,4 +4,3 @@ import { HandlerRef } from '../useNodesRef';
 import { PickerProps } from './type';
 declare const Picker: React.ForwardRefExoticComponent<(Omit<import("./type").DateProps, "ref"> | Omit<import("./type").SelectorProps, "ref"> | Omit<import("./type").MultiSelectorProps, "ref"> | Omit<import("./type").TimeProps, "ref"> | Omit<import("./type").RegionProps, "ref">) & React.RefAttributes<HandlerRef<View, PickerProps>>>;
 export default Picker;
-//# sourceMappingURL=index.d.ts.map

package/lib/runtime/components/react/dist/mpx-picker/multiSelector.d.ts

@@ -4,4 +4,3 @@ import { MultiSelectorProps } from './type';
 import { HandlerRef } from '../useNodesRef';
 declare const PickerMultiSelector: React.ForwardRefExoticComponent<Omit<MultiSelectorProps, "ref"> & React.RefAttributes<HandlerRef<View, MultiSelectorProps>>>;
 export default PickerMultiSelector;
-//# sourceMappingURL=multiSelector.d.ts.map

package/lib/runtime/components/react/dist/mpx-picker/region.d.ts

@@ -4,4 +4,3 @@ import { RegionProps } from './type';
 import { HandlerRef } from '../useNodesRef';
 declare const PickerRegion: React.ForwardRefExoticComponent<Omit<RegionProps, "ref"> & React.RefAttributes<HandlerRef<View, RegionProps>>>;
 export default PickerRegion;
-//# sourceMappingURL=region.d.ts.map

package/lib/runtime/components/react/dist/mpx-picker/regionData.d.ts

@@ -1,3 +1,2 @@
 import { RegionObj } from './type';
 export declare const regionData: RegionObj[];
-//# sourceMappingURL=regionData.d.ts.map

package/lib/runtime/components/react/dist/mpx-picker/selector.d.ts

@@ -4,4 +4,3 @@ import { SelectorProps } from './type';
 import { HandlerRef } from '../useNodesRef';
 declare const PickerSelector: React.ForwardRefExoticComponent<Omit<SelectorProps, "ref"> & React.RefAttributes<HandlerRef<View, SelectorProps>>>;
 export default PickerSelector;
-//# sourceMappingURL=selector.d.ts.map

package/lib/runtime/components/react/dist/mpx-picker/time.d.ts

@@ -4,4 +4,3 @@ import { TimeProps } from './type';
 import { HandlerRef } from '../useNodesRef';
 declare const PickerTime: React.ForwardRefExoticComponent<Omit<TimeProps, "ref"> & React.RefAttributes<HandlerRef<View, TimeProps>>>;
 export default PickerTime;
-//# sourceMappingURL=time.d.ts.map

package/lib/runtime/components/react/dist/mpx-picker/type.d.ts

@@ -104,4 +104,3 @@ export interface FormType {
 }
 export type PickerProps = SelectorProps | MultiSelectorProps | TimeProps | DateProps | RegionProps;
 export type LanguageCode = 'zh-CN' | 'en-US';
-//# sourceMappingURL=type.d.ts.map

package/lib/runtime/components/react/dist/mpx-picker-view/index.d.ts

@@ -30,4 +30,3 @@ interface PickerViewProps {
 }
 declare const _PickerView: React.ForwardRefExoticComponent<PickerViewProps & React.RefAttributes<HandlerRef<View, PickerViewProps>>>;
 export default _PickerView;
-//# sourceMappingURL=index.d.ts.map

package/lib/runtime/components/react/dist/mpx-picker-view/pickerVIewContext.d.ts

@@ -6,4 +6,3 @@ export declare const usePickerViewColumnAnimationContext: () => ContextValue;
 export declare const PickerViewStyleContext: import("react").Context<Record<string, any> | undefined>;
 export declare const usePickerViewStyleContext: () => Record<string, any> | undefined;
 export {};
-//# sourceMappingURL=pickerVIewContext.d.ts.map

package/lib/runtime/components/react/dist/mpx-picker-view-column/index.d.ts

@@ -21,4 +21,3 @@ interface ColumnProps {
 }
 declare const _PickerViewColumn: React.ForwardRefExoticComponent<ColumnProps & React.RefAttributes<HandlerRef<ScrollView & View, ColumnProps>>>;
 export default _PickerViewColumn;
-//# sourceMappingURL=index.d.ts.map

package/lib/runtime/components/react/dist/mpx-picker-view-column/pickerViewColumnItem.d.ts

@@ -12,4 +12,3 @@ interface PickerColumnItemProps {
 }
 declare const PickerViewColumnItem: React.FC<PickerColumnItemProps>;
 export default PickerViewColumnItem;
-//# sourceMappingURL=pickerViewColumnItem.d.ts.map

package/lib/runtime/components/react/dist/mpx-picker-view-column/pickerViewColumnItemLite.d.ts

@@ -11,4 +11,3 @@ interface PickerColumnItemProps {
 }
 declare const PickerViewColumnItem: React.FC<PickerColumnItemProps>;
 export default PickerViewColumnItem;
-//# sourceMappingURL=pickerViewColumnItemLite.d.ts.map

package/lib/runtime/components/react/dist/mpx-picker-view-column/pickerViewFaces.d.ts

@@ -14,4 +14,3 @@ export declare const degToRad: (deg: number) => number;
 export declare const calcPickerHeight: (faces: Faces[], itemHeight: number) => number;
 export declare const calcHeightOffsets: (itemHeight: number) => number[];
 export declare const createFaces: (itemHeight: number, visibleCount: number) => Faces[];
-//# sourceMappingURL=pickerViewFaces.d.ts.map

package/lib/runtime/components/react/dist/mpx-picker-view-column/pickerViewIndicator.d.ts

@@ -10,4 +10,3 @@ declare const _PickerViewIndicator: {
     displayName: string;
 };
 export default _PickerViewIndicator;
-//# sourceMappingURL=pickerViewIndicator.d.ts.map

package/lib/runtime/components/react/dist/mpx-picker-view-column/pickerViewMask.d.ts

@@ -9,4 +9,3 @@ declare const _PickerViewMask: {
     displayName: string;
 };
 export default _PickerViewMask;
-//# sourceMappingURL=pickerViewMask.d.ts.map

package/lib/runtime/components/react/dist/mpx-popup/index.d.ts

@@ -20,4 +20,3 @@ declare const createPopupManager: (options?: IUsePopupOptions) => {
     remove: () => void;
 };
 export { createPopupManager };
-//# sourceMappingURL=index.d.ts.map

package/lib/runtime/components/react/dist/mpx-popup/popupBase.d.ts

@@ -14,4 +14,3 @@ declare const PopupBase: {
     displayName: string;
 };
 export default PopupBase;
-//# sourceMappingURL=popupBase.d.ts.map

package/lib/runtime/components/react/dist/mpx-portal/index.d.ts

@@ -13,4 +13,3 @@ declare const Portal: {
     update: (key: number, e: ReactNode) => void;
 };
 export default Portal;
-//# sourceMappingURL=index.d.ts.map

package/lib/runtime/components/react/dist/mpx-portal/portal-host.d.ts

@@ -27,4 +27,3 @@ declare class PortalGuard {
 export declare const portal: PortalGuard;
 declare const PortalHost: ({ children }: PortalHostProps) => JSX.Element;
 export default PortalHost;
-//# sourceMappingURL=portal-host.d.ts.map

package/lib/runtime/components/react/dist/mpx-portal/portal-manager.d.ts

@@ -7,4 +7,3 @@ export type State = {
 };
 declare const _PortalManager: import("react").ForwardRefExoticComponent<import("react").RefAttributes<unknown>>;
 export default _PortalManager;
-//# sourceMappingURL=portal-manager.d.ts.map

package/lib/runtime/components/react/dist/mpx-portal/portal-manager.jsx

@@ -7,7 +7,7 @@ const _PortalManager = forwardRef((props, ref) => {
         setState((prevState) => ({
             portals: [...prevState.portals, { key, children }]
         }));
-    }, [state]);
+    }, []);
     const update = useCallback((key, children) => {
         setState((prevState) => ({
             portals: prevState.portals.map((item) => {
@@ -17,7 +17,7 @@ const _PortalManager = forwardRef((props, ref) => {
                 return item;
             })
         }));
-    }, [state]);
+    }, []);
     const unmount = useCallback((key) => {
         setState((prevState) => ({
             portals: prevState.portals.filter((item) => item.key !== key)

package/lib/runtime/components/react/dist/mpx-progress.d.ts

@@ -21,4 +21,3 @@ export interface ProgressProps {
 }
 declare const Progress: import("react").ForwardRefExoticComponent<ProgressProps & import("react").RefAttributes<HandlerRef<View, ProgressProps>>>;
 export default Progress;
-//# sourceMappingURL=mpx-progress.d.ts.map

package/lib/runtime/components/react/dist/mpx-radio-group.d.ts

@@ -18,4 +18,3 @@ export interface RadioGroupProps {
 }
 declare const radioGroup: import("react").ForwardRefExoticComponent<RadioGroupProps & import("react").RefAttributes<HandlerRef<View, RadioGroupProps>>>;
 export default radioGroup;
-//# sourceMappingURL=mpx-radio-group.d.ts.map

package/lib/runtime/components/react/dist/mpx-radio.d.ts

@@ -24,4 +24,3 @@ export interface RadioProps {
 }
 declare const Radio: import("react").ForwardRefExoticComponent<RadioProps & import("react").RefAttributes<HandlerRef<View, RadioProps>>>;
 export default Radio;
-//# sourceMappingURL=mpx-radio.d.ts.map

package/lib/runtime/components/react/dist/mpx-rich-text/html.d.ts

@@ -1,2 +1 @@
 export declare const generateHTML: (html: string) => string;
-//# sourceMappingURL=html.d.ts.map

package/lib/runtime/components/react/dist/mpx-rich-text/index.d.ts

@@ -22,4 +22,3 @@ interface _RichTextProps extends ViewProps {
 }
 declare const _RichText: import("react").ForwardRefExoticComponent<_RichTextProps & import("react").RefAttributes<HandlerRef<View, _RichTextProps>>>;
 export default _RichText;
-//# sourceMappingURL=index.d.ts.map

package/lib/runtime/components/react/dist/mpx-root-portal.d.ts

@@ -12,4 +12,3 @@ declare const _RootPortal: {
     displayName: string;
 };
 export default _RootPortal;
-//# sourceMappingURL=mpx-root-portal.d.ts.map

package/lib/runtime/components/react/dist/mpx-scroll-view.d.ts

@@ -52,4 +52,3 @@ declare const _ScrollView: import("react").ForwardRefExoticComponent<ScrollViewP
     children?: ReactNode;
 } & import("react-native-gesture-handler").NativeViewGestureHandlerProps & import("react").RefAttributes<import("react").ComponentType<any>>> & import("react-native").ScrollView & View, ScrollViewProps>>>;
 export default _ScrollView;
-//# sourceMappingURL=mpx-scroll-view.d.ts.map

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

@@ -42,17 +42,23 @@ import { splitProps, splitStyle, useTransformStyle, useLayout, wrapChildren, ext
 import { IntersectionObserverContext, ScrollViewContext } from './context';
 import Portal from './mpx-portal';
 const AnimatedScrollView = RNAnimated.createAnimatedComponent(ScrollView);
+const REFRESH_COLOR = {
+    black: ['#000'],
+    white: ['#fff']
+};
 const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
     const { textProps, innerProps: props = {} } = splitProps(scrollViewProps);
-    const { enhanced = false, bounces = true, style = {}, binddragstart, binddragging, binddragend, bindtouchstart, bindtouchmove, bindtouchend, 'scroll-x': scrollX = false, 'scroll-y': scrollY = false, 'enable-back-to-top': enableBackToTop = false, 'enable-trigger-intersection-observer': enableTriggerIntersectionObserver = false, 'paging-enabled': pagingEnabled = false, 'upper-threshold': upperThreshold = 50, 'lower-threshold': lowerThreshold = 50, 'scroll-with-animation': scrollWithAnimation = false, 'refresher-enabled': refresherEnabled, 'refresher-default-style': refresherDefaultStyle, 'refresher-background': refresherBackground, 'refresher-threshold': refresherThreshold = 45, 'show-scrollbar': showScrollbar = true, 'scroll-into-view': scrollIntoView = '', 'scroll-top': scrollTop = 0, 'scroll-left': scrollLeft = 0, 'refresher-triggered': refresherTriggered, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, 'simultaneous-handlers': originSimultaneousHandlers, 'wait-for': waitFor, 'enable-sticky': enableSticky, 'scroll-event-throttle': scrollEventThrottle = 0, 'scroll-into-view-offset': scrollIntoViewOffset = 0, __selectRef } = props;
+    const { enhanced = false, bounces = true, style = {}, binddragstart, binddragging, binddragend, bindtouchmove, 'scroll-x': scrollX = false, 'scroll-y': scrollY = false, 'enable-back-to-top': enableBackToTop = false, 'enable-trigger-intersection-observer': enableTriggerIntersectionObserver = false, 'paging-enabled': pagingEnabled = false, 'upper-threshold': upperThreshold = 50, 'lower-threshold': lowerThreshold = 50, 'scroll-with-animation': scrollWithAnimation = false, 'refresher-enabled': refresherEnabled, 'refresher-default-style': refresherDefaultStyle, 'refresher-background': refresherBackground, 'refresher-threshold': refresherThreshold = 45, 'show-scrollbar': showScrollbar = true, 'scroll-into-view': scrollIntoView = '', 'scroll-top': scrollTop = 0, 'scroll-left': scrollLeft = 0, 'refresher-triggered': refresherTriggered, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, 'simultaneous-handlers': originSimultaneousHandlers, 'wait-for': waitFor, 'enable-sticky': enableSticky, 'scroll-event-throttle': scrollEventThrottle = 0, 'scroll-into-view-offset': scrollIntoViewOffset = 0, __selectRef } = props;
     const scrollOffset = useRef(new RNAnimated.Value(0)).current;
     const simultaneousHandlers = flatGesture(originSimultaneousHandlers);
     const waitForHandlers = flatGesture(waitFor);
+    const { refresherContent, otherContent } = getRefresherContent(props.children);
+    const hasRefresher = refresherContent && refresherEnabled;
     const [refreshing, setRefreshing] = useState(false);
     const [enableScroll, setEnableScroll] = useState(true);
-    const enableScrollValue = useSharedValue(true);
     const [scrollBounces, setScrollBounces] = useState(false);
-    const bouncesValue = useSharedValue(!!false);
+    const enableScrollValue = useSharedValue(true);
+    const bouncesValue = useSharedValue(false);
     const translateY = useSharedValue(0);
     const isAtTop = useSharedValue(true);
     const refresherHeight = useSharedValue(0);
@@ -68,13 +74,7 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
     const initialTimeout = useRef(null);
     const intersectionObservers = useContext(IntersectionObserverContext);
     const firstScrollIntoViewChange = useRef(true);
-    const refreshColor = {
-        black: ['#000'],
-        white: ['#fff']
-    };
     const isContentSizeChange = useRef(false);
-    const { refresherContent, otherContent } = getRefresherContent(props.children);
-    const hasRefresher = refresherContent && refresherEnabled;
     const { normalStyle, hasVarDec, varContextRef, hasSelfPercent, hasPositionFixed, setWidth, setHeight } = useTransformStyle(style, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
     const { textStyle, innerStyle = {} } = splitStyle(normalStyle);
     const scrollViewRef = useRef(null);
@@ -455,67 +455,71 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
             runOnJS(runOnJSCallback)('setScrollBounces', newValue);
         }
     }
-    // 处理下拉刷新的手势
-    const panGesture = Gesture.Pan()
-        .onUpdate((event) => {
-        'worklet';
-        if (enhanced && !!bounces) {
-            if (event.translationY > 0 && bouncesValue.value) {
-                updateBouncesState(false);
+    // 处理下拉刷新的手势 - 使用 useMemo 避免每次渲染都创建
+    const panGesture = useMemo(() => {
+        if (!hasRefresher)
+            return Gesture.Pan(); // 返回空手势
+        return Gesture.Pan()
+            .onUpdate((event) => {
+            'worklet';
+            if (enhanced && !!bounces) {
+                if (event.translationY > 0 && bouncesValue.value) {
+                    updateBouncesState(false);
+                }
+                else if ((event.translationY < 0) && !bouncesValue.value) {
+                    updateBouncesState(true);
+                }
             }
-            else if ((event.translationY < 0) && !bouncesValue.value) {
-                updateBouncesState(true);
+            if (translateY.value <= 0 && event.translationY < 0) {
+                // 滑动到顶再向上开启滚动
+                updateScrollState(true);
             }
-        }
-        if (translateY.value <= 0 && event.translationY < 0) {
-            // 滑动到顶再向上开启滚动
-            updateScrollState(true);
-        }
-        else if (event.translationY > 0 && isAtTop.value) {
-            // 滚动到顶再向下禁止滚动
-            updateScrollState(false);
-        }
-        // 禁止滚动后切换为滑动
-        if (!enableScrollValue.value && isAtTop.value) {
+            else if (event.translationY > 0 && isAtTop.value) {
+                // 滚动到顶再向下禁止滚动
+                updateScrollState(false);
+            }
+            // 禁止滚动后切换为滑动
+            if (!enableScrollValue.value && isAtTop.value) {
+                if (refreshing) {
+                    // 从完全展开状态(refresherHeight.value)开始计算偏移
+                    translateY.value = Math.max(0, Math.min(refresherHeight.value, refresherHeight.value + event.translationY));
+                }
+                else if (event.translationY > 0) {
+                    // 非刷新状态下的下拉逻辑保持不变
+                    translateY.value = Math.min(event.translationY * 0.6, refresherHeight.value);
+                }
+            }
+        })
+            .onEnd((event) => {
+            'worklet';
+            if (enableScrollValue.value)
+                return;
             if (refreshing) {
-                // 从完全展开状态(refresherHeight.value)开始计算偏移
-                translateY.value = Math.max(0, Math.min(refresherHeight.value, refresherHeight.value + event.translationY));
+                // 刷新状态下，根据滑动距离决定是否隐藏
+                // 如果向下滑动没超过 refresherThreshold，就完全隐藏，如果向上滑动完全隐藏
+                if ((event.translationY > 0 && translateY.value < refresherThreshold) || event.translationY < 0) {
+                    translateY.value = withTiming(0);
+                    updateScrollState(true);
+                    runOnJS(runOnJSCallback)('setRefreshing', false);
+                }
+                else {
+                    translateY.value = withTiming(refresherHeight.value);
+                }
             }
-            else if (event.translationY > 0) {
-                // 非刷新状态下的下拉逻辑保持不变
-                translateY.value = Math.min(event.translationY * 0.6, refresherHeight.value);
+            else if (event.translationY >= refresherHeight.value) {
+                // 触发刷新
+                translateY.value = withTiming(refresherHeight.value);
+                runOnJS(runOnJSCallback)('onRefresh');
             }
-        }
-    })
-        .onEnd((event) => {
-        'worklet';
-        if (enableScrollValue.value)
-            return;
-        if (refreshing) {
-            // 刷新状态下，根据滑动距离决定是否隐藏
-            // 如果向下滑动没超过 refresherThreshold，就完全隐藏，如果向上滑动完全隐藏
-            if ((event.translationY > 0 && translateY.value < refresherThreshold) || event.translationY < 0) {
+            else {
+                // 回弹
                 translateY.value = withTiming(0);
                 updateScrollState(true);
                 runOnJS(runOnJSCallback)('setRefreshing', false);
             }
-            else {
-                translateY.value = withTiming(refresherHeight.value);
-            }
-        }
-        else if (event.translationY >= refresherHeight.value) {
-            // 触发刷新
-            translateY.value = withTiming(refresherHeight.value);
-            runOnJS(runOnJSCallback)('onRefresh');
-        }
-        else {
-            // 回弹
-            translateY.value = withTiming(0);
-            updateScrollState(true);
-            runOnJS(runOnJSCallback)('setRefreshing', false);
-        }
-    })
-        .simultaneousWithExternalGesture(scrollViewRef);
+        })
+            .simultaneousWithExternalGesture(scrollViewRef);
+    }, [hasRefresher, enhanced, bounces, refreshing, refresherThreshold]);
     const scrollAdditionalProps = extendObject({
         style: extendObject(hasOwn(innerStyle, 'flex') || hasOwn(innerStyle, 'flexGrow')
             ? {}
@@ -575,29 +579,31 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
         'bindrefresherrefresh'
     ], { layoutRef });
     const ScrollViewComponent = enableSticky ? AnimatedScrollView : ScrollView;
-    const withRefresherScrollView = createElement(GestureDetector, { gesture: panGesture }, createElement(ScrollViewComponent, innerProps, createElement(Animated.View, { style: [refresherAnimatedStyle, refresherLayoutStyle], onLayout: onRefresherLayout }, refresherContent), createElement(Animated.View, { style: contentAnimatedStyle }, createElement(ScrollViewContext.Provider, { value: contextValue }, wrapChildren(extendObject({}, props, { children: otherContent }), {
-        hasVarDec,
-        varContext: varContextRef.current,
-        textStyle,
-        textProps
-    })))));
-    const commonScrollView = createElement(ScrollViewComponent, extendObject({}, innerProps, {
-        refreshControl: refresherEnabled
+    const createScrollViewContent = () => {
+        const wrappedChildren = wrapChildren(hasRefresher ? extendObject({}, props, { children: otherContent }) : props, {
+            hasVarDec,
+            varContext: varContextRef.current,
+            textStyle,
+            textProps
+        });
+        return createElement(ScrollViewContext.Provider, { value: contextValue }, wrappedChildren);
+    };
+    const withRefresherScrollView = () => {
+        return createElement(GestureDetector, { gesture: panGesture }, createElement(ScrollViewComponent, innerProps, createElement(Animated.View, { style: [refresherAnimatedStyle, refresherLayoutStyle], onLayout: onRefresherLayout }, refresherContent), createElement(Animated.View, { style: contentAnimatedStyle }, createScrollViewContent())));
+    };
+    const commonScrollView = () => {
+        const refreshControl = refresherEnabled
             ? createElement(RefreshControl, extendObject({
                 progressBackgroundColor: refresherBackground,
                 refreshing: refreshing,
                 onRefresh: onRefresh
             }, refresherDefaultStyle && refresherDefaultStyle !== 'none'
-                ? { colors: refreshColor[refresherDefaultStyle] }
+                ? { colors: REFRESH_COLOR[refresherDefaultStyle] }
                 : {}))
-            : undefined
-    }), createElement(ScrollViewContext.Provider, { value: contextValue }, wrapChildren(props, {
-        hasVarDec,
-        varContext: varContextRef.current,
-        textStyle,
-        textProps
-    })));
-    let scrollViewComponent = hasRefresher ? withRefresherScrollView : commonScrollView;
+            : undefined;
+        return createElement(ScrollViewComponent, extendObject({}, innerProps, { refreshControl }), createScrollViewContent());
+    };
+    let scrollViewComponent = hasRefresher ? withRefresherScrollView() : commonScrollView();
     if (hasPositionFixed) {
         scrollViewComponent = createElement(Portal, null, scrollViewComponent);
     }

package/lib/runtime/components/react/dist/mpx-simple-text.d.ts

@@ -5,4 +5,3 @@ declare const SimpleText: {
     displayName: string;
 };
 export default SimpleText;
-//# sourceMappingURL=mpx-simple-text.d.ts.map

package/lib/runtime/components/react/dist/mpx-simple-view.d.ts

@@ -5,4 +5,3 @@ declare const SimpleView: {
     displayName: string;
 };
 export default SimpleView;
-//# sourceMappingURL=mpx-simple-view.d.ts.map

package/lib/runtime/components/react/dist/mpx-slider.d.ts

@@ -28,4 +28,3 @@ export interface SliderProps {
 }
 declare const Slider: import("react").ForwardRefExoticComponent<SliderProps & import("react").RefAttributes<HandlerRef<View, SliderProps>>>;
 export default Slider;
-//# sourceMappingURL=mpx-slider.d.ts.map

package/lib/runtime/components/react/dist/mpx-sticky-header.d.ts

@@ -15,4 +15,3 @@ interface StickyHeaderProps {
 }
 declare const _StickyHeader: import("react").ForwardRefExoticComponent<StickyHeaderProps & import("react").RefAttributes<HandlerRef<View, StickyHeaderProps>>>;
 export default _StickyHeader;
-//# sourceMappingURL=mpx-sticky-header.d.ts.map