@mpxjs/webpack-plugin 2.9.62 → 2.9.64

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

@@ -4,51 +4,35 @@
  * ✘ decode
  */
 import { Text } from 'react-native';
-import { useRef, useEffect, forwardRef } from 'react';
+import { useRef, forwardRef } from 'react';
 import useInnerProps from './getInnerListeners';
 import useNodesRef from './useNodesRef'; // 引入辅助函数
-import { transformTextStyle, DEFAULT_STYLE } from './utils';
+import { useTransformStyle, wrapChildren } from './utils';
 const _Text = forwardRef((props, ref) => {
-    const { style = {}, children, selectable, 'enable-offset': enableOffset, 'user-select': userSelect, 'disable-default-style': disableDefaultStyle = false, } = props;
+    const { style = {}, selectable, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'user-select': userSelect, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight } = props;
     const layoutRef = useRef({});
-    let defaultStyle = {};
-    if (!disableDefaultStyle) {
-        defaultStyle = DEFAULT_STYLE;
-        transformTextStyle(style);
-    }
-    const { nodeRef } = useNodesRef(props, ref, {
-        defaultStyle
+    const { normalStyle, hasVarDec, varContextRef } = useTransformStyle(style, {
+        enableVar,
+        externalVarContext,
+        parentFontSize,
+        parentWidth,
+        parentHeight
     });
+    const { nodeRef } = useNodesRef(props, ref);
     const innerProps = useInnerProps(props, {
-        ref: nodeRef
+        ref: nodeRef,
+        style: normalStyle,
+        selectable: !!selectable || !!userSelect
     }, [
-        'style',
-        'children',
-        'selectable',
-        'user-select',
-        'useInherit',
-        'enable-offset'
+        'user-select'
     ], {
         layoutRef
     });
-    useEffect(() => {
-        let measureTimeout = null;
-        if (enableOffset) {
-            measureTimeout = setTimeout(() => {
-                nodeRef.current?.measure((x, y, width, height, offsetLeft, offsetTop) => {
-                    layoutRef.current = { x, y, width, height, offsetLeft, offsetTop };
-                });
-            });
-            return () => {
-                if (measureTimeout) {
-                    clearTimeout(measureTimeout);
-                    measureTimeout = null;
-                }
-            };
-        }
-    }, []);
-    return (<Text style={{ ...defaultStyle, ...style }} selectable={!!selectable || !!userSelect} {...innerProps}>
-      {children}
+    return (<Text {...innerProps}>
+      {wrapChildren(props, {
+            hasVarDec,
+            varContext: varContextRef.current
+        })}
     </Text>);
 });
 _Text.displayName = 'mpx-text';

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

@@ -19,7 +19,7 @@ const Textarea = forwardRef((props, ref) => {
         'type',
         'password',
         'multiline',
-        'confirm-hold',
+        'confirm-hold'
     ]);
     return (<Input ref={ref} multiline confirm-type='next' bindblur={() => Keyboard.dismiss()} {...restProps}/>);
 });