@mpxjs/webpack-plugin 2.10.5 → 2.10.6-beta.1

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

@@ -44,6 +44,7 @@ import { useUpdateEffect, useTransformStyle, useLayout, extendObject, isIOS } fr
 import useInnerProps, { getCustomEvent } from './getInnerListeners';
 import useNodesRef from './useNodesRef';
 import { FormContext, KeyboardAvoidContext } from './context';
+import Portal from './mpx-portal';
 const keyboardTypeMap = {
     text: 'default',
     number: 'numeric',
@@ -83,7 +84,7 @@ const Input = forwardRef((props, ref) => {
     const styleObj = extendObject({ padding: 0, backgroundColor: '#fff' }, style, multiline && autoHeight
         ? { height: 'auto', minHeight: Math.max(style?.minHeight || 35, contentHeight) }
         : {});
-    const { hasSelfPercent, normalStyle, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
+    const { hasPositionFixed, hasSelfPercent, normalStyle, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
     const nodeRef = useRef(null);
     useNodesRef(props, ref, nodeRef, {
         style: normalStyle
@@ -289,7 +290,11 @@ const Input = forwardRef((props, ref) => {
     ], {
         layoutRef
     });
-    return createElement(TextInput, innerProps);
+    const finalComponent = createElement(TextInput, innerProps);
+    if (hasPositionFixed) {
+        return createElement(Portal, null, finalComponent);
+    }
+    return finalComponent;
 });
 Input.displayName = 'MpxInput';
 export default Input;

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

@@ -36,7 +36,7 @@ const KeyboardAvoidingView = ({ children, style, contentContainerStyle }) => {
                     const { ref, cursorSpacing = 0 } = keyboardAvoid.current;
                     setTimeout(() => {
                         ref?.current?.measure((x, y, width, height, pageX, pageY) => {
-                            const aboveOffset = pageY + height - endCoordinates.screenY;
+                            const aboveOffset = offset.value + pageY + height - endCoordinates.screenY;
                             const aboveValue = -aboveOffset >= cursorSpacing ? 0 : aboveOffset + cursorSpacing;
                             const belowValue = Math.min(endCoordinates.height, aboveOffset + cursorSpacing);
                             const value = aboveOffset > 0 ? belowValue : aboveValue;

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

@@ -8,6 +8,7 @@ import useInnerProps, { getCustomEvent } from './getInnerListeners';
 import useNodesRef from './useNodesRef';
 import { splitProps, splitStyle, useLayout, useTransformStyle, wrapChildren, extendObject } from './utils';
 import { LabelContext } from './context';
+import Portal from './mpx-portal';
 const Label = forwardRef((labelProps, ref) => {
     const { textProps, innerProps: props = {} } = splitProps(labelProps);
     const propsRef = useRef({});
@@ -17,7 +18,7 @@ const Label = forwardRef((labelProps, ref) => {
         flexDirection: 'row'
     };
     const styleObj = extendObject({}, defaultStyle, style);
-    const { hasSelfPercent, normalStyle, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
+    const { hasPositionFixed, hasSelfPercent, normalStyle, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
     const nodeRef = useRef(null);
     useNodesRef(props, ref, nodeRef, { style: normalStyle });
     const { layoutRef, layoutStyle, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef });
@@ -40,12 +41,16 @@ const Label = forwardRef((labelProps, ref) => {
     }), [], {
         layoutRef
     });
-    return createElement(View, innerProps, createElement(LabelContext.Provider, { value: contextRef }, wrapChildren(props, {
+    const finalComponent = createElement(View, innerProps, createElement(LabelContext.Provider, { value: contextRef }, wrapChildren(props, {
         hasVarDec,
         varContext: varContextRef.current,
         textStyle,
         textProps
     })));
+    if (hasPositionFixed) {
+        return createElement(Portal, null, finalComponent);
+    }
+    return finalComponent;
 });
 Label.displayName = 'MpxLabel';
 export default Label;

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

@@ -7,9 +7,10 @@ import useNodesRef from './useNodesRef';
 import useInnerProps from './getInnerListeners';
 import { MovableAreaContext } from './context';
 import { useTransformStyle, wrapChildren, useLayout, extendObject } from './utils';
+import Portal from './mpx-portal';
 const _MovableArea = forwardRef((props, ref) => {
     const { style = {}, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight } = props;
-    const { hasSelfPercent, normalStyle, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(style, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
+    const { hasSelfPercent, normalStyle, hasVarDec, varContextRef, hasPositionFixed, setWidth, setHeight } = useTransformStyle(style, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
     const movableViewRef = useRef(null);
     useNodesRef(props, ref, movableViewRef, {
         style: normalStyle
@@ -20,13 +21,17 @@ const _MovableArea = forwardRef((props, ref) => {
     }), [normalStyle.width, normalStyle.height]);
     const { layoutRef, layoutStyle, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef: movableViewRef });
     const innerProps = useInnerProps(extendObject({}, props, layoutProps, {
-        style: extendObject({ height: contextValue.height, width: contextValue.width, overflow: 'hidden' }, normalStyle, layoutStyle),
+        style: extendObject({ height: contextValue.height, width: contextValue.width }, normalStyle, layoutStyle),
         ref: movableViewRef
     }), [], { layoutRef });
-    return createElement(MovableAreaContext.Provider, { value: contextValue }, createElement(View, innerProps, wrapChildren(props, {
+    let movableComponent = createElement(MovableAreaContext.Provider, { value: contextValue }, createElement(View, innerProps, wrapChildren(props, {
         hasVarDec,
         varContext: varContextRef.current
     })));
+    if (hasPositionFixed) {
+        movableComponent = createElement(Portal, null, movableComponent);
+    }
+    return movableComponent;
 });
 _MovableArea.displayName = 'MpxMovableArea';
 export default _MovableArea;

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

@@ -24,7 +24,7 @@ import useNodesRef from './useNodesRef';
 import { MovableAreaContext } from './context';
 import { useTransformStyle, splitProps, splitStyle, HIDDEN_STYLE, wrapChildren, flatGesture, extendObject, omit, useNavigation } from './utils';
 import { GestureDetector, Gesture } from 'react-native-gesture-handler';
-import Animated, { useSharedValue, useAnimatedStyle, withDecay, runOnJS, runOnUI, useAnimatedReaction, withSpring } from 'react-native-reanimated';
+import Animated, { useSharedValue, useAnimatedStyle, withDecay, runOnJS, runOnUI, withSpring } from 'react-native-reanimated';
 import { collectDataset, noop } from '@mpxjs/utils';
 const styles = StyleSheet.create({
     container: {
@@ -41,7 +41,7 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
     const hasLayoutRef = useRef(false);
     const propsRef = useRef({});
     propsRef.current = (props || {});
-    const { x = 0, y = 0, inertia = false, disabled = false, animation = true, 'out-of-bounds': outOfBounds = false, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, direction = 'none', 'simultaneous-handlers': originSimultaneousHandlers = [], 'wait-for': waitFor = [], style = {}, bindtouchstart, catchtouchstart, bindhtouchmove, bindvtouchmove, bindtouchmove, catchhtouchmove, catchvtouchmove, catchtouchmove, bindtouchend, catchtouchend } = props;
+    const { x = 0, y = 0, inertia = false, disabled = false, animation = true, 'out-of-bounds': outOfBounds = false, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, direction = 'none', 'simultaneous-handlers': originSimultaneousHandlers = [], 'wait-for': waitFor = [], style = {}, bindtouchstart, catchtouchstart, bindhtouchmove, bindvtouchmove, bindtouchmove, catchhtouchmove, catchvtouchmove, catchtouchmove, bindtouchend, catchtouchend, bindchange } = props;
     const { hasSelfPercent, normalStyle, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(Object.assign({}, style, styles.container), { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
     const navigation = useNavigation();
     const prevSimultaneousHandlersRef = useRef(originSimultaneousHandlers || []);
@@ -61,6 +61,7 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
     const yInertialMotion = useSharedValue(false);
     const isFirstTouch = useSharedValue(true);
     const touchEvent = useSharedValue('');
+    const initialViewPosition = useSharedValue({ x: x || 0, y: y || 0 });
     const MovableAreaLayout = useContext(MovableAreaContext);
     const simultaneousHandlers = flatGesture(originSimultaneousHandlers);
     const waitForHandlers = flatGesture(waitFor);
@@ -118,11 +119,13 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
                         })
                         : newY;
                 }
-                runOnJS(handleTriggerChange)({
-                    x: newX,
-                    y: newY,
-                    type: 'setData'
-                });
+                if (bindchange) {
+                    runOnJS(handleTriggerChange)({
+                        x: newX,
+                        y: newY,
+                        type: 'setData'
+                    });
+                }
             }
         })();
     }, [x, y]);
@@ -132,16 +135,6 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
             resetBoundaryAndCheck({ width, height });
         }
     }, [MovableAreaLayout.height, MovableAreaLayout.width]);
-    useAnimatedReaction(() => ({
-        offsetX: offsetX.value,
-        offsetY: offsetY.value
-    }), (currentValue) => {
-        const { offsetX, offsetY } = currentValue;
-        runOnJS(handleTriggerChange)({
-            x: offsetX,
-            y: offsetY
-        });
-    });
     const getTouchSource = useCallback((offsetX, offsetY) => {
         const hasOverBoundary = offsetX < draggableXRange.value[0] || offsetX > draggableXRange.value[1] ||
             offsetY < draggableYRange.value[0] || offsetY > draggableYRange.value[1];
@@ -259,11 +252,13 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
         });
     }, []);
     const triggerStartOnJS = ({ e }) => {
+        const { bindtouchstart, catchtouchstart } = propsRef.current;
         extendEvent(e, 'start');
         bindtouchstart && bindtouchstart(e);
         catchtouchstart && catchtouchstart(e);
     };
     const triggerMoveOnJS = ({ e, hasTouchmove, hasCatchTouchmove, touchEvent }) => {
+        const { bindhtouchmove, bindvtouchmove, bindtouchmove, catchhtouchmove, catchvtouchmove, catchtouchmove } = propsRef.current;
         extendEvent(e, 'move');
         if (hasTouchmove) {
             if (touchEvent === 'htouchmove') {
@@ -285,6 +280,7 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
         }
     };
     const triggerEndOnJS = ({ e }) => {
+        const { bindtouchend, catchtouchend } = propsRef.current;
         extendEvent(e, 'end');
         bindtouchend && bindtouchend(e);
         catchtouchend && catchtouchend(e);
@@ -315,6 +311,13 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
             if (bindtouchstart || catchtouchstart) {
                 runOnJS(triggerStartOnJS)({ e });
             }
+        })
+            .onStart(() => {
+            'worklet';
+            initialViewPosition.value = {
+                x: offsetX.value,
+                y: offsetY.value
+            };
         })
             .onTouchesMove((e) => {
             'worklet';
@@ -325,12 +328,13 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
                 isFirstTouch.value = false;
             }
             handleTriggerMove(e);
+        })
+            .onUpdate((e) => {
+            'worklet';
             if (disabled)
                 return;
-            const changeX = changedTouches.x - startPosition.value.x;
-            const changeY = changedTouches.y - startPosition.value.y;
             if (direction === 'horizontal' || direction === 'all') {
-                const newX = offsetX.value + changeX;
+                const newX = initialViewPosition.value.x + e.translationX;
                 if (!outOfBounds) {
                     const { x } = checkBoundaryPosition({ positionX: newX, positionY: offsetY.value });
                     offsetX.value = x;
@@ -340,7 +344,7 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
                 }
             }
             if (direction === 'vertical' || direction === 'all') {
-                const newY = offsetY.value + changeY;
+                const newY = initialViewPosition.value.y + e.translationY;
                 if (!outOfBounds) {
                     const { y } = checkBoundaryPosition({ positionX: offsetX.value, positionY: newY });
                     offsetY.value = y;
@@ -349,6 +353,12 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
                     offsetY.value = newY;
                 }
             }
+            if (bindchange) {
+                runOnJS(handleTriggerChange)({
+                    x: offsetX.value,
+                    y: offsetY.value
+                });
+            }
         })
             .onTouchesUp((e) => {
             'worklet';
@@ -357,55 +367,83 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
             if (bindtouchend || catchtouchend) {
                 runOnJS(triggerEndOnJS)({ e });
             }
-            if (disabled)
-                return;
-            if (!inertia) {
-                const { x, y } = checkBoundaryPosition({ positionX: offsetX.value, positionY: offsetY.value });
-                if (x !== offsetX.value) {
-                    offsetX.value = animation
-                        ? withSpring(x, {
-                            duration: 1500,
-                            dampingRatio: 0.8
-                        })
-                        : x;
-                }
-                if (y !== offsetY.value) {
-                    offsetY.value = animation
-                        ? withSpring(y, {
-                            duration: 1500,
-                            dampingRatio: 0.8
-                        })
-                        : y;
-                }
-            }
         })
-            .onFinalize((e) => {
+            .onEnd((e) => {
             'worklet';
             isMoving.value = false;
-            if (!inertia || disabled || !animation)
+            if (disabled)
                 return;
-            if (direction === 'horizontal' || direction === 'all') {
-                xInertialMotion.value = true;
-                offsetX.value = withDecay({
-                    velocity: e.velocityX / 10,
-                    rubberBandEffect: outOfBounds,
-                    clamp: draggableXRange.value
-                }, () => {
-                    xInertialMotion.value = false;
-                });
+            // 处理没有惯性且超出边界的回弹
+            if (!inertia && outOfBounds) {
+                const { x, y } = checkBoundaryPosition({ positionX: offsetX.value, positionY: offsetY.value });
+                if (x !== offsetX.value || y !== offsetY.value) {
+                    if (x !== offsetX.value) {
+                        offsetX.value = animation
+                            ? withSpring(x, {
+                                duration: 1500,
+                                dampingRatio: 0.8
+                            })
+                            : x;
+                    }
+                    if (y !== offsetY.value) {
+                        offsetY.value = animation
+                            ? withSpring(y, {
+                                duration: 1500,
+                                dampingRatio: 0.8
+                            })
+                            : y;
+                    }
+                    if (bindchange) {
+                        runOnJS(handleTriggerChange)({
+                            x,
+                            y
+                        });
+                    }
+                }
             }
-            if (direction === 'vertical' || direction === 'all') {
-                yInertialMotion.value = true;
-                offsetY.value = withDecay({
-                    velocity: e.velocityY / 10,
-                    rubberBandEffect: outOfBounds,
-                    clamp: draggableYRange.value
-                }, () => {
-                    yInertialMotion.value = false;
-                });
+            else if (inertia) {
+                // 惯性处理
+                if (direction === 'horizontal' || direction === 'all') {
+                    xInertialMotion.value = true;
+                    offsetX.value = withDecay({
+                        velocity: e.velocityX / 10,
+                        rubberBandEffect: outOfBounds,
+                        clamp: draggableXRange.value
+                    }, () => {
+                        xInertialMotion.value = false;
+                        if (bindchange) {
+                            runOnJS(handleTriggerChange)({
+                                x: offsetX.value,
+                                y: offsetY.value
+                            });
+                        }
+                    });
+                }
+                if (direction === 'vertical' || direction === 'all') {
+                    yInertialMotion.value = true;
+                    offsetY.value = withDecay({
+                        velocity: e.velocityY / 10,
+                        rubberBandEffect: outOfBounds,
+                        clamp: draggableYRange.value
+                    }, () => {
+                        yInertialMotion.value = false;
+                        if (bindchange) {
+                            runOnJS(handleTriggerChange)({
+                                x: offsetX.value,
+                                y: offsetY.value
+                            });
+                        }
+                    });
+                }
             }
         })
             .withRef(movableGestureRef);
+        if (direction === 'horizontal') {
+            gesturePan.activeOffsetX([-5, 5]).failOffsetY([-5, 5]);
+        }
+        else if (direction === 'vertical') {
+            gesturePan.activeOffsetY([-5, 5]).failOffsetX([-5, 5]);
+        }
         if (simultaneousHandlers && simultaneousHandlers.length) {
             gesturePan.simultaneousWithExternalGesture(...simultaneousHandlers);
         }

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

@@ -1,4 +1,4 @@
-import React, { forwardRef, useRef, useContext, useEffect } from 'react';
+import React, { forwardRef, useRef, useContext, useEffect, createElement } from 'react';
 import { StyleSheet, Text, TouchableWithoutFeedback, View } from 'react-native';
 import { warn } from '@mpxjs/utils';
 import PickerSelector from './selector';
@@ -9,7 +9,7 @@ import PickerRegion from './region';
 import { FormContext, RouteContext } from '../context';
 import useNodesRef from '../useNodesRef';
 import useInnerProps, { getCustomEvent } from '../getInnerListeners';
-import { extendObject } from '../utils';
+import { extendObject, useLayout } from '../utils';
 import { createPopupManager } from '../mpx-popup';
 /**
  * ✔ mode
@@ -109,17 +109,18 @@ const Picker = forwardRef((props, ref) => {
     const buttonText = buttonTextMap[global.__mpx?.i18n?.locale || 'zh-CN'];
     const pickerValue = useRef(value);
     pickerValue.current = Array.isArray(value) ? value.slice() : value;
-    const innerLayout = useRef({});
     const nodeRef = useRef(null);
     const pickerRef = useRef(null);
     const { open, show, hide, remove } = useRef(createPopupManager()).current;
     useNodesRef(props, ref, nodeRef);
+    const { layoutRef, layoutProps } = useLayout({
+        props,
+        hasSelfPercent: false,
+        nodeRef
+    });
     const innerProps = useInnerProps(extendObject({}, props, {
         ref: nodeRef
-    }), [], { layoutRef: innerLayout });
-    const getInnerLayout = (layout) => {
-        innerLayout.current = layout.current;
-    };
+    }, layoutProps), [], { layoutRef });
     useEffect(() => {
         if (range && pickerRef.current && mode === "multiSelector" /* PickerMode.MULTI_SELECTOR */) {
             pickerRef.current.updateRange?.(range);
@@ -162,7 +163,7 @@ const Picker = forwardRef((props, ref) => {
         if (mode !== "multiSelector" /* PickerMode.MULTI_SELECTOR */) {
             return;
         }
-        const eventData = getCustomEvent('columnchange', {}, { detail: { column: columnIndex, value }, layoutRef: innerLayout });
+        const eventData = getCustomEvent('columnchange', {}, { detail: { column: columnIndex, value }, layoutRef });
         props.bindcolumnchange?.(eventData);
     };
     const onCancel = () => {
@@ -170,7 +171,7 @@ const Picker = forwardRef((props, ref) => {
         hide();
     };
     const onConfirm = () => {
-        const eventData = getCustomEvent('change', {}, { detail: { value: pickerValue.current }, layoutRef: innerLayout });
+        const eventData = getCustomEvent('change', {}, { detail: { value: pickerValue.current }, layoutRef });
         bindchange?.(eventData);
         hide();
     };
@@ -179,7 +180,6 @@ const Picker = forwardRef((props, ref) => {
         children,
         bindchange: onChange,
         bindcolumnchange: onColumnChange,
-        getInnerLayout,
         getRange: () => range
     });
     const renderPickerContent = () => {
@@ -215,9 +215,7 @@ const Picker = forwardRef((props, ref) => {
             remove();
         };
     }, []);
-    return (<TouchableWithoutFeedback onPress={show}>
-        {children}
-      </TouchableWithoutFeedback>);
+    return createElement(TouchableWithoutFeedback, { onPress: show }, createElement(View, innerProps, children));
 });
 Picker.displayName = 'MpxPicker';
 export default Picker;

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

@@ -1,9 +1,10 @@
 import { View } from 'react-native';
-import React, { forwardRef, useRef } from 'react';
+import React, { createElement, forwardRef, useRef } from 'react';
 import useInnerProps, { getCustomEvent } from '../getInnerListeners';
 import useNodesRef from '../useNodesRef';
 import { useLayout, splitProps, splitStyle, wrapChildren, useTransformStyle, extendObject } from '../utils';
 import { PickerViewStyleContext } from './pickerVIewContext';
+import Portal from '../mpx-portal';
 const styles = {
     wrapper: {
         display: 'flex',
@@ -23,7 +24,7 @@ const _PickerView = forwardRef((props, ref) => {
     const activeValueRef = useRef(value);
     activeValueRef.current = value.slice();
     const snapActiveValueRef = useRef(null);
-    const { normalStyle, hasVarDec, varContextRef, hasSelfPercent, setWidth, setHeight } = useTransformStyle(style, { enableVar, externalVarContext });
+    const { normalStyle, hasVarDec, varContextRef, hasSelfPercent, setWidth, setHeight, hasPositionFixed } = useTransformStyle(style, { enableVar, externalVarContext });
     useNodesRef(props, ref, nodeRef, {
         style: normalStyle
     });
@@ -114,11 +115,11 @@ const _PickerView = forwardRef((props, ref) => {
         onInitialChange(isInvalid, validValue);
         return renderColumns;
     };
-    return (<PickerViewStyleContext.Provider value={textStyle}>
-      <View {...innerProps}>
-        <View style={[styles.wrapper]}>{renderPickerColumns()}</View>
-      </View>
-    </PickerViewStyleContext.Provider>);
+    const finalComponent = createElement(PickerViewStyleContext.Provider, { value: textStyle }, createElement(View, innerProps, createElement(View, { style: [styles.wrapper] }, renderPickerColumns())));
+    if (hasPositionFixed) {
+        return createElement(Portal, null, finalComponent);
+    }
+    return finalComponent;
 });
 _PickerView.displayName = 'MpxPickerView';
 export default _PickerView;

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

@@ -1,7 +1,7 @@
-import React, { forwardRef, useRef, useState, useMemo, useEffect, useCallback } from 'react';
+import React, { forwardRef, useRef, useState, useMemo, useEffect, useCallback, createElement } from 'react';
 import { StyleSheet, View } from 'react-native';
 import Reanimated, { useAnimatedRef, useScrollViewOffset } from 'react-native-reanimated';
-import { useTransformStyle, splitStyle, splitProps, useLayout, usePrevious, isAndroid, isIOS, isHarmony } from '../utils';
+import { useTransformStyle, splitStyle, splitProps, useLayout, usePrevious, isAndroid, isIOS, isHarmony, extendObject } from '../utils';
 import useNodesRef from '../useNodesRef';
 import PickerIndicator from './pickerViewIndicator';
 import PickerMask from './pickerViewMask';
@@ -220,11 +220,28 @@ const _PickerViewColumn = forwardRef((props, ref) => {
         return (<MpxPickerVIewColumnItem key={index} item={item} index={index} itemHeight={itemHeight} textStyle={textStyle} textProps={textProps} visibleCount={visibleCount} onItemLayout={onItemLayout}/>);
     });
     const renderScollView = () => {
-        return (<PickerViewColumnAnimationContext.Provider value={offsetYShared}>
-        <Reanimated.ScrollView ref={scrollViewRef} bounces={true} horizontal={false} nestedScrollEnabled={true} removeClippedSubviews={false} showsVerticalScrollIndicator={false} showsHorizontalScrollIndicator={false} scrollEventThrottle={16} {...layoutProps} onTouchEnd={onClickOnceItem} 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 innerProps = extendObject({}, layoutProps, {
+            ref: scrollViewRef,
+            bounces: true,
+            horizontal: false,
+            nestedScrollEnabled: true,
+            removeClippedSubviews: false,
+            showsVerticalScrollIndicator: false,
+            showsHorizontalScrollIndicator: false,
+            scrollEventThrottle: 16,
+            style: styles.scrollView,
+            decelerationRate: 'fast',
+            snapToOffsets: snapToOffsets,
+            onTouchEnd: onClickOnceItem,
+            onScroll,
+            onScrollBeginDrag,
+            onScrollEndDrag,
+            onMomentumScrollBegin,
+            onMomentumScrollEnd,
+            onContentSizeChange,
+            contentContainerStyle
+        });
+        return createElement(PickerViewColumnAnimationContext.Provider, { value: offsetYShared }, createElement(Reanimated.ScrollView, innerProps, renderInnerchild()));
     };
     const renderIndicator = () => (<PickerIndicator itemHeight={itemHeight} indicatorItemStyle={pickerIndicatorStyle}/>);
     const renderMask = () => (<PickerMask itemHeight={itemHeight} maskContainerStyle={pickerMaskStyle}/>);
@@ -235,7 +252,8 @@ const _PickerViewColumn = forwardRef((props, ref) => {
     </View>);
 });
 const styles = StyleSheet.create({
-    wrapper: { display: 'flex', flex: 1 }
+    wrapper: { display: 'flex', flex: 1 },
+    scrollView: { width: '100%' }
 });
 _PickerViewColumn.displayName = 'MpxPickerViewColumn';
 export default _PickerViewColumn;

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

@@ -8,6 +8,7 @@ import { FormContext, RadioGroupContext } from './context';
 import useInnerProps, { getCustomEvent } from './getInnerListeners';
 import useNodesRef from './useNodesRef';
 import { useLayout, useTransformStyle, wrapChildren, extendObject } from './utils';
+import Portal from './mpx-portal';
 const radioGroup = forwardRef((props, ref) => {
     const { style = {}, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight } = props;
     const propsRef = useRef({});
@@ -23,7 +24,7 @@ const radioGroup = forwardRef((props, ref) => {
         flexWrap: 'wrap'
     };
     const styleObj = extendObject({}, defaultStyle, style);
-    const { hasSelfPercent, normalStyle, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
+    const { hasPositionFixed, hasSelfPercent, normalStyle, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
     const nodeRef = useRef(null);
     useNodesRef(props, ref, nodeRef, { style: normalStyle });
     const { layoutRef, layoutStyle, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef });
@@ -77,10 +78,16 @@ const radioGroup = forwardRef((props, ref) => {
     }), ['name'], {
         layoutRef
     });
-    return createElement(View, innerProps, createElement(RadioGroupContext.Provider, { value: contextValue }, wrapChildren(props, {
+    const finalComponent = createElement(View, innerProps, createElement(RadioGroupContext.Provider, {
+        value: contextValue
+    }, wrapChildren(props, {
         hasVarDec,
         varContext: varContextRef.current
     })));
+    if (hasPositionFixed) {
+        return createElement(Portal, null, finalComponent);
+    }
+    return finalComponent;
 });
 radioGroup.displayName = 'MpxRadioGroup';
 export default radioGroup;

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

@@ -12,6 +12,7 @@ import useInnerProps, { getCustomEvent } from './getInnerListeners';
 import useNodesRef from './useNodesRef';
 import { splitProps, splitStyle, useLayout, useTransformStyle, wrapChildren, extendObject } from './utils';
 import Icon from './mpx-icon';
+import Portal from './mpx-portal';
 const styles = StyleSheet.create({
     container: {
         flexDirection: 'row',
@@ -73,7 +74,7 @@ const Radio = forwardRef((radioProps, ref) => {
         bindtap && bindtap(getCustomEvent('tap', evt, { layoutRef }, props));
         onChange(evt);
     };
-    const { hasSelfPercent, normalStyle, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
+    const { hasPositionFixed, hasSelfPercent, normalStyle, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
     const { textStyle, backgroundStyle, innerStyle = {} } = splitStyle(normalStyle);
     if (backgroundStyle) {
         warn('Radio does not support background image-related styles!');
@@ -123,7 +124,7 @@ const Radio = forwardRef((radioProps, ref) => {
             }
         }
     }, [checked]);
-    return createElement(View, innerProps, createElement(View, { style: defaultStyle }, createElement(Icon, {
+    const finalComponent = createElement(View, innerProps, createElement(View, { style: defaultStyle }, createElement(Icon, {
         type: 'success',
         size: 24,
         color: disabled ? '#E1E1E1' : color,
@@ -134,6 +135,10 @@ const Radio = forwardRef((radioProps, ref) => {
         textStyle,
         textProps
     }));
+    if (hasPositionFixed) {
+        return createElement(Portal, null, finalComponent);
+    }
+    return finalComponent;
 });
 Radio.displayName = 'MpxRadio';
 export default Radio;

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

@@ -8,6 +8,7 @@ import useNodesRef from '../useNodesRef'; // 引入辅助函数
 import { useTransformStyle, useLayout, extendObject } from '../utils';
 import { WebView } from 'react-native-webview';
 import { generateHTML } from './html';
+import Portal from '../mpx-portal';
 function jsonToHtmlStr(elements) {
     let htmlStr = '';
     for (const element of elements) {
@@ -30,7 +31,7 @@ const _RichText = forwardRef((props, ref) => {
     const { style = {}, nodes, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight } = props;
     const nodeRef = useRef(null);
     const [webViewHeight, setWebViewHeight] = useState(0);
-    const { normalStyle, hasSelfPercent, setWidth, setHeight } = useTransformStyle(Object.assign({
+    const { normalStyle, hasSelfPercent, setWidth, setHeight, hasPositionFixed } = useTransformStyle(Object.assign({
         width: '100%',
         height: webViewHeight
     }, style), {
@@ -51,12 +52,16 @@ const _RichText = forwardRef((props, ref) => {
         layoutRef
     });
     const html = typeof nodes === 'string' ? nodes : jsonToHtmlStr(nodes);
-    return createElement(View, innerProps, createElement(WebView, {
+    let finalComponent = createElement(View, innerProps, createElement(WebView, {
         source: { html: generateHTML(html) },
         onMessage: (event) => {
             setWebViewHeight(+event.nativeEvent.data);
         }
     }));
+    if (hasPositionFixed) {
+        finalComponent = createElement(Portal, null, finalComponent);
+    }
+    return finalComponent;
 });
 _RichText.displayName = 'mpx-rich-text';
 export default _RichText;