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

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

@@ -15,7 +15,6 @@ interface _RichTextProps extends ViewProps {
     style?: ViewStyle;
     nodes: string | Array<Node>;
     '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-rich-text/index.jsx

@@ -28,7 +28,7 @@ function jsonToHtmlStr(elements) {
     return htmlStr;
 }
 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 { style = {}, nodes, 'enable-var': enableVar, '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, hasPositionFixed } = useTransformStyle(Object.assign({
@@ -36,7 +36,6 @@ const _RichText = forwardRef((props, ref) => {
         height: webViewHeight
     }, style), {
         enableVar,
-        externalVarContext,
         parentFontSize,
         parentWidth,
         parentHeight

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

@@ -26,7 +26,7 @@ interface ScrollViewProps {
     'scroll-into-view'?: string;
     'enable-trigger-intersection-observer'?: boolean;
     'enable-var'?: boolean;
-    'external-var-context'?: Record<string, any>;
+    'enable-text-pass-through'?: boolean;
     'parent-font-size'?: number;
     'parent-width'?: number;
     'parent-height'?: number;

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

@@ -38,7 +38,7 @@ import Animated, { useSharedValue, withTiming, useAnimatedStyle, runOnJS } from
 import { warn, hasOwn } from '@mpxjs/utils';
 import useInnerProps, { getCustomEvent } from './getInnerListeners';
 import useNodesRef from './useNodesRef';
-import { splitProps, splitStyle, useTransformStyle, useLayout, wrapChildren, extendObject, flatGesture, HIDDEN_STYLE, useRunOnJSCallback, useTextPassThroughValue } from './utils';
+import { splitProps, splitStyle, useTransformStyle, useLayout, wrapChildren, extendObject, flatGesture, hiddenStyle, useRunOnJSCallback, useTextPassThrough } from './utils';
 import { IntersectionObserverContext, ScrollViewContext } from './context';
 import Portal from './mpx-portal';
 const AnimatedScrollView = RNAnimated.createAnimatedComponent(ScrollView);
@@ -48,7 +48,7 @@ const REFRESH_COLOR = {
 };
 const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
     const { textProps, innerProps: props = {} } = splitProps(scrollViewProps);
-    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 { 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, 'enable-text-pass-through': enableTextPassThrough, '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);
@@ -75,9 +75,9 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
     const intersectionObservers = useContext(IntersectionObserverContext);
     const firstScrollIntoViewChange = useRef(true);
     const isContentSizeChange = useRef(false);
-    const { normalStyle, hasVarDec, varContextRef, hasSelfPercent, hasPositionFixed, setWidth, setHeight } = useTransformStyle(style, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
+    const { normalStyle, hasVarDec, varContextRef, hasSelfPercent, hasPositionFixed, setWidth, setHeight } = useTransformStyle(style, { enableVar, parentFontSize, parentWidth, parentHeight });
     const { textStyle, innerStyle = {} } = splitStyle(normalStyle);
-    const textPassThrough = useTextPassThroughValue(textStyle, textProps);
+    const textPassThrough = useTextPassThrough(textStyle, textProps, { enableTextPassThrough });
     const scrollViewRef = useRef(null);
     const propsRef = useRef(props);
     const refresherStateRef = useRef({
@@ -120,7 +120,7 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
     }, []);
     const hasRefresherLayoutRef = useRef(false);
     // layout 完成前先隐藏，避免安卓闪烁问题
-    const refresherLayoutStyle = useMemo(() => { return !hasRefresherLayoutRef.current ? HIDDEN_STYLE : {}; }, [hasRefresherLayoutRef.current]);
+    const refresherLayoutStyle = useMemo(() => { return !hasRefresherLayoutRef.current ? hiddenStyle : {}; }, [hasRefresherLayoutRef.current]);
     const lastOffset = useRef(0);
     if (scrollX && scrollY) {
         warn('scroll-x and scroll-y cannot be set to true at the same time, Mpx will use the value of scroll-y as the criterion');
@@ -667,7 +667,7 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
     ], { layoutRef });
     const ScrollViewComponent = enableSticky ? AnimatedScrollView : ScrollView;
     const createScrollViewContent = () => {
-        const wrappedChildren = wrapChildren(hasRefresher ? extendObject({}, props, { children: otherContent }) : props, {
+        const wrappedChildren = wrapChildren(hasRefresher ? otherContent : props.children, {
             hasVarDec,
             varContext: varContextRef.current,
             textPassThrough

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

@@ -1,8 +1,7 @@
 import { Text } from 'react-native';
-import { createElement, useContext } from 'react';
+import { createElement } from 'react';
 import useInnerProps from './getInnerListeners';
-import { extendObject, getDefaultAllowFontScaling, useTextPassThroughValue, wrapChildren, isStringChildren, transformBoxSizing, splitStyle, isBoxSizingAffectingStyle } from './utils';
-import { TextPassThroughContext } from './context';
+import { extendObject, getDefaultAllowFontScaling, useTextPassThroughText, wrapChildren, isStringChildren, transformBoxSizing, splitStyle, isBoxSizingAffectingStyle } from './utils';
 import * as perf from '@mpxjs/perf';
 const SimpleText = (props) => {
     let idTotal = -1;
@@ -12,23 +11,29 @@ const SimpleText = (props) => {
     let idStyle = -1;
     if (__mpx_perf_framework__)
         idStyle = perf.scopeStart('simple-text:render:style');
-    const inheritedText = useContext(TextPassThroughContext);
-    const mergedStyle = extendObject({}, inheritedText?.textStyle, props.style);
     let hasBoxSizingAffectingStyle = false;
-    const { textStyle = {} } = splitStyle(mergedStyle, (key) => {
+    const { textStyle } = splitStyle(props.style || {}, (key) => {
         if (!hasBoxSizingAffectingStyle && isBoxSizingAffectingStyle(key)) {
             hasBoxSizingAffectingStyle = true;
         }
     });
-    const finalStyle = transformBoxSizing(mergedStyle, hasBoxSizingAffectingStyle);
-    const mergedProps = extendObject({}, inheritedText?.pendingTextProps, props);
-    const { allowFontScaling, children } = mergedProps;
-    const isStringOnly = isStringChildren(children);
-    const childTextStyle = !isStringOnly && Object.keys(textStyle).length ? textStyle : undefined;
-    const childTextPassThrough = useTextPassThroughValue(childTextStyle, undefined, {
-        inheritTextProps: false,
-        disabled: isStringOnly
-    });
+    // textStyle 仅在子节点非纯字符串时才需要透传给子级；按需计算 isStringChildren
+    const childTextStyle = textStyle && !isStringChildren(props.children)
+        ? textStyle
+        : undefined;
+    const { inheritedText, textPassThrough } = useTextPassThroughText(childTextStyle);
+    const mergedProps = inheritedText?.pendingTextProps
+        ? extendObject({}, inheritedText.pendingTextProps, props)
+        : props;
+    let mergedStyle = inheritedText?.textStyle
+        ? extendObject({}, inheritedText.textStyle, props.style)
+        : props.style;
+    if (hasBoxSizingAffectingStyle) {
+        // 仅在需要 mutate 时 clone，避免污染上游 props.style
+        if (mergedStyle === props.style)
+            mergedStyle = extendObject({}, props.style);
+        transformBoxSizing(mergedStyle);
+    }
     if (__mpx_perf_framework__)
         perf.scopeEnd(idStyle);
     // ───── innerProps 阶段 ─────
@@ -36,8 +41,8 @@ const SimpleText = (props) => {
     if (__mpx_perf_framework__)
         idInnerProps = perf.scopeStart('simple-text:render:innerProps');
     const innerProps = useInnerProps(extendObject({}, mergedProps, {
-        allowFontScaling: allowFontScaling ?? getDefaultAllowFontScaling(),
-        style: finalStyle
+        allowFontScaling: mergedProps.allowFontScaling ?? getDefaultAllowFontScaling(),
+        style: mergedStyle
     }));
     if (__mpx_perf_framework__)
         perf.scopeEnd(idInnerProps);
@@ -45,9 +50,9 @@ const SimpleText = (props) => {
     let idCreate = -1;
     if (__mpx_perf_framework__)
         idCreate = perf.scopeStart('simple-text:render:createElement');
-    const result = createElement(Text, innerProps, wrapChildren({ children }, {
+    const result = createElement(Text, innerProps, wrapChildren(mergedProps.children, {
         hasVarDec: false,
-        textPassThrough: childTextPassThrough
+        textPassThrough
     }));
     if (__mpx_perf_framework__)
         perf.scopeEnd(idCreate);

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

@@ -1,6 +1,9 @@
 import { ViewProps } from 'react-native';
+interface SimpleViewProps extends ViewProps {
+    'enable-text-pass-through'?: boolean;
+}
 declare const SimpleView: {
-    (simpleViewProps: ViewProps): JSX.Element;
+    (simpleViewProps: SimpleViewProps): JSX.Element;
     displayName: string;
 };
 export default SimpleView;

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

@@ -1,6 +1,6 @@
 import { View } from 'react-native';
 import { createElement } from 'react';
-import { splitProps, splitStyle, wrapChildren, extendObject, useTextPassThroughValue, transformBoxSizing, isBoxSizingAffectingStyle } from './utils';
+import { splitProps, splitStyle, wrapChildren, extendObject, useTextPassThrough, transformBoxSizing, isBoxSizingAffectingStyle } from './utils';
 import useInnerProps from './getInnerListeners';
 import * as perf from '@mpxjs/perf';
 const SimpleView = (simpleViewProps) => {
@@ -12,13 +12,20 @@ const SimpleView = (simpleViewProps) => {
     if (__mpx_perf_framework__)
         idStyle = perf.scopeStart('simple-view:render:style');
     const { textProps, innerProps: props = {} } = splitProps(simpleViewProps);
+    const enableTextPassThrough = props['enable-text-pass-through'];
     let hasBoxSizingAffectingStyle = false;
     const { textStyle, innerStyle = {} } = splitStyle(props.style || {}, (key) => {
         if (!hasBoxSizingAffectingStyle && isBoxSizingAffectingStyle(key)) {
             hasBoxSizingAffectingStyle = true;
         }
     });
-    const textPassThrough = useTextPassThroughValue(textStyle, textProps);
+    const textPassThrough = useTextPassThrough(textStyle, textProps, { enableTextPassThrough });
+    let styleObj = innerStyle;
+    if (hasBoxSizingAffectingStyle) {
+        // 复制一次再 mutate，避免污染 splitStyle 复用的原 props.style
+        styleObj = extendObject({}, innerStyle);
+        transformBoxSizing(styleObj);
+    }
     if (__mpx_perf_framework__)
         perf.scopeEnd(idStyle);
     // ───── innerProps 阶段 ─────
@@ -26,7 +33,7 @@ const SimpleView = (simpleViewProps) => {
     if (__mpx_perf_framework__)
         idInnerProps = perf.scopeStart('simple-view:render:innerProps');
     const innerProps = useInnerProps(extendObject({}, props, {
-        style: transformBoxSizing(extendObject({}, innerStyle), hasBoxSizingAffectingStyle)
+        style: styleObj
     }));
     if (__mpx_perf_framework__)
         perf.scopeEnd(idInnerProps);
@@ -34,7 +41,7 @@ const SimpleView = (simpleViewProps) => {
     let idCreate = -1;
     if (__mpx_perf_framework__)
         idCreate = perf.scopeStart('simple-view:render:createElement');
-    const result = createElement(View, innerProps, wrapChildren(props, {
+    const result = createElement(View, innerProps, wrapChildren(props.children, {
         hasVarDec: false,
         textPassThrough
     }));

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

@@ -21,7 +21,6 @@ export interface SliderProps {
     style?: ViewStyle & Record<string, any>;
     'enable-offset'?: boolean;
     '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-slider.jsx

@@ -18,14 +18,14 @@ import { useRef, forwardRef, useEffect, useState, createElement, useContext, use
 import { View } from 'react-native';
 import { GestureDetector, Gesture } from 'react-native-gesture-handler';
 import Animated, { useSharedValue, useAnimatedStyle, runOnJS } from 'react-native-reanimated';
-import { warn } from '@mpxjs/utils';
+import { warn, hasOwn } from '@mpxjs/utils';
 import useInnerProps, { getCustomEvent } from './getInnerListeners';
 import useNodesRef from './useNodesRef';
 import { useLayout, useTransformStyle, extendObject, useRunOnJSCallback } from './utils';
 import Portal from './mpx-portal';
 import { FormContext } from './context';
 const Slider = forwardRef((props, ref) => {
-    const { min: rawMin = 0, max: rawMax = 100, step: rawStep = 1, disabled = false, value: rawValue, color, 'selected-color': selectedColor, activeColor = selectedColor || color || '#1aad19', backgroundColor = color || '#e9e9e9', 'block-size': rawBlockSize = 28, 'block-color': blockColor = '#ffffff', name, style = {}, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight } = props;
+    const { min: rawMin = 0, max: rawMax = 100, step: rawStep = 1, disabled = false, value: rawValue, color, 'selected-color': selectedColor, activeColor = selectedColor || color || '#1aad19', backgroundColor = color || '#e9e9e9', 'block-size': rawBlockSize = 28, 'block-color': blockColor = '#ffffff', name, style = {}, 'enable-var': enableVar, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight } = props;
     // 确保数值类型正确
     const min = typeof rawMin === 'string' ? parseFloat(rawMin) : rawMin;
     const max = typeof rawMax === 'string' ? parseFloat(rawMax) : rawMax;
@@ -51,7 +51,6 @@ const Slider = forwardRef((props, ref) => {
     }
     const { normalStyle, hasSelfPercent, setWidth, setHeight, hasPositionFixed } = useTransformStyle(style, {
         enableVar,
-        externalVarContext,
         parentFontSize,
         parentWidth,
         parentHeight
@@ -239,12 +238,13 @@ const Slider = forwardRef((props, ref) => {
     // 样式定义
     const blockSizeNum = Math.max(12, Math.min(28, blockSize));
     const trackHeight = 4;
+    // 用户传 padding shorthand 时跳过 paddingLeft/Right default,
+    // 避免 number 形式 padding:0 被 longhand default 反向覆盖
     const containerStyle = extendObject({}, {
         flexDirection: 'row',
         alignItems: 'center',
-        minHeight: Math.max(blockSizeNum + 8, 40),
-        paddingHorizontal: 14 // 固定内边距，不受 block-size 影响
-    }, normalStyle, layoutStyle);
+        minHeight: Math.max(blockSizeNum + 8, 40)
+    }, hasOwn(style, 'padding') ? null : { paddingHorizontal: 14 }, hasOwn(style, 'margin') ? null : { marginHorizontal: 18, marginVertical: 10 }, normalStyle, layoutStyle);
     const trackStyle = {
         flex: 1,
         height: trackHeight,

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

@@ -7,7 +7,7 @@ interface StickyHeaderProps {
     padding?: [number, number, number, number];
     'offset-top'?: number;
     'enable-var'?: boolean;
-    'external-var-context'?: Record<string, any>;
+    'enable-text-pass-through'?: boolean;
     'parent-font-size'?: number;
     'parent-width'?: number;
     'parent-height'?: number;

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

@@ -2,22 +2,22 @@ import { useEffect, useRef, useContext, forwardRef, useMemo, createElement, useI
 import { Animated, StyleSheet, useAnimatedValue } from 'react-native';
 import { ScrollViewContext, StickyContext } from './context';
 import useNodesRef from './useNodesRef';
-import { splitProps, splitStyle, useTransformStyle, wrapChildren, useLayout, extendObject, useTextPassThroughValue } from './utils';
+import { splitProps, splitStyle, useTransformStyle, wrapChildren, useLayout, extendObject, useTextPassThrough } from './utils';
 import { error } from '@mpxjs/utils';
 import useInnerProps, { getCustomEvent } from './getInnerListeners';
 const _StickyHeader = forwardRef((stickyHeaderProps = {}, ref) => {
     const { textProps, innerProps: props = {} } = splitProps(stickyHeaderProps);
-    const { style, bindstickontopchange, padding = [0, 0, 0, 0], 'offset-top': offsetTop = 0, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight } = props;
+    const { style, bindstickontopchange, padding = [0, 0, 0, 0], 'offset-top': offsetTop = 0, 'enable-var': enableVar, 'enable-text-pass-through': enableTextPassThrough, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight } = props;
     const { scrollOffset, gestureRef: scrollViewRef } = useContext(ScrollViewContext);
     const stickyContext = useContext(StickyContext);
     const { registerStickyHeader, unregisterStickyHeader } = stickyContext;
     const headerRef = useRef(null);
     const isStickOnTopRef = useRef(false);
     const id = useId();
-    const { normalStyle, hasVarDec, varContextRef, hasSelfPercent, setWidth, setHeight } = useTransformStyle(style, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
+    const { normalStyle, hasVarDec, varContextRef, hasSelfPercent, setWidth, setHeight } = useTransformStyle(style, { enableVar, parentFontSize, parentWidth, parentHeight });
     const { layoutRef, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef: headerRef, onLayout });
     const { textStyle, innerStyle = {} } = splitStyle(normalStyle);
-    const textPassThrough = useTextPassThroughValue(textStyle, textProps);
+    const textPassThrough = useTextPassThrough(textStyle, textProps, { enableTextPassThrough });
     const headerTopAnimated = useAnimatedValue(0);
     // harmony animatedValue 不支持通过 _value 访问
     const headerTopRef = useRef(0);
@@ -103,7 +103,7 @@ const _StickyHeader = forwardRef((stickyHeaderProps = {}, ref) => {
         'offset-top',
         'bindstickontopchange'
     ], { layoutRef });
-    return (createElement(Animated.View, innerProps, wrapChildren(props, {
+    return (createElement(Animated.View, innerProps, wrapChildren(props.children, {
         hasVarDec,
         varContext: varContextRef.current,
         textPassThrough

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

@@ -6,7 +6,7 @@ interface StickySectionProps {
     style?: ViewStyle;
     'offset-top'?: number;
     'enable-var'?: boolean;
-    'external-var-context'?: Record<string, any>;
+    'enable-text-pass-through'?: boolean;
     'parent-font-size'?: number;
     'parent-width'?: number;
     'parent-height'?: number;

package/lib/runtime/components/react/dist/mpx-sticky-section.jsx

@@ -1,17 +1,17 @@
 import { useRef, forwardRef, createElement, useCallback, useMemo } from 'react';
 import { View } from 'react-native';
 import useNodesRef from './useNodesRef';
-import { splitProps, splitStyle, useTransformStyle, wrapChildren, useLayout, extendObject, useTextPassThroughValue } from './utils';
+import { splitProps, splitStyle, useTransformStyle, wrapChildren, useLayout, extendObject, useTextPassThrough } from './utils';
 import { StickyContext } from './context';
 import useInnerProps from './getInnerListeners';
 const _StickySection = forwardRef((stickySectionProps = {}, ref) => {
     const { textProps, innerProps: props = {} } = splitProps(stickySectionProps);
-    const { style, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight } = props;
+    const { style, 'enable-var': enableVar, 'enable-text-pass-through': enableTextPassThrough, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight } = props;
     const sectionRef = useRef(null);
-    const { normalStyle, hasVarDec, varContextRef, hasSelfPercent, setWidth, setHeight } = useTransformStyle(style, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
+    const { normalStyle, hasVarDec, varContextRef, hasSelfPercent, setWidth, setHeight } = useTransformStyle(style, { enableVar, parentFontSize, parentWidth, parentHeight });
     const { layoutRef, layoutProps, layoutStyle } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef: sectionRef, onLayout });
     const { textStyle, innerStyle = {} } = splitStyle(normalStyle);
-    const textPassThrough = useTextPassThroughValue(textStyle, textProps);
+    const textPassThrough = useTextPassThrough(textStyle, textProps, { enableTextPassThrough });
     const stickyHeaders = useRef(new Map());
     const registerStickyHeader = useCallback((item) => {
         stickyHeaders.current.set(item.id, item);
@@ -32,12 +32,12 @@ const _StickySection = forwardRef((stickySectionProps = {}, ref) => {
         });
     }
     const innerProps = useInnerProps(extendObject({}, props, {
-        style: extendObject(innerStyle, layoutStyle),
+        style: extendObject({}, innerStyle, layoutStyle),
         ref: sectionRef
     }, layoutProps), [
         'offset-top'
     ], { layoutRef });
-    return (createElement(View, innerProps, createElement(StickyContext.Provider, { value: contextValue }, wrapChildren(props, {
+    return (createElement(View, innerProps, createElement(StickyContext.Provider, { value: contextValue }, wrapChildren(props.children, {
         hasVarDec,
         varContext: varContextRef.current,
         textPassThrough

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

@@ -5,7 +5,7 @@ interface SwiperItemProps {
     'item-id'?: string;
     'enable-offset'?: boolean;
     'enable-var': boolean;
-    'external-var-context'?: Record<string, any>;
+    'enable-text-pass-through'?: boolean;
     'parent-font-size'?: number;
     'parent-width'?: number;
     'parent-height'?: number;

package/lib/runtime/components/react/dist/mpx-swiper-item.jsx

@@ -2,10 +2,10 @@ import Animated, { useAnimatedStyle, interpolate } from 'react-native-reanimated
 import { forwardRef, useRef, useContext, createElement } from 'react';
 import useInnerProps from './getInnerListeners';
 import useNodesRef from './useNodesRef'; // 引入辅助函数
-import { useTransformStyle, splitStyle, splitProps, wrapChildren, useLayout, extendObject, isHarmony, useTextPassThroughValue } from './utils';
+import { useTransformStyle, splitStyle, splitProps, wrapChildren, useLayout, extendObject, isHarmony, useTextPassThrough } from './utils';
 import { SwiperContext } from './context';
 const _SwiperItem = forwardRef((props, ref) => {
-    const { 'enable-var': enableVar, 'external-var-context': externalVarContext, style, customStyle, itemIndex } = props;
+    const { 'enable-var': enableVar, 'enable-text-pass-through': enableTextPassThrough, style, customStyle, itemIndex } = props;
     const contextValue = useContext(SwiperContext);
     const offset = contextValue.offset || 0;
     const step = contextValue.step || 0;
@@ -13,9 +13,9 @@ const _SwiperItem = forwardRef((props, ref) => {
     const dir = contextValue.dir || 'x';
     const { textProps } = splitProps(props);
     const nodeRef = useRef(null);
-    const { normalStyle, hasVarDec, varContextRef, hasSelfPercent, setWidth, setHeight } = useTransformStyle(style, { enableVar, externalVarContext });
+    const { normalStyle, hasVarDec, varContextRef, hasSelfPercent, setWidth, setHeight } = useTransformStyle(style, { enableVar });
     const { textStyle, innerStyle } = splitStyle(normalStyle);
-    const textPassThrough = useTextPassThroughValue(textStyle, textProps);
+    const textPassThrough = useTextPassThrough(textStyle, textProps, { enableTextPassThrough });
     useNodesRef(props, ref, nodeRef, {
         style: normalStyle
     });
@@ -53,7 +53,7 @@ const _SwiperItem = forwardRef((props, ref) => {
         style: [innerStyle, layoutStyle, itemAnimatedStyle, customStyle],
         'data-itemId': props['item-id']
     });
-    return createElement(Animated.View, mergeProps, wrapChildren(props, {
+    return createElement(Animated.View, mergeProps, wrapChildren(props.children, {
         hasVarDec,
         varContext: varContextRef.current,
         textPassThrough

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

@@ -49,10 +49,10 @@ interface SwiperProps {
     'next-margin'?: string;
     'enable-offset'?: boolean;
     'enable-var': boolean;
+    'enable-text-pass-through'?: boolean;
     'parent-font-size'?: number;
     'parent-width'?: number;
     'parent-height'?: number;
-    'external-var-context'?: Record<string, any>;
     'wait-for'?: Array<GestureHandler>;
     'simultaneous-handlers'?: Array<GestureHandler>;
     disableGesture?: boolean;

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

@@ -4,7 +4,7 @@ import Animated, { useAnimatedStyle, useSharedValue, withTiming, Easing, runOnJS
 import React, { forwardRef, useRef, useEffect, useMemo, createElement } from 'react';
 import useInnerProps, { getCustomEvent } from './getInnerListeners';
 import useNodesRef from './useNodesRef'; // 引入辅助函数
-import { useTransformStyle, splitStyle, splitProps, useLayout, wrapChildren, extendObject, flatGesture, useRunOnJSCallback, useTextPassThroughValue } from './utils';
+import { useTransformStyle, splitStyle, splitProps, useLayout, wrapChildren, extendObject, flatGesture, useRunOnJSCallback, useTextPassThrough } from './utils';
 import { SwiperContext } from './context';
 import Portal from './mpx-portal';
 /**
@@ -61,7 +61,7 @@ const easeMap = {
     easeInOutCubic: Easing.inOut(Easing.cubic)
 };
 const SwiperWrapper = forwardRef((props, ref) => {
-    const { 'indicator-dots': showPagination, 'indicator-color': dotColor = 'rgba(0, 0, 0, .3)', 'indicator-width': dotWidth = 8, 'indicator-height': dotHeight = 8, 'indicator-radius': dotRadius = 4, 'indicator-spacing': dotSpacing = 4, 'indicator-margin': paginationMargin = 10, 'indicator-active-color': activeDotColor = '#000000', 'enable-var': enableVar = false, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, 'external-var-context': externalVarContext, 'simultaneous-handlers': originSimultaneousHandlers = [], 'wait-for': waitFor = [], style = {}, autoplay = false, circular = false, disableGesture = false, current: propCurrent = 0, bindchange } = props;
+    const { 'indicator-dots': showPagination, 'indicator-color': dotColor = 'rgba(0, 0, 0, .3)', 'indicator-width': dotWidth = 8, 'indicator-height': dotHeight = 8, 'indicator-radius': dotRadius = 4, 'indicator-spacing': dotSpacing = 4, 'indicator-margin': paginationMargin = 10, 'indicator-active-color': activeDotColor = '#000000', 'enable-var': enableVar = false, 'enable-text-pass-through': enableTextPassThrough, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, 'simultaneous-handlers': originSimultaneousHandlers = [], 'wait-for': waitFor = [], style = {}, autoplay = false, circular = false, disableGesture = false, current: propCurrent = 0, bindchange } = props;
     const dotCommonStyle = {
         width: dotWidth,
         height: dotHeight,
@@ -85,14 +85,13 @@ const SwiperWrapper = forwardRef((props, ref) => {
     // 计算transfrom之类的
     const { normalStyle, hasVarDec, varContextRef, hasSelfPercent, hasPositionFixed, setWidth, setHeight } = useTransformStyle(style, {
         enableVar,
-        externalVarContext,
         parentFontSize,
         parentWidth,
         parentHeight
     });
     const { textStyle } = splitStyle(normalStyle);
     const { textProps } = splitProps(props);
-    const textPassThrough = useTextPassThroughValue(textStyle, textProps);
+    const textPassThrough = useTextPassThrough(textStyle, textProps, { enableTextPassThrough });
     const preMargin = props['previous-margin'] ? global.__formatValue(props['previous-margin']) : 0;
     const nextMargin = props['next-margin'] ? global.__formatValue(props['next-margin']) : 0;
     const preMarginShared = useSharedValue(preMargin);
@@ -817,9 +816,7 @@ const SwiperWrapper = forwardRef((props, ref) => {
     const animateComponent = createElement(Animated.View, {
         key: 'swiperContainer',
         style: [{ flexDirection: dir === 'x' ? 'row' : 'column', width: '100%', height: '100%' }, animatedStyles]
-    }, wrapChildren({
-        children: arrPages
-    }, {
+    }, wrapChildren(arrPages, {
         hasVarDec,
         varContext: varContextRef.current,
         textPassThrough

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

@@ -18,7 +18,6 @@ interface _SwitchProps extends SwitchProps {
     'parent-font-size'?: number;
     'parent-width'?: number;
     'parent-height'?: number;
-    'external-var-context'?: Record<string, any>;
     bindchange?: (event: NativeSyntheticEvent<TouchEvent> | unknown) => void;
     catchchange?: (event: NativeSyntheticEvent<TouchEvent> | unknown) => void;
 }

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

@@ -14,7 +14,7 @@ import Portal from './mpx-portal';
 import { FormContext } from './context';
 import { useTransformStyle, useLayout, extendObject } from './utils';
 const _Switch = forwardRef((props, ref) => {
-    const { style = {}, checked = false, type = 'switch', disabled = false, color = '#04BE02', 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, bindchange, catchchange } = props;
+    const { style = {}, checked = false, type = 'switch', disabled = false, color = '#04BE02', 'enable-var': enableVar, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, bindchange, catchchange } = props;
     const [isChecked, setIsChecked] = useState(checked);
     const changeHandler = bindchange || catchchange;
     let formValuesMap;
@@ -24,7 +24,6 @@ const _Switch = forwardRef((props, ref) => {
     }
     const { normalStyle, hasSelfPercent, setWidth, setHeight, hasPositionFixed } = useTransformStyle(style, {
         enableVar,
-        externalVarContext,
         parentFontSize,
         parentWidth,
         parentHeight

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

@@ -12,7 +12,6 @@ interface _TextProps extends TextProps {
     selectable?: boolean;
     'user-select'?: boolean;
     '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-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,12 +27,17 @@ 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 idTotal = -1;
@@ -43,9 +47,7 @@ const _Text = forwardRef((props, ref) => {
     let idProps = -1;
     if (__mpx_perf_framework__)
         idProps = perf.scopeStart('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;
+    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__)
         perf.scopeEnd(idProps);
     // ───── style 阶段 ─────
@@ -54,27 +56,31 @@ const _Text = forwardRef((props, ref) => {
         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__)
         perf.scopeEnd(idStyle);
     // ───── innerProps 阶段 ─────
@@ -96,9 +102,7 @@ const _Text = forwardRef((props, ref) => {
     let idCreate = -1;
     if (__mpx_perf_framework__)
         idCreate = perf.scopeStart('text:render:createElement');
-    let finalComponent = createElement(Text, innerProps, wrapChildren(extendObject({}, mergedProps, {
-        children
-    }), {
+    let finalComponent = createElement(Text, innerProps, wrapChildren(children, {
         hasVarDec,
         varContext: varContextRef.current,
         textPassThrough

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;