@mpxjs/webpack-plugin 2.10.4-beta.19-input → 2.10.4-beta.19-input1

package/lib/runtime/components/react/dist/getInnerListeners.js

@@ -3,13 +3,12 @@ import { collectDataset } from '@mpxjs/utils';
 import { omit, extendObject, useNavigation } from './utils';
 import eventConfigMap from './event.config';
 const globalEventState = {
-    needPress: true,
-    identifier: null
+    needPress: true
 };
 const getTouchEvent = (type, event, config) => {
     const { navigation, propsRef, layoutRef } = config;
     const props = propsRef.current;
-    const { top: navigationY = 0 } = navigation?.layout || {};
+    const { y: navigationY = 0 } = navigation?.layout || {};
     const nativeEvent = event.nativeEvent;
     const { timestamp, pageX, pageY, touches, changedTouches } = nativeEvent;
     const { id } = props;
@@ -95,48 +94,36 @@ function checkIsNeedPress(e, type, ref) {
         ref.current.startTimer[type] = null;
     }
 }
-function shouldHandleTapEvent(e, eventConfig) {
-    const { identifier } = e.nativeEvent.changedTouches[0];
-    return eventConfig.tap && globalEventState.identifier === identifier;
-}
 function handleTouchstart(e, type, eventConfig) {
+    // 阻止事件被释放放回对象池，导致对象复用 _stoppedEventTypes 状态被保留
     e.persist();
     const { innerRef } = eventConfig;
-    const touch = e.nativeEvent.changedTouches[0];
-    const { identifier } = touch;
-    const isSingle = e.nativeEvent.touches.length <= 1;
-    if (isSingle) {
-        // 仅在 touchstart 记录第一个单指触摸点
-        globalEventState.identifier = identifier;
-        globalEventState.needPress = true;
-        innerRef.current.mpxPressInfo.detail = {
-            x: touch.pageX,
-            y: touch.pageY
-        };
-    }
+    globalEventState.needPress = true;
+    innerRef.current.mpxPressInfo.detail = {
+        x: e.nativeEvent.changedTouches[0].pageX,
+        y: e.nativeEvent.changedTouches[0].pageY
+    };
     handleEmitEvent('touchstart', e, type, eventConfig);
     if (eventConfig.longpress) {
-        // 只有单指触摸时才启动长按定时器
-        if (isSingle) {
-            if (e._stoppedEventTypes?.has('longpress')) {
-                return;
-            }
-            if (eventConfig.longpress.hasCatch) {
-                e._stoppedEventTypes = e._stoppedEventTypes || new Set();
-                e._stoppedEventTypes.add('longpress');
-            }
-            innerRef.current.startTimer[type] && clearTimeout(innerRef.current.startTimer[type]);
-            innerRef.current.startTimer[type] = setTimeout(() => {
-                globalEventState.needPress = false;
-                handleEmitEvent('longpress', e, type, eventConfig);
-            }, 350);
+        if (e._stoppedEventTypes?.has('longpress')) {
+            return;
+        }
+        if (eventConfig.longpress.hasCatch) {
+            e._stoppedEventTypes = e._stoppedEventTypes || new Set();
+            e._stoppedEventTypes.add('longpress');
         }
+        innerRef.current.startTimer[type] && clearTimeout(innerRef.current.startTimer[type]);
+        innerRef.current.startTimer[type] = setTimeout(() => {
+            // 只要触发过longpress, 全局就不再触发tap
+            globalEventState.needPress = false;
+            handleEmitEvent('longpress', e, type, eventConfig);
+        }, 350);
     }
 }
 function handleTouchmove(e, type, eventConfig) {
     const { innerRef } = eventConfig;
     handleEmitEvent('touchmove', e, type, eventConfig);
-    if (shouldHandleTapEvent(e, eventConfig)) {
+    if (eventConfig.tap) {
         checkIsNeedPress(e, type, innerRef);
     }
 }
@@ -144,8 +131,7 @@ function handleTouchend(e, type, eventConfig) {
     const { innerRef, disableTap } = eventConfig;
     handleEmitEvent('touchend', e, type, eventConfig);
     innerRef.current.startTimer[type] && clearTimeout(innerRef.current.startTimer[type]);
-    // 只有单指触摸结束时才触发 tap
-    if (shouldHandleTapEvent(e, eventConfig)) {
+    if (eventConfig.tap) {
         checkIsNeedPress(e, type, innerRef);
         if (!globalEventState.needPress || (type === 'bubble' && disableTap) || e._stoppedEventTypes?.has('tap')) {
             return;

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

@@ -42,7 +42,6 @@ import { getCurrentPage, splitProps, splitStyle, useLayout, useTransformStyle, w
 import useInnerProps, { getCustomEvent } from './getInnerListeners';
 import useNodesRef from './useNodesRef';
 import { RouteContext, FormContext } from './context';
-import Portal from './mpx-portal';
 const LOADING_IMAGE_URI = 'data:image/png;base64,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';
 const TypeColorMap = {
     default: ['#F8F8F8', '#DEDEDE', '35,35,35', '#F7F7F7'],
@@ -168,7 +167,7 @@ const Button = forwardRef((buttonProps, ref) => {
     const defaultTextStyle = extendObject({}, styles.text, isMiniSize ? styles.textMini : {}, { color: plain ? plainTextColor : normalTextColor });
     const defaultStyle = extendObject({}, defaultViewStyle, defaultTextStyle);
     const styleObj = extendObject({}, defaultStyle, style, isHover ? hoverStyle : {});
-    const { hasPositionFixed, hasSelfPercent, normalStyle, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
+    const { 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 });
@@ -263,13 +262,9 @@ const Button = forwardRef((buttonProps, ref) => {
         textStyle,
         textProps
     }));
-    const finalComponent = enableHover
+    return enableHover
         ? createElement(GestureDetector, { gesture: gesture }, baseButton)
         : baseButton;
-    if (hasPositionFixed) {
-        return createElement(Portal, null, finalComponent);
-    }
-    return finalComponent;
 });
 Button.displayName = 'MpxButton';
 export default Button;

package/lib/runtime/components/react/dist/mpx-canvas/Image.js

@@ -1,5 +1,4 @@
 import { WEBVIEW_TARGET, registerWebviewProperties } from './utils';
-import { extendObject } from '../utils';
 const PROPERTIES = {
     crossOrigin: undefined,
     height: undefined,
@@ -51,7 +50,10 @@ export class Image {
                         this[key] = value;
                     }
                 }
-                callbackFn(extendObject({}, message.payload, { target: this }));
+                callbackFn({
+                    ...message.payload,
+                    target: this
+                });
             }
         });
     }

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

@@ -23,7 +23,6 @@ import './CanvasGradient';
 import { createImage as canvasCreateImage } from './Image';
 import { createImageData as canvasCreateImageData } from './ImageData';
 import { useConstructorsRegistry } from './constructorsRegistry';
-import Portal from '../mpx-portal';
 const stylesheet = StyleSheet.create({
     container: { overflow: 'hidden', flex: 0 },
     webview: {
@@ -42,7 +41,7 @@ const _Canvas = forwardRef((props = {}, ref) => {
     const { style = {}, originWhitelist = ['*'], 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight } = props;
     const [isLoaded, setIsLoaded] = useState(false);
     const nodeRef = useRef(null);
-    const { normalStyle, hasSelfPercent, hasPositionFixed, setWidth, setHeight } = useTransformStyle(extendObject({}, style, stylesheet.container), {
+    const { normalStyle, hasSelfPercent, setWidth, setHeight } = useTransformStyle(extendObject({}, style, stylesheet.container), {
         enableVar,
         externalVarContext,
         parentFontSize,
@@ -111,7 +110,10 @@ const _Canvas = forwardRef((props = {}, ref) => {
     const postMessage = useCallback(async (message) => {
         if (!canvasRef.current?.bus)
             return;
-        const { type, payload } = await canvasRef.current.bus.post(extendObject({ id: ID() }, message));
+        const { type, payload } = await canvasRef.current.bus.post({
+            id: ID(),
+            ...message
+        });
         switch (type) {
             case 'error': {
                 const { binderror } = props;
@@ -140,7 +142,7 @@ const _Canvas = forwardRef((props = {}, ref) => {
         canvasRef.current.listeners.splice(canvasRef.current.listeners.indexOf(listener), 1);
     };
     const onMessage = useCallback((e) => {
-        const data = JSON.parse(e.nativeEvent.data);
+        let data = JSON.parse(e.nativeEvent.data);
         switch (data.type) {
             case 'error': {
                 const { binderror } = props;
@@ -154,27 +156,27 @@ const _Canvas = forwardRef((props = {}, ref) => {
                 break;
             }
             default: {
-                const newData = {};
-                // createLinearGradient 方法调用需要在 constructors 中需要注册 CanvasGradient
-                const constructor = constructors[data.meta.constructor];
                 if (data.payload) {
+                    // createLinearGradient 方法调用需要在 constructors 中需要注册 CanvasGradient
+                    const constructor = constructors[data.meta.constructor];
                     if (constructor) {
                         const { args, payload } = data;
                         // RN 端同步生成一个 CanvasGradient 的实例
                         const object = constructor.constructLocally(canvasRef.current, ...args);
-                        extendObject(object, payload, {
+                        Object.assign(object, payload, {
                             [WEBVIEW_TARGET]: data.meta.target
                         });
-                        extendObject(newData, data, {
+                        data = {
+                            ...data,
                             payload: object
-                        });
+                        };
                     }
                     for (const listener of canvasRef.current.listeners) {
-                        listener(constructor ? newData.payload : data.payload);
+                        listener(data.payload);
                     }
                 }
                 if (canvasRef.current.bus) {
-                    canvasRef.current.bus.handle(constructor && data.payload ? newData : data);
+                    canvasRef.current.bus.handle(data);
                 }
             }
         }
@@ -190,10 +192,9 @@ const _Canvas = forwardRef((props = {}, ref) => {
         node: canvasRef.current,
         context: context2D
     });
-    let canvasComponent;
-    if (__mpx_mode__ === 'android') {
+    if (__mpx_mode__ !== 'ios') {
         const isAndroid9 = Platform.Version >= 28;
-        canvasComponent = createElement(View, innerProps, createElement(WebView, {
+        return createElement(View, innerProps, createElement(WebView, {
             ref: (element) => {
                 if (canvasRef.current) {
                     canvasRef.current.webview = element;
@@ -216,7 +217,7 @@ const _Canvas = forwardRef((props = {}, ref) => {
             allowUniversalAccessFromFileURLs: true
         }));
     }
-    canvasComponent = createElement(View, innerProps, createElement(WebView, {
+    return createElement(View, innerProps, createElement(WebView, {
         ref: (element) => {
             if (canvasRef.current) {
                 canvasRef.current.webview = element;
@@ -229,10 +230,6 @@ const _Canvas = forwardRef((props = {}, ref) => {
         onLoad: onLoad,
         scrollEnabled: false
     }));
-    if (hasPositionFixed) {
-        canvasComponent = createElement(Portal, null, canvasComponent);
-    }
-    return canvasComponent;
 });
 _Canvas.displayName = 'mpxCanvas';
 export default _Canvas;

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

@@ -8,7 +8,6 @@ import { FormContext, CheckboxGroupContext } from './context';
 import useInnerProps, { getCustomEvent } from './getInnerListeners';
 import useNodesRef from './useNodesRef';
 import { useLayout, useTransformStyle, wrapChildren, extendObject } from './utils';
-import Portal from './mpx-portal';
 const CheckboxGroup = forwardRef((props, ref) => {
     const propsRef = useRef({});
     propsRef.current = props;
@@ -24,7 +23,7 @@ const CheckboxGroup = forwardRef((props, ref) => {
         flexWrap: 'wrap'
     };
     const styleObj = extendObject({}, defaultStyle, style);
-    const { hasPositionFixed, hasSelfPercent, normalStyle, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
+    const { 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 });
@@ -82,14 +81,10 @@ const CheckboxGroup = forwardRef((props, ref) => {
             notifyChange
         };
     }, []);
-    const finalComponent = createElement(View, innerProps, createElement(CheckboxGroupContext.Provider, { value: contextValue }, wrapChildren(props, {
+    return createElement(View, innerProps, createElement(CheckboxGroupContext.Provider, { value: contextValue }, wrapChildren(props, {
         hasVarDec,
         varContext: varContextRef.current
     })));
-    if (hasPositionFixed) {
-        return createElement(Portal, null, finalComponent);
-    }
-    return finalComponent;
 });
 CheckboxGroup.displayName = 'MpxCheckboxGroup';
 export default CheckboxGroup;

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

@@ -12,7 +12,6 @@ import useNodesRef from './useNodesRef';
 import Icon from './mpx-icon';
 import { splitProps, splitStyle, useLayout, useTransformStyle, wrapChildren, extendObject } from './utils';
 import { CheckboxGroupContext, LabelContext } from './context';
-import Portal from './mpx-portal';
 const styles = StyleSheet.create({
     container: {
         flexDirection: 'row',
@@ -64,7 +63,7 @@ const Checkbox = forwardRef((checkboxProps, ref) => {
         bindtap && bindtap(getCustomEvent('tap', evt, { layoutRef }, props));
         onChange(evt);
     };
-    const { hasPositionFixed, hasSelfPercent, normalStyle, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
+    const { hasSelfPercent, normalStyle, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
     const nodeRef = useRef(null);
     useNodesRef(props, ref, nodeRef, {
         style: extendObject({}, defaultStyle, normalStyle),
@@ -115,7 +114,7 @@ const Checkbox = forwardRef((checkboxProps, ref) => {
             }
         }
     }, [checked]);
-    const finalComponent = createElement(View, innerProps, createElement(View, { style: defaultStyle }, createElement(Icon, {
+    return createElement(View, innerProps, createElement(View, { style: defaultStyle }, createElement(Icon, {
         type: 'success_no_circle',
         size: 18,
         color: disabled ? '#ADADAD' : color,
@@ -126,10 +125,6 @@ const Checkbox = forwardRef((checkboxProps, ref) => {
         textStyle,
         textProps
     }));
-    if (hasPositionFixed) {
-        return createElement(Portal, null, finalComponent);
-    }
-    return finalComponent;
 });
 Checkbox.displayName = 'MpxCheckbox';
 export default Checkbox;

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

@@ -17,7 +17,6 @@ import Cancel from './icons/cancel.png';
 import Download from './icons/download.png';
 import Search from './icons/search.png';
 import Clear from './icons/clear.png';
-import Portal from '../mpx-portal';
 const IconTypeMap = new Map([
     ['success', Success],
     ['success_no_circle', SuccessNoCircle],
@@ -34,7 +33,7 @@ const Icon = forwardRef((props, ref) => {
     const source = IconTypeMap.get(type);
     const defaultStyle = { width: ~~size, height: ~~size };
     const styleObj = extendObject({}, defaultStyle, style);
-    const { hasPositionFixed, hasSelfPercent, normalStyle, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
+    const { hasSelfPercent, normalStyle, 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 });
@@ -45,11 +44,7 @@ const Icon = forwardRef((props, ref) => {
     }), [], {
         layoutRef
     });
-    const finalComponent = createElement(Image, innerProps);
-    if (hasPositionFixed) {
-        return createElement(Portal, null, finalComponent);
-    }
-    return finalComponent;
+    return createElement(Image, innerProps);
 });
 Icon.displayName = 'MpxIcon';
 export default Icon;

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

@@ -17,7 +17,6 @@ import { SvgCssUri } from 'react-native-svg/css';
 import useInnerProps, { getCustomEvent } from './getInnerListeners';
 import useNodesRef from './useNodesRef';
 import { SVG_REGEXP, useLayout, useTransformStyle, renderImage, extendObject } from './utils';
-import Portal from './mpx-portal';
 const DEFAULT_IMAGE_WIDTH = 320;
 const DEFAULT_IMAGE_HEIGHT = 240;
 const cropMode = [
@@ -80,7 +79,7 @@ const Image = forwardRef((props, ref) => {
             setLoaded(true);
         }
     };
-    const { hasPositionFixed, hasSelfPercent, normalStyle, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
+    const { normalStyle, hasSelfPercent, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
     const { layoutRef, layoutStyle, layoutProps } = useLayout({
         props,
         hasSelfPercent,
@@ -256,8 +255,6 @@ const Image = forwardRef((props, ref) => {
                     state.current = {};
                     setLoaded(true);
                 }
-            }, () => {
-                setLoaded(true);
             });
         }
     }, [src, isSvg, isLayoutMode]);
@@ -271,35 +268,25 @@ const Image = forwardRef((props, ref) => {
     ], {
         layoutRef
     });
-    function renderSvgImage() {
-        return createElement(View, innerProps, createElement(SvgCssUri, {
-            uri: src,
-            onLayout: onSvgLoad,
-            onError: binderror && onSvgError,
-            style: extendObject({ transformOrigin: 'left top' }, modeStyle)
-        }));
-    }
-    function renderBaseImage() {
-        return renderImage(extendObject({
-            source: { uri: src },
-            resizeMode: resizeMode,
-            onLoad: bindload && onImageLoad,
-            onError: binderror && onImageError,
-            style: extendObject({
-                transformOrigin: 'left top',
-                width: isCropMode ? imageWidth : '100%',
-                height: isCropMode ? imageHeight : '100%'
-            }, isCropMode ? modeStyle : {})
-        }, isLayoutMode ? {} : innerProps), enableFastImage);
-    }
-    function renderLayoutImage() {
-        return createElement(View, innerProps, loaded && renderBaseImage());
-    }
-    const finalComponent = isSvg ? renderSvgImage() : isLayoutMode ? renderLayoutImage() : renderBaseImage();
-    if (hasPositionFixed) {
-        return createElement(Portal, null, finalComponent);
-    }
-    return finalComponent;
+    const SvgImage = createElement(View, innerProps, createElement(SvgCssUri, {
+        uri: src,
+        onLayout: onSvgLoad,
+        onError: binderror && onSvgError,
+        style: extendObject({ transformOrigin: 'left top' }, modeStyle)
+    }));
+    const BaseImage = renderImage(extendObject({
+        source: { uri: src },
+        resizeMode: resizeMode,
+        onLoad: bindload && onImageLoad,
+        onError: binderror && onImageError,
+        style: extendObject({
+            transformOrigin: 'left top',
+            width: isCropMode ? imageWidth : '100%',
+            height: isCropMode ? imageHeight : '100%'
+        }, isCropMode ? modeStyle : {})
+    }, isLayoutMode ? {} : innerProps), enableFastImage);
+    const LayoutImage = createElement(View, innerProps, loaded && BaseImage);
+    return isSvg ? SvgImage : isLayoutMode ? LayoutImage : BaseImage;
 });
 Image.displayName = 'mpx-image';
 export default Image;

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

@@ -40,16 +40,15 @@
 import { forwardRef, useRef, useState, useContext, useEffect, createElement } from 'react';
 import { TextInput } from 'react-native';
 import { warn } from '@mpxjs/utils';
-import { useUpdateEffect, useTransformStyle, useLayout, extendObject, isIOS } from './utils';
+import { useUpdateEffect, useTransformStyle, useLayout, extendObject } from './utils';
 import useInnerProps, { getCustomEvent } from './getInnerListeners';
 import useNodesRef from './useNodesRef';
 import { FormContext, KeyboardAvoidContext } from './context';
-import Portal from './mpx-portal';
-const keyboardTypeMap = {
-    text: 'default',
+const inputModeMap = {
+    text: 'text',
     number: 'numeric',
-    idcard: 'default',
-    digit: isIOS ? 'decimal-pad' : 'numeric'
+    idcard: 'text',
+    digit: 'decimal'
 };
 const Input = forwardRef((props, ref) => {
     const { style = {}, allowFontScaling = false, type = 'text', value, password, 'placeholder-style': placeholderStyle = {}, disabled, maxlength = 140, 'cursor-spacing': cursorSpacing = 0, 'auto-focus': autoFocus, focus, 'confirm-type': confirmType = 'done', 'confirm-hold': confirmHold = false, cursor, 'cursor-color': cursorColor, 'selection-start': selectionStart = -1, 'selection-end': selectionEnd = -1, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, 'adjust-position': adjustPosition = true, bindinput, bindfocus, bindblur, bindconfirm, bindselectionchange, 
@@ -72,7 +71,7 @@ const Input = forwardRef((props, ref) => {
             return value + '';
         return '';
     };
-    const keyboardType = keyboardTypeMap[type];
+    const inputMode = inputModeMap[type];
     const defaultValue = parseValue(value);
     const textAlignVertical = multiline ? 'top' : 'auto';
     const tmpValue = useRef(defaultValue);
@@ -84,7 +83,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 { hasPositionFixed, hasSelfPercent, normalStyle, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
+    const { hasSelfPercent, normalStyle, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
     const nodeRef = useRef(null);
     useNodesRef(props, ref, nodeRef, {
         style: normalStyle
@@ -252,7 +251,7 @@ const Input = forwardRef((props, ref) => {
         ref: nodeRef,
         style: extendObject({}, normalStyle, layoutStyle),
         allowFontScaling,
-        keyboardType: keyboardType,
+        inputMode: inputMode,
         secureTextEntry: !!password,
         defaultValue: defaultValue,
         value: inputValue,
@@ -290,11 +289,7 @@ const Input = forwardRef((props, ref) => {
     ], {
         layoutRef
     });
-    const finalComponent = createElement(TextInput, innerProps);
-    if (hasPositionFixed) {
-        return createElement(Portal, null, finalComponent);
-    }
-    return finalComponent;
+    return createElement(TextInput, innerProps);
 });
 Input.displayName = 'MpxInput';
 export default Input;

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

@@ -8,7 +8,6 @@ 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({});
@@ -18,7 +17,7 @@ const Label = forwardRef((labelProps, ref) => {
         flexDirection: 'row'
     };
     const styleObj = extendObject({}, defaultStyle, style);
-    const { hasPositionFixed, hasSelfPercent, normalStyle, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
+    const { 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 });
@@ -41,16 +40,12 @@ const Label = forwardRef((labelProps, ref) => {
     }), [], {
         layoutRef
     });
-    const finalComponent = createElement(View, innerProps, createElement(LabelContext.Provider, { value: contextRef }, wrapChildren(props, {
+    return 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,10 +7,9 @@ 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, hasPositionFixed, setWidth, setHeight } = useTransformStyle(style, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
+    const { hasSelfPercent, normalStyle, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(style, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
     const movableViewRef = useRef(null);
     useNodesRef(props, ref, movableViewRef, {
         style: normalStyle
@@ -21,17 +20,13 @@ 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 }, normalStyle, layoutStyle),
+        style: extendObject({ height: contextValue.height, width: contextValue.width, overflow: 'hidden' }, normalStyle, layoutStyle),
         ref: movableViewRef
     }), [], { layoutRef });
-    let movableComponent = createElement(MovableAreaContext.Provider, { value: contextValue }, createElement(View, innerProps, wrapChildren(props, {
+    return 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;