@mpxjs/webpack-plugin 2.10.22 → 2.10.24-test.1

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

@@ -4,12 +4,11 @@
  * ✔ decode
  */
 import { Text } from 'react-native';
-import { useRef, forwardRef, createElement, Children, useContext } from 'react';
+import { useRef, forwardRef, createElement, Children } from 'react';
 import Portal from './mpx-portal';
 import useInnerProps from './getInnerListeners';
 import useNodesRef from './useNodesRef'; // 引入辅助函数
-import { useTransformStyle, wrapChildren, extendObject, getDefaultAllowFontScaling, useTextPassThroughValue, isStringChildren, splitStyle } from './utils';
-import { TextPassThroughContext } from './context';
+import { useTransformStyle, wrapChildren, extendObject, getDefaultAllowFontScaling, useTextPassThroughText, isStringChildren, splitStyle } from './utils';
 import * as perf from '@mpxjs/perf';
 const decodeMap = {
     '&lt;': '<',
@@ -28,59 +27,66 @@ function decode(value) {
     }
 }
 function getDecodedChildren(children) {
-    return Children.map(children, (child) => {
-        if (typeof child === 'string') {
+    if (typeof children === 'string') {
+        return { children: decode(children), isStringOnly: true };
+    }
+    let isStringOnly = true;
+    const decoded = Children.map(children, (child) => {
+        if (typeof child === 'string')
             return decode(child);
-        }
+        isStringOnly = false;
         return child;
     });
+    return { children: decoded, isStringOnly };
 }
 const _Text = forwardRef((props, ref) => {
-    let stopTotal;
+    let idTotal = -1;
     if (__mpx_perf_framework__)
-        stopTotal = perf.scope('text:render:total');
+        idTotal = perf.scopeStart('text:render:total');
     // ───── props 阶段 ─────
-    let stopProps;
+    let idProps = -1;
     if (__mpx_perf_framework__)
-        stopProps = perf.scope('text:render:props');
-    const inheritedText = useContext(TextPassThroughContext);
-    const mergedProps = extendObject({}, inheritedText?.pendingTextProps, props);
-    const { style: currentStyle = {}, allowFontScaling, selectable, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'user-select': userSelect, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, decode } = mergedProps;
+        idProps = perf.scopeStart('text:render:props');
+    const { style: currentStyle = {}, allowFontScaling, selectable, 'enable-var': enableVar, 'user-select': userSelect, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, decode } = props;
     if (__mpx_perf_framework__)
-        stopProps();
+        perf.scopeEnd(idProps);
     // ───── style 阶段 ─────
-    let stopStyle;
+    let idStyle = -1;
     if (__mpx_perf_framework__)
-        stopStyle = perf.scope('text:render:style');
+        idStyle = perf.scopeStart('text:render:style');
     const { normalStyle, hasVarDec, varContextRef, hasPositionFixed } = useTransformStyle(currentStyle, {
         enableVar,
-        externalVarContext,
         parentFontSize,
         parentWidth,
         parentHeight
     });
-    const finalStyle = extendObject({}, inheritedText?.textStyle, normalStyle);
+    let children;
+    let isStringOnly;
+    if (decode) {
+        ({ children, isStringOnly } = getDecodedChildren(props.children));
+    }
+    else {
+        children = props.children;
+        isStringOnly = isStringChildren(children);
+    }
+    const childTextStyle = !isStringOnly ? splitStyle(normalStyle).textStyle : undefined;
+    const { inheritedText, textPassThrough } = useTextPassThroughText(childTextStyle);
+    const mergedProps = inheritedText?.pendingTextProps
+        ? extendObject({}, inheritedText.pendingTextProps, props)
+        : props;
+    const finalStyle = inheritedText?.textStyle
+        ? extendObject({}, inheritedText.textStyle, normalStyle)
+        : normalStyle;
     const nodeRef = useRef(null);
     useNodesRef(mergedProps, ref, nodeRef, {
         style: finalStyle
     });
-    const children = decode ? getDecodedChildren(mergedProps.children) : mergedProps.children;
-    const isStringOnly = isStringChildren(children);
-    let childTextStyle;
-    if (!isStringOnly) {
-        const { textStyle = {} } = splitStyle(finalStyle);
-        childTextStyle = Object.keys(textStyle).length ? textStyle : undefined;
-    }
-    const textPassThrough = useTextPassThroughValue(childTextStyle, undefined, {
-        inheritTextProps: false,
-        disabled: isStringOnly
-    });
     if (__mpx_perf_framework__)
-        stopStyle();
+        perf.scopeEnd(idStyle);
     // ───── innerProps 阶段 ─────
-    let stopInnerProps;
+    let idInnerProps = -1;
     if (__mpx_perf_framework__)
-        stopInnerProps = perf.scope('text:render:innerProps');
+        idInnerProps = perf.scopeStart('text:render:innerProps');
     const innerProps = useInnerProps(extendObject({}, mergedProps, {
         ref: nodeRef,
         style: finalStyle,
@@ -91,14 +97,12 @@ const _Text = forwardRef((props, ref) => {
         'decode'
     ]);
     if (__mpx_perf_framework__)
-        stopInnerProps();
+        perf.scopeEnd(idInnerProps);
     // ───── createElement 阶段 ─────
-    let stopCreate;
+    let idCreate = -1;
     if (__mpx_perf_framework__)
-        stopCreate = perf.scope('text:render:createElement');
-    let finalComponent = createElement(Text, innerProps, wrapChildren(extendObject({}, mergedProps, {
-        children
-    }), {
+        idCreate = perf.scopeStart('text:render:createElement');
+    let finalComponent = createElement(Text, innerProps, wrapChildren(children, {
         hasVarDec,
         varContext: varContextRef.current,
         textPassThrough
@@ -107,9 +111,9 @@ const _Text = forwardRef((props, ref) => {
         finalComponent = createElement(Portal, null, finalComponent);
     }
     if (__mpx_perf_framework__)
-        stopCreate();
+        perf.scopeEnd(idCreate);
     if (__mpx_perf_framework__)
-        stopTotal();
+        perf.scopeEnd(idTotal);
     return finalComponent;
 });
 _Text.displayName = 'MpxText';

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

@@ -83,7 +83,6 @@ interface VideoProps {
     'preferred-peak-bit-rate'?: number;
     'enable-auto-rotation'?: number;
     'enable-var'?: boolean;
-    'external-var-context'?: Record<string, any>;
     'parent-font-size'?: number;
     'parent-width'?: number;
     'parent-height'?: number;

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

@@ -80,18 +80,18 @@ const styles = StyleSheet.create({
 });
 const MpxVideo = forwardRef((videoProps, ref) => {
     const { innerProps: props = {} } = splitProps(videoProps);
-    const { src, autoplay = false, loop = false, muted = false, controls = true, poster = '', bindplay, bindpause, bindended, bindtimeupdate, bindfullscreenchange, bindwaiting, binderror, bindloadedmetadata, bindcontrolstoggle, bindseekcomplete, style, 'initial-time': initialTime = 0, 'object-fit': objectFit = 'contain', 'is-drm': isDrm = false, 'provision-url': provisionUrl, 'certificate-url': certificateUrl, 'license-url': licenseUrl, 'preferred-peak-bit-rate': preferredPeakBitRate = 0, 'enable-auto-rotation': enableAutoRotation = false, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight } = props;
+    const { src, autoplay = false, loop = false, muted = false, controls = true, poster = '', bindplay, bindpause, bindended, bindtimeupdate, bindfullscreenchange, bindwaiting, binderror, bindloadedmetadata, bindcontrolstoggle, bindseekcomplete, style, 'initial-time': initialTime = 0, 'object-fit': objectFit = 'contain', 'is-drm': isDrm = false, 'provision-url': provisionUrl, 'certificate-url': certificateUrl, 'license-url': licenseUrl, 'preferred-peak-bit-rate': preferredPeakBitRate = 0, 'enable-auto-rotation': enableAutoRotation = false, 'enable-var': enableVar, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight } = props;
     const videoRef = useRef(null);
     const viewRef = useRef(null);
     const videoInfoRef = useRef({});
     const propsRef = useRef({});
     propsRef.current = props;
-    const { normalStyle, hasSelfPercent, setWidth, setHeight, hasPositionFixed } = useTransformStyle(extendObject({}, styles.container, style), {
+    const { normalStyle, hasSelfPercent, setWidth, setHeight, hasPositionFixed } = useTransformStyle(style, {
         enableVar,
-        externalVarContext,
         parentFontSize,
         parentWidth,
-        parentHeight
+        parentHeight,
+        defaultStyle: styles.container
     });
     const { layoutRef, layoutStyle, layoutProps } = useLayout({
         props,

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

@@ -18,9 +18,9 @@ export interface _ViewProps extends ViewProps {
     'hover-start-time'?: number;
     'hover-stay-time'?: number;
     'enable-background'?: boolean;
+    'enable-text-pass-through'?: boolean;
     'enable-var'?: boolean;
     'enable-fast-image'?: boolean;
-    'external-var-context'?: Record<string, any>;
     'parent-font-size'?: number;
     'parent-width'?: number;
     'parent-height'?: number;
@@ -31,5 +31,6 @@ export interface _ViewProps extends ViewProps {
     bindtransitionend?: (event: NativeSyntheticEvent<TouchEvent> | unknown) => void;
     catchtransitionend?: (event: NativeSyntheticEvent<TouchEvent> | unknown) => void;
 }
+export declare const __parseBgImageForTest: (text?: string) => any;
 declare const _View: import("react").ForwardRefExoticComponent<_ViewProps & import("react").RefAttributes<HandlerRef<View, _ViewProps>>>;
 export default _View;