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

package/lib/runtime/components/react/mpx-scroll-view.tsx

@@ -38,7 +38,7 @@ import Animated, { useSharedValue, withTiming, useAnimatedStyle, runOnJS } from
 import { warn, hasOwn } from '@mpxjs/utils'
 import useInnerProps, { getCustomEvent } from './getInnerListeners'
 import useNodesRef, { HandlerRef } from './useNodesRef'
-import { splitProps, splitStyle, useTransformStyle, useLayout, wrapChildren, extendObject, flatGesture, GestureHandler, HIDDEN_STYLE, useRunOnJSCallback, useTextPassThroughValue } from './utils'
+import { splitProps, splitStyle, useTransformStyle, useLayout, wrapChildren, extendObject, flatGesture, GestureHandler, hiddenStyle, useRunOnJSCallback, useTextPassThrough } from './utils'
 import { IntersectionObserverContext, ScrollViewContext } from './context'
 import Portal from './mpx-portal'
 
@@ -66,7 +66,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;
@@ -145,7 +145,7 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
     'scroll-left': scrollLeft = 0,
     'refresher-triggered': refresherTriggered,
     'enable-var': enableVar,
-    'external-var-context': externalVarContext,
+    'enable-text-pass-through': enableTextPassThrough,
     'parent-font-size': parentFontSize,
     'parent-width': parentWidth,
     'parent-height': parentHeight,
@@ -200,10 +200,10 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
     hasPositionFixed,
     setWidth,
     setHeight
-  } = useTransformStyle(style, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight })
+  } = 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<ScrollView>(null)
 
@@ -255,7 +255,7 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
   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) {
@@ -880,7 +880,7 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
   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,

package/lib/runtime/components/react/mpx-simple-text.tsx

@@ -1,8 +1,7 @@
 import { Text, TextStyle, TextProps } from 'react-native'
-import { JSX, createElement, useContext } from 'react'
+import { JSX, 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: TextProps): JSX.Element => {
@@ -12,30 +11,29 @@ const SimpleText = (props: TextProps): JSX.Element => {
   // ───── style 阶段 ─────
   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: TextStyle | undefined = !isStringOnly && Object.keys(textStyle).length ? textStyle : undefined
-  const childTextPassThrough = useTextPassThroughValue(
-    childTextStyle,
-    undefined,
-    {
-      inheritTextProps: false,
-      disabled: isStringOnly
-    }
-  )
+  // textStyle 仅在子节点非纯字符串时才需要透传给子级；按需计算 isStringChildren
+  const childTextStyle: TextStyle | undefined = textStyle && !isStringChildren(props.children)
+    ? textStyle as 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 as Record<string, any>)
+  }
   if (__mpx_perf_framework__) perf.scopeEnd(idStyle)
 
   // ───── innerProps 阶段 ─────
@@ -46,8 +44,8 @@ const SimpleText = (props: TextProps): JSX.Element => {
       {},
       mergedProps,
       {
-        allowFontScaling: allowFontScaling ?? getDefaultAllowFontScaling(),
-        style: finalStyle
+        allowFontScaling: mergedProps.allowFontScaling ?? getDefaultAllowFontScaling(),
+        style: mergedStyle
       }
     )
   )
@@ -57,10 +55,10 @@ const SimpleText = (props: TextProps): JSX.Element => {
   let idCreate = -1
   if (__mpx_perf_framework__) idCreate = perf.scopeStart('simple-text:render:createElement')
   const result = createElement(Text, innerProps, wrapChildren(
-    { children },
+    mergedProps.children,
     {
       hasVarDec: false,
-      textPassThrough: childTextPassThrough
+      textPassThrough
     }
   ))
   if (__mpx_perf_framework__) perf.scopeEnd(idCreate)

package/lib/runtime/components/react/mpx-simple-view.tsx

@@ -1,10 +1,14 @@
 import { View, ViewProps, TextStyle } 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: ViewProps): JSX.Element => {
+interface SimpleViewProps extends ViewProps {
+  'enable-text-pass-through'?: boolean
+}
+
+const SimpleView = (simpleViewProps: SimpleViewProps): JSX.Element => {
   let idTotal = -1
   if (__mpx_perf_framework__) idTotal = perf.scopeStart('simple-view:render:total')
 
@@ -12,6 +16,7 @@ const SimpleView = (simpleViewProps: ViewProps): JSX.Element => {
   let idStyle = -1
   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) => {
@@ -19,7 +24,14 @@ const SimpleView = (simpleViewProps: ViewProps): JSX.Element => {
       hasBoxSizingAffectingStyle = true
     }
   })
-  const textPassThrough = useTextPassThroughValue(textStyle as TextStyle, textProps)
+  const textPassThrough = useTextPassThrough(textStyle as TextStyle, textProps, { enableTextPassThrough })
+
+  let styleObj: Record<string, any> = innerStyle
+  if (hasBoxSizingAffectingStyle) {
+    // 复制一次再 mutate，避免污染 splitStyle 复用的原 props.style
+    styleObj = extendObject({}, innerStyle)
+    transformBoxSizing(styleObj)
+  }
   if (__mpx_perf_framework__) perf.scopeEnd(idStyle)
 
   // ───── innerProps 阶段 ─────
@@ -30,7 +42,7 @@ const SimpleView = (simpleViewProps: ViewProps): JSX.Element => {
       {},
       props,
       {
-        style: transformBoxSizing(extendObject({}, innerStyle), hasBoxSizingAffectingStyle)
+        style: styleObj
       }
     )
   )
@@ -40,7 +52,7 @@ const SimpleView = (simpleViewProps: ViewProps): JSX.Element => {
   let idCreate = -1
   if (__mpx_perf_framework__) idCreate = perf.scopeStart('simple-view:render:createElement')
   const result = createElement(View, innerProps, wrapChildren(
-    props,
+    props.children,
     {
       hasVarDec: false,
       textPassThrough

package/lib/runtime/components/react/mpx-slider.tsx

@@ -31,7 +31,7 @@ import {
 } from 'react-native'
 import { GestureDetector, Gesture, GestureStateChangeEvent, PanGestureHandlerEventPayload } 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, { HandlerRef } from './useNodesRef'
@@ -59,7 +59,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
@@ -84,7 +83,6 @@ const Slider = forwardRef<
     name,
     style = {},
     'enable-var': enableVar,
-    'external-var-context': externalVarContext,
     'parent-font-size': parentFontSize,
     'parent-width': parentWidth,
     'parent-height': parentHeight
@@ -128,7 +126,6 @@ const Slider = forwardRef<
     hasPositionFixed
   } = useTransformStyle(style, {
     enableVar,
-    externalVarContext,
     parentFontSize,
     parentWidth,
     parentHeight
@@ -337,12 +334,20 @@ const Slider = forwardRef<
   const blockSizeNum = Math.max(12, Math.min(28, blockSize))
   const trackHeight = 4
 
-  const containerStyle: ViewStyle = extendObject({} as ViewStyle, {
-    flexDirection: 'row' as const,
-    alignItems: 'center' as const,
-    minHeight: Math.max(blockSizeNum + 8, 40),
-    paddingHorizontal: 14 // 固定内边距，不受 block-size 影响
-  }, normalStyle, layoutStyle)
+  // 用户传 padding shorthand 时跳过 paddingLeft/Right default,
+  // 避免 number 形式 padding:0 被 longhand default 反向覆盖
+  const containerStyle: ViewStyle = extendObject(
+    {} as ViewStyle,
+    {
+      flexDirection: 'row' as const,
+      alignItems: 'center' as const,
+      minHeight: Math.max(blockSizeNum + 8, 40)
+    },
+    hasOwn(style, 'padding') ? null : { paddingHorizontal: 14 },
+    hasOwn(style, 'margin') ? null : { marginHorizontal: 18, marginVertical: 10 },
+    normalStyle,
+    layoutStyle
+  )
 
   const trackStyle: ViewStyle = {
     flex: 1,

package/lib/runtime/components/react/mpx-sticky-header.tsx

@@ -2,7 +2,7 @@ import { useEffect, useRef, useContext, forwardRef, useMemo, createElement, Reac
 import { Animated, StyleSheet, View, NativeSyntheticEvent, ViewStyle, LayoutChangeEvent, useAnimatedValue } from 'react-native'
 import { ScrollViewContext, StickyContext } from './context'
 import useNodesRef, { HandlerRef } 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'
 
@@ -12,7 +12,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;
@@ -27,7 +27,7 @@ const _StickyHeader = forwardRef<HandlerRef<View, StickyHeaderProps>, StickyHead
     padding = [0, 0, 0, 0],
     'offset-top': offsetTop = 0,
     'enable-var': enableVar,
-    'external-var-context': externalVarContext,
+    'enable-text-pass-through': enableTextPassThrough,
     'parent-font-size': parentFontSize,
     'parent-width': parentWidth,
     'parent-height': parentHeight
@@ -47,12 +47,12 @@ const _StickyHeader = forwardRef<HandlerRef<View, StickyHeaderProps>, StickyHead
     hasSelfPercent,
     setWidth,
     setHeight
-  } = useTransformStyle(style, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight })
+  } = 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 访问
@@ -161,7 +161,7 @@ const _StickyHeader = forwardRef<HandlerRef<View, StickyHeaderProps>, StickyHead
       Animated.View,
       innerProps,
       wrapChildren(
-        props,
+        props.children,
         {
           hasVarDec,
           varContext: varContextRef.current,

package/lib/runtime/components/react/mpx-sticky-section.tsx

@@ -2,7 +2,7 @@
 import { useRef, forwardRef, createElement, ReactNode, useCallback, useMemo } from 'react'
 import { View, ViewStyle } from 'react-native'
 import useNodesRef, { HandlerRef } 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'
 
@@ -11,7 +11,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;
@@ -22,7 +22,7 @@ const _StickySection = forwardRef<HandlerRef<View, StickySectionProps>, StickySe
   const {
     style,
     'enable-var': enableVar,
-    'external-var-context': externalVarContext,
+    'enable-text-pass-through': enableTextPassThrough,
     'parent-font-size': parentFontSize,
     'parent-width': parentWidth,
     'parent-height': parentHeight
@@ -36,12 +36,12 @@ const _StickySection = forwardRef<HandlerRef<View, StickySectionProps>, StickySe
     hasSelfPercent,
     setWidth,
     setHeight
-  } = useTransformStyle(style, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight })
+  } = 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<Map<string, any>>(new Map())
 
@@ -69,7 +69,7 @@ const _StickySection = forwardRef<HandlerRef<View, StickySectionProps>, StickySe
   }
 
   const innerProps = useInnerProps(extendObject({}, props, {
-    style: extendObject(innerStyle, layoutStyle),
+    style: extendObject({}, innerStyle, layoutStyle),
     ref: sectionRef
   }, layoutProps), [
     'offset-top'
@@ -83,7 +83,7 @@ const _StickySection = forwardRef<HandlerRef<View, StickySectionProps>, StickySe
         StickyContext.Provider,
         { value: contextValue },
         wrapChildren(
-          props,
+          props.children,
           {
             hasVarDec,
             varContext: varContextRef.current,

package/lib/runtime/components/react/mpx-swiper-item.tsx

@@ -3,14 +3,14 @@ import Animated, { useAnimatedStyle, interpolate, SharedValue } from 'react-nati
 import { ReactNode, forwardRef, useRef, useContext, createElement } from 'react'
 import useInnerProps from './getInnerListeners'
 import useNodesRef, { HandlerRef } 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'
 
 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
@@ -30,7 +30,7 @@ interface ContextType {
 const _SwiperItem = forwardRef<HandlerRef<View, SwiperItemProps>, SwiperItemProps>((props: SwiperItemProps, ref) => {
   const {
     'enable-var': enableVar,
-    'external-var-context': externalVarContext,
+    'enable-text-pass-through': enableTextPassThrough,
     style,
     customStyle,
     itemIndex
@@ -51,9 +51,9 @@ const _SwiperItem = forwardRef<HandlerRef<View, SwiperItemProps>, SwiperItemProp
     hasSelfPercent,
     setWidth,
     setHeight
-  } = useTransformStyle(style, { enableVar, externalVarContext })
+  } = 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
   })
@@ -103,7 +103,7 @@ const _SwiperItem = forwardRef<HandlerRef<View, SwiperItemProps>, SwiperItemProp
     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/mpx-swiper.tsx

@@ -5,7 +5,7 @@ import Animated, { useAnimatedStyle, useSharedValue, withTiming, Easing, runOnJS
 import React, { JSX, forwardRef, useRef, useEffect, ReactNode, ReactElement, useMemo, createElement } from 'react'
 import useInnerProps, { getCustomEvent } from './getInnerListeners'
 import useNodesRef, { HandlerRef } from './useNodesRef' // 引入辅助函数
-import { useTransformStyle, splitStyle, splitProps, useLayout, wrapChildren, extendObject, GestureHandler, flatGesture, useRunOnJSCallback, useTextPassThroughValue } from './utils'
+import { useTransformStyle, splitStyle, splitProps, useLayout, wrapChildren, extendObject, GestureHandler, flatGesture, useRunOnJSCallback, useTextPassThrough } from './utils'
 import { SwiperContext } from './context'
 import Portal from './mpx-portal'
 /**
@@ -70,10 +70,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
@@ -147,10 +147,10 @@ const SwiperWrapper = forwardRef<HandlerRef<View, SwiperProps>, SwiperProps>((pr
     '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,
-    'external-var-context': externalVarContext,
     'simultaneous-handlers': originSimultaneousHandlers = [],
     'wait-for': waitFor = [],
     style = {},
@@ -192,14 +192,13 @@ const SwiperWrapper = forwardRef<HandlerRef<View, SwiperProps>, SwiperProps>((pr
     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']) as number : 0
   const nextMargin = props['next-margin'] ? global.__formatValue(props['next-margin']) as number : 0
   const preMarginShared = useSharedValue(preMargin)
@@ -930,9 +929,7 @@ const SwiperWrapper = forwardRef<HandlerRef<View, SwiperProps>, SwiperProps>((pr
   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/mpx-switch.tsx

@@ -26,7 +26,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
 }
@@ -39,7 +38,6 @@ const _Switch = forwardRef<HandlerRef<Switch, _SwitchProps>, _SwitchProps>((prop
     disabled = false,
     color = '#04BE02',
     'enable-var': enableVar,
-    'external-var-context': externalVarContext,
     'parent-font-size': parentFontSize,
     'parent-width': parentWidth,
     'parent-height': parentHeight,
@@ -67,7 +65,6 @@ const _Switch = forwardRef<HandlerRef<Switch, _SwitchProps>, _SwitchProps>((prop
     hasPositionFixed
   } = useTransformStyle(style, {
     enableVar,
-    externalVarContext,
     parentFontSize,
     parentWidth,
     parentHeight

package/lib/runtime/components/react/mpx-text.tsx

@@ -5,12 +5,11 @@
  * ✔ decode
  */
 import { Text, TextStyle, TextProps } from 'react-native'
-import { useRef, forwardRef, ReactNode, JSX, createElement, Children, useContext } from 'react'
+import { useRef, forwardRef, ReactNode, JSX, createElement, Children } from 'react'
 import Portal from './mpx-portal'
 import useInnerProps from './getInnerListeners'
 import useNodesRef, { HandlerRef } 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 = {
@@ -31,13 +30,17 @@ function decode (value: string) {
   }
 }
 
-function getDecodedChildren (children: ReactNode) {
-  return Children.map(children, (child) => {
-    if (typeof child === 'string') {
-      return decode(child)
-    }
+function getDecodedChildren (children: ReactNode): { children: ReactNode, isStringOnly: boolean } {
+  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 }
 }
 interface _TextProps extends TextProps {
   style?: TextStyle
@@ -45,7 +48,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
@@ -59,20 +61,17 @@ const _Text = forwardRef<HandlerRef<Text, _TextProps>, _TextProps>((props, ref):
   // ───── props 阶段 ─────
   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
+  } = props
   if (__mpx_perf_framework__) perf.scopeEnd(idProps)
 
   // ───── style 阶段 ─────
@@ -85,33 +84,33 @@ const _Text = forwardRef<HandlerRef<Text, _TextProps>, _TextProps>((props, ref):
     hasPositionFixed
   } = useTransformStyle(currentStyle, {
     enableVar,
-    externalVarContext,
     parentFontSize,
     parentWidth,
     parentHeight
   })
-  const finalStyle = extendObject({}, inheritedText?.textStyle, normalStyle)
+
+  let children: ReactNode
+  let isStringOnly: boolean
+  if (decode) {
+    ({ children, isStringOnly } = getDecodedChildren(props.children))
+  } else {
+    children = props.children
+    isStringOnly = isStringChildren(children)
+  }
+  const childTextStyle = !isStringOnly ? (splitStyle(normalStyle).textStyle as TextStyle | undefined) : 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<Text, _TextProps>(mergedProps, ref, nodeRef, {
     style: finalStyle
   })
-
-  const children = decode ? getDecodedChildren(mergedProps.children) : mergedProps.children
-  const isStringOnly = isStringChildren(children)
-  let childTextStyle: TextStyle | undefined
-  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 阶段 ─────
@@ -139,9 +138,7 @@ const _Text = forwardRef<HandlerRef<Text, _TextProps>, _TextProps>((props, ref):
   let idCreate = -1
   if (__mpx_perf_framework__) idCreate = perf.scopeStart('text:render:createElement')
   let finalComponent:JSX.Element = createElement(Text, innerProps, wrapChildren(
-    extendObject({}, mergedProps, {
-      children
-    }),
+    children,
     {
       hasVarDec,
       varContext: varContextRef.current,

package/lib/runtime/components/react/mpx-video.tsx

@@ -93,7 +93,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
@@ -155,7 +154,6 @@ const MpxVideo = forwardRef<HandlerRef<View, VideoProps>, VideoProps>((videoProp
     '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
@@ -172,12 +170,12 @@ const MpxVideo = forwardRef<HandlerRef<View, VideoProps>, VideoProps>((videoProp
   propsRef.current = props
 
   const { normalStyle, hasSelfPercent, setWidth, setHeight, hasPositionFixed } =
-    useTransformStyle(extendObject({}, styles.container, style), {
+    useTransformStyle(style, {
       enableVar,
-      externalVarContext,
       parentFontSize,
       parentWidth,
-      parentHeight
+      parentHeight,
+      defaultStyle: styles.container
     })
 
   const { layoutRef, layoutStyle, layoutProps } = useLayout({