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

package/lib/runtime/components/react/dist/utils.jsx

@@ -29,6 +29,7 @@ const varUseRegExp = /var\(/;
 const unoVarDecRegExp = /^--un-/;
 const unoVarUseRegExp = /var\(--un-/;
 const lengthValueRegExp = /^(-?(?:\d+(?:\.\d+)?|\.\d+)(?:rpx|px|%|vw|vh)?|hairlineWidth)$/;
+const DEFAULT_FONT_SIZE = 16;
 // transform: 'rotateX(45deg) ...' 单段拆出 fn 名与括号内值
 const transformFnRegExp = /([/\w]+)\((.+)\)/;
 // boxShadow 子值识别 rpx 单位（仅 rpx 需要换算为 px，其它单位保留原样）
@@ -88,7 +89,7 @@ const runtimeAbbreviationMap = {
     // 因此进入 runtimeForceExpandCompositeMap，避免「单值透传」捷径放过这类多值串残留。
     // 百分比（`gap: 50%` / `gap: 10px 50%`）由 transformShorthand 写回阶段就地 resolvePercent 落成 number
     gap: ['rowGap', 'columnGap'],
-    // inset：4 槽位等价 margin 四值语法；RN inset 长属性非稳定，单值也必须展开到 top/right/bottom/left
+    // inset：4 槽位等价 margin 四值语法；RN 0.74+ 原生支持单值 DimensionValue，单值走 runtimeCompositeStyleMap 短路透传
     inset: ['top', 'right', 'bottom', 'left'],
     // outline: <outline-width> || <outline-style> || <outline-color>，顺序不敏感
     outline: ['outlineWidth', 'outlineStyle', 'outlineColor']
@@ -102,15 +103,6 @@ const runtimeCompositeStyleMap = {
     gap: true,
     inset: true
 };
-// 即使单值也必须展开（不走「单值透传」捷径）：
-// - inset：RN inset 长属性不稳定，单值透传会留下不可靠的 inset key
-// - gap：RN gap / rowGap / columnGap 严格要求 number；单值串虽已在 __getStyle 阶段被 __formatValue 换算，
-//   但多值串（如 '10px 20px'）会原样透传到这里，需展开后逐 token 再过 __formatValue 才能落成 number；
-//   `%` 在写回阶段由 transformShorthand 调 resolvePercent 落成 number（rowGap 基 parentHeight、columnGap 基 parentWidth）
-const runtimeForceExpandCompositeMap = {
-    inset: true,
-    gap: true
-};
 const runtimeUnorderedAbbreviationMap = {
     border: true,
     borderTop: true,
@@ -123,13 +115,18 @@ const runtimeUnorderedAbbreviationMap = {
     // outline 与 border 简写共享同一套缺省值处理
     outline: true
 };
-const runtimeBorderLikeShorthandMap = {
+// 单值简写在 __getStyle 阶段经 __formatValue 把带单位长度换算为 number 后，
+// 需要在 transformShorthand 入口转回字符串 token 交给展开逻辑的 key 集合。
+// margin / padding / borderRadius / borderWidth / borderColor / inset 不在此列：
+// RN 原生支持这些 key 直接吃单值 number，无需展开。
+const runtimeNumericExpandShorthandMap = {
     border: true,
     borderTop: true,
     borderRight: true,
     borderBottom: true,
     borderLeft: true,
-    outline: true
+    outline: true,
+    gap: true
 };
 // CSS border-width: medium 的实测值（各主流浏览器一致取 3px）
 // 与编译期 wx/index.js 同名常量保持一致；调整需两侧一起改
@@ -332,7 +329,7 @@ export function transformBoxSizing(style = {}) {
         style.boxSizing = global.__mpx?.config?.rnConfig?.defaultBoxSizing ?? defaultBoxSizingStyle.boxSizing;
     }
 }
-export function splitStyle(styleObj, sideEffect) {
+export function splitStyle(styleObj = {}, sideEffect) {
     const keys = Object.keys(styleObj);
     let textStyle;
     let backgroundStyle;
@@ -370,7 +367,7 @@ export function splitStyle(styleObj, sideEffect) {
     }
     return { textStyle, backgroundStyle, innerStyle };
 }
-export function splitProps(props) {
+export function splitProps(props = {}) {
     const keys = Object.keys(props);
     let textProps;
     let innerProps;
@@ -474,8 +471,8 @@ function resolvePercent(value, key, percentConfig) {
     let base;
     let reason;
     if (key === 'fontSize') {
-        base = percentConfig.parentFontSize;
-        reason = 'parent-font-size';
+        base = DEFAULT_FONT_SIZE;
+        reason = 'default-font-size';
     }
     else if (key === 'lineHeight') {
         base = resolvePercent(percentConfig.fontSize, 'fontSize', percentConfig);
@@ -839,7 +836,7 @@ function expandFlex(value) {
 // RN 等效子集语法：font: [ <font-style> ] [ <font-variant-css2> ] [ <font-weight> ] <font-size> [ / <line-height> ] <font-family>
 // - 必填项：font-size 与 font-family；缺其一整条 font 声明丢弃（error）
 // - 非必填 token（font-stretch / 数字型 font-variant-numeric / system 关键字等）：warn 提示并忽略，保留其余槽位
-function transformFont(styleObj, percentConfig) {
+function transformFont(styleObj) {
     const value = styleObj.font;
     if (typeof value !== 'string')
         return;
@@ -850,7 +847,7 @@ function transformFont(styleObj, percentConfig) {
     // 1. 定位 font-size（第一个 length，可能带 /<line-height>）
     //    注意：unit-less 数字也命中 length 正则，需要先排除 font-weight 数字（100..900 / bold / normal），
     //    否则 `font: 500 16px Arial` 会把 500 误判为 fontSize。
-    //    fontSize 自身可能是 %（如 `font: 50% Arial`），就地用 resolvePercent 按 parentFontSize 解析；
+    //    fontSize 自身可能是 %（如 `font: 50% Arial`），保留给文本透传阶段按继承 fontSize 解析；
     //    fontSize % 校验通过的是 `isLengthValue`（length 正则含 %），主流程已用 length 分支接住，无需特判
     for (let i = 0; i < tokens.length; i++) {
         let t = tokens[i];
@@ -871,10 +868,7 @@ function transformFont(styleObj, percentConfig) {
             continue;
         if (isLengthValue(sizePart)) {
             sizeIdx = i;
-            const sizeVal = percentRegExp.test(sizePart)
-                ? resolvePercent(sizePart, 'fontSize', percentConfig)
-                : global.__formatValue(sizePart);
-            result.push(['fontSize', sizeVal]);
+            result.push(['fontSize', global.__formatValue(sizePart)]);
             if (lhPart)
                 lineHeight = lhPart;
             break;
@@ -907,37 +901,18 @@ function transformFont(styleObj, percentConfig) {
             warn(`Token [${t}] in [font: ${value}] is not supported (only font-style / small-caps / font-weight are valid before <font-size>), dropped.`);
         }
     }
-    // 3. line-height：RN lineHeight 不接受百分比字符串，必须当场数值化。
-    //    - unit-less 数字（1.5）→ '150%' 后走 resolvePercent
-    //    - 显式百分比（120%）→ 直接走 resolvePercent
-    //    - 带单位（40px / 40rpx）→ __formatValue
-    //    基数 fontSize 取值（「长属性不覆盖简写」一致）：
-    //    - user 已显式写 fontSize 长属性 → 优先（先经 __formatValue 归一 '24px' → 24）
-    //    - 否则用 font 简写解析出的 fontSize（result[0][1]，已可能是 number / 解析后的 % 值）
+    // 3. line-height：文本透传阶段会基于当前 / 继承 fontSize 解析百分比。
+    //    - unit-less 数字（1.5）→ '150%' 中间态，避免和已格式化 RN 绝对 number 混淆
+    //    - 其它值（120% / 40px / 40rpx）→ __formatValue
     if (lineHeight !== undefined) {
-        // percentConfig.fontSize 用于 resolvePercent 的 base：
-        // - user 已显式写 fontSize 长属性 → 外层用 normalStyle.fontSize 初始化，已被前置 styleHelperMixin
-        //   的 transformStyleObj 经 __formatValue 归一为 number，可直接用，不覆盖（「长属性优先」一致）
-        // - 否则用 font 简写解析出的 fontSize（result[0][1]，本身已 number 或解析后的 % 值）回填
-        if (percentConfig.fontSize === undefined)
-            percentConfig.fontSize = result[0][1];
-        let lh;
-        if (percentRegExp.test(lineHeight)) {
-            lh = resolvePercent(lineHeight, 'lineHeight', percentConfig);
-        }
-        else if (!isNaN(+lineHeight)) {
-            lh = resolvePercent(`${+lineHeight * 100}%`, 'lineHeight', percentConfig);
-        }
-        else {
-            lh = global.__formatValue(lineHeight);
-        }
-        // lh 仍是字符串说明 resolvePercent 因 base 非 number 原样返回（已 error 过）或带单位 __formatValue
-        // 未能换算成 number（如 fontSize 是未解析的 var()）。RN lineHeight 不接受字符串，丢弃避免运行时报错
-        if (typeof lh === 'number') {
+        const lh = !isNaN(+lineHeight)
+            ? `${+lineHeight * 100}%`
+            : global.__formatValue(lineHeight);
+        if (lh !== undefined) {
             result.push(['lineHeight', lh]);
         }
         else {
-            warn(`Line-height [${lineHeight}] in [font: ${value}] could not be resolved to a number (font-size unresolved?), dropped.`);
+            warn(`Line-height [${lineHeight}] in [font: ${value}] could not be resolved, dropped.`);
         }
     }
     // 4. font-family（font-size 之后剩余部分；多字体取首值、去引号）
@@ -981,8 +956,11 @@ export function transformShorthand(styleObj, shorthandKeys, percentConfig) {
         if (typeof value === 'string') {
             values = parseValues(value);
         }
-        else if (value === 0 && hasOwn(runtimeBorderLikeShorthandMap, key)) {
-            values = ['0'];
+        else if (typeof value === 'number' && hasOwn(runtimeNumericExpandShorthandMap, key)) {
+            // runtimeNumericExpandShorthandMap 中的简写（border / outline / gap）在 __getStyle 的 transformStyleObj
+            // 阶段已被 __formatValue 把带单位长度换算为 number；这里转回字符串 token 交给后续展开，
+            // 否则会原样残留为 RN 不认识或行为不一致的简写 key。
+            values = ['' + value];
         }
         else {
             continue;
@@ -990,11 +968,13 @@ export function transformShorthand(styleObj, shorthandKeys, percentConfig) {
         const props = runtimeAbbreviationMap[key];
         if (!props)
             continue;
-        // 单值短路：composite 且单值通常透传（RN 原生支持 margin / padding 单值 DimensionValue）；
-        // 但 inset / gap 必须展开（理由见 runtimeForceExpandCompositeMap 注释）
+        // 单值短路：composite 且单值通常透传（RN 原生支持 margin / padding / inset / border-* 单值 DimensionValue）；
+        // 但 gap 必须展开 —— RN gap / rowGap / columnGap 严格要求 number，单值串虽已在 __getStyle 阶段被 __formatValue 换算，
+        // 多值串（如 '10px 20px'）仍会原样透传到这里，需展开后逐 token 再过 __formatValue 才能落成 number；
+        // `%` 在写回阶段由 transformShorthand 调 resolvePercent 落成 number（rowGap 基 parentHeight、columnGap 基 parentWidth）
         if (hasOwn(runtimeCompositeStyleMap, key) &&
             values.length === 1 &&
-            !hasOwn(runtimeForceExpandCompositeMap, key))
+            key !== 'gap')
             continue;
         let expandedValues = values;
         let pairs;
@@ -1176,7 +1156,7 @@ export function setStyle(styleObj, keyPath, setter) {
 // ============================================================
 // core style hook
 // ============================================================
-export function useTransformStyle(styleObj = {}, { enableVar, transformRadiusPercent, parentFontSize, parentWidth, parentHeight, defaultStyle }) {
+export function useTransformStyle(styleObj = {}, { enableVar, transformRadiusPercent, parentWidth, parentHeight, defaultStyle }) {
     const varStyle = {};
     const unoVarStyle = {};
     const normalStyle = {};
@@ -1247,10 +1227,9 @@ export function useTransformStyle(styleObj = {}, { enableVar, transformRadiusPer
             // fixme 去掉 translate & border-radius 的百分比计算
             // fixme Image 组件 borderRadius 仅支持 number
             const needRadiusPercent = transformRadiusPercent && hasOwn(radiusPercentRule, key);
-            const needFontPercent = key === 'fontSize' || key === 'lineHeight';
             // RN gap / rowGap / columnGap 不支持 %，需要运行时换算为 number 喂给 RN
             const needGapPercent = key === 'rowGap' || key === 'columnGap';
-            if ((needRadiusPercent || needFontPercent || needGapPercent) && percentRegExp.test(value)) {
+            if ((needRadiusPercent || needGapPercent) && percentRegExp.test(value)) {
                 if (needRadiusPercent)
                     hasSelfPercent = true;
                 resolvedKeyPath = resolvedKeyPath ?? keyPath.slice();
@@ -1336,12 +1315,10 @@ export function useTransformStyle(styleObj = {}, { enableVar, transformRadiusPer
         height,
         fontSize: normalStyle.fontSize,
         parentWidth,
-        parentHeight,
-        parentFontSize
+        parentHeight
     };
-    // transformFont 可能会更新 percentConfig 配置，必须在 transformPercent 之前执行，保证 fontSize / lineHeight 的百分比能被正确解析
     if (hasFont)
-        transformFont(normalStyle, percentConfig);
+        transformFont(normalStyle);
     if (percentKeyPaths.length)
         transformPercent(normalStyle, percentKeyPaths, percentConfig);
     if (calcKeyPaths.length) {
@@ -1420,6 +1397,31 @@ export function useNavigation() {
     const { navigation } = useContext(RouteContext) || {};
     return navigation;
 }
+function getTextPercentBase(currentFontSize, parentTextStyle) {
+    return typeof currentFontSize === 'number'
+        ? currentFontSize
+        : typeof parentTextStyle?.fontSize === 'number'
+            ? parentTextStyle.fontSize
+            : DEFAULT_FONT_SIZE;
+}
+export function resolveTextFontSizePercentStyle(textStyle, parentTextStyle) {
+    if (!textStyle)
+        return textStyle;
+    if (typeof textStyle.fontSize === 'string' && percentRegExp.test(textStyle.fontSize)) {
+        const base = getTextPercentBase(undefined, parentTextStyle);
+        textStyle.fontSize = parseFloat(textStyle.fontSize) / 100 * base;
+    }
+    return textStyle;
+}
+export function resolveTextLineHeightPercentStyle(textStyle, parentTextStyle) {
+    if (!textStyle)
+        return textStyle;
+    if (typeof textStyle.lineHeight === 'string' && percentRegExp.test(textStyle.lineHeight)) {
+        const base = getTextPercentBase(textStyle.fontSize, parentTextStyle);
+        textStyle.lineHeight = parseFloat(textStyle.lineHeight) / 100 * base;
+    }
+    return textStyle;
+}
 /**
  * 用法等同于 useEffect，但是会忽略首次执行，只在依赖更新时执行
  */
@@ -1486,8 +1488,9 @@ export function useTextPassThrough(textStyle, textProps, { enableTextPassThrough
     const parent = useContext(TextPassThroughContext);
     // eslint-disable-next-line react-hooks/rules-of-hooks
     const valueRef = useRef(null);
-    const nextTextStyle = textStyle
-        ? extendObject({}, parent?.textStyle, textStyle)
+    const resolvedTextStyle = resolveTextFontSizePercentStyle(textStyle, parent?.textStyle);
+    const nextTextStyle = resolvedTextStyle
+        ? extendObject({}, parent?.textStyle, resolvedTextStyle)
         : parent?.textStyle;
     const nextTextProps = textProps
         ? extendObject({}, parent?.pendingTextProps, textProps)
@@ -1501,26 +1504,6 @@ export function useTextPassThrough(textStyle, textProps, { enableTextPassThrough
     }
     return valueRef.current;
 }
-export function useTextPassThroughText(textStyle) {
-    const inheritedText = useContext(TextPassThroughContext);
-    const valueRef = useRef(null);
-    if (!textStyle) {
-        return {
-            inheritedText,
-            textPassThrough: null
-        };
-    }
-    const nextValue = {
-        textStyle: extendObject({}, inheritedText?.textStyle, textStyle)
-    };
-    if (diffAndCloneA(valueRef.current, nextValue).diff) {
-        valueRef.current = nextValue;
-    }
-    return {
-        inheritedText,
-        textPassThrough: valueRef.current
-    };
-}
 export function useHover({ enableHover, hoverStartTime, hoverStayTime, disabled }) {
     const enableHoverRef = useRef(enableHover);
     if (enableHoverRef.current !== enableHover) {
@@ -1637,7 +1620,10 @@ export function flatGesture(gestures = []) {
             return gesture.nodeRefs
                 .map((item) => item.getNodeInstance()?.instance?.gestureRef || {});
         }
-        return gesture?.current ? [gesture] : [];
+        if (gesture && (gesture.current || gesture.handlerTag !== undefined)) {
+            return [gesture];
+        }
+        return [];
     })) || [];
 }
 export function getCurrentPage(pageId) {

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

@@ -80,7 +80,6 @@ export interface ButtonProps {
   'enable-offset'?: boolean,
   'enable-var'?: boolean
   'enable-text-pass-through'?: boolean
-  'parent-font-size'?: number
   'parent-width'?: number
   'parent-height'?: number
   style?: ViewStyle & TextStyle & Record<string, any>
@@ -212,7 +211,6 @@ const Button = forwardRef<HandlerRef<View, ButtonProps>, ButtonProps>((buttonPro
     'form-type': formType,
     'enable-var': enableVar,
     'enable-text-pass-through': enableTextPassThrough,
-    'parent-font-size': parentFontSize,
     'parent-width': parentWidth,
     'parent-height': parentHeight,
     style = {},
@@ -301,7 +299,7 @@ const Button = forwardRef<HandlerRef<View, ButtonProps>, ButtonProps>((buttonPro
     varContextRef,
     setWidth,
     setHeight
-  } = useTransformStyle(styleObj, { enableVar, parentFontSize, parentWidth, parentHeight, defaultStyle })
+  } = useTransformStyle(styleObj, { enableVar, parentWidth, parentHeight, defaultStyle })
 
   const nodeRef = useRef(null)
 

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

@@ -24,7 +24,6 @@ interface CameraProps {
   binderror?: (error: { message: string }) => void
   bindinitdone?: (result: { type: string, data: string }) => void
   bindscancode?: (result: { type: string, data: string }) => void
-  'parent-font-size'?: number
   'parent-width'?: number
   'parent-height'?: number
   'enable-var'?: boolean
@@ -58,12 +57,29 @@ interface CameraRef {
   stopRecord: (options?: StopRecordOptions) => void
 }
 
+interface CameraPermissionCache {
+  promise?: Promise<any>
+  result?: boolean
+}
+
 type HandlerRef<T, P> = {
   current: T | null
 }
 
 let RecordRes: any = null
 
+const cameraPermissionCacheMap = new Map<number, CameraPermissionCache>()
+
+function getCameraPermissionCache (pageId: number | undefined) {
+  if (pageId == null) return
+  let cache = cameraPermissionCacheMap.get(pageId)
+  if (!cache) {
+    cache = {}
+    cameraPermissionCacheMap.set(pageId, cache)
+  }
+  return cache
+}
+
 const _camera = forwardRef<HandlerRef<any, CameraProps>, CameraProps>((props: CameraProps, ref): JSX.Element | null => {
   // eslint-disable-next-line @typescript-eslint/no-var-requires
   const cameraRef = useRef<any>(null)
@@ -76,7 +92,6 @@ const _camera = forwardRef<HandlerRef<any, CameraProps>, CameraProps>((props: Ca
     bindinitdone,
     bindstop,
     bindscancode,
-    'parent-font-size': parentFontSize,
     'parent-width': parentWidth,
     'parent-height': parentHeight,
     'enable-var': enableVar,
@@ -93,7 +108,6 @@ const _camera = forwardRef<HandlerRef<any, CameraProps>, CameraProps>((props: Ca
     setHeight
   } = useTransformStyle(styleObj, {
     enableVar,
-    parentFontSize,
     parentWidth,
     parentHeight
   })
@@ -283,12 +297,33 @@ const _camera = forwardRef<HandlerRef<any, CameraProps>, CameraProps>((props: Ca
       try {
         const cameraPermission = global?.__mpx?.config?.rnConfig?.cameraPermission
         if (typeof cameraPermission === 'function') {
-          const permissionResult = await cameraPermission()
-          setHasPermission(permissionResult === true)
+          const permissionCache = getCameraPermissionCache(pageId)
+          if (permissionCache && hasOwn(permissionCache, 'result')) {
+            setHasPermission(permissionCache.result === true)
+            return
+          }
+          let permissionResult
+          if (permissionCache) {
+            if (!permissionCache.promise) {
+              permissionCache.promise = cameraPermission()
+            }
+            permissionResult = await permissionCache.promise
+          } else {
+            permissionResult = await cameraPermission()
+          }
+          const granted = permissionResult === true
+          if (permissionCache) {
+            permissionCache.result = granted
+          }
+          setHasPermission(granted)
         } else {
           setHasPermission(true)
         }
       } catch (error) {
+        const permissionCache = getCameraPermissionCache(pageId)
+        if (permissionCache) {
+          permissionCache.result = false
+        }
         setHasPermission(false)
       }
     }

package/lib/runtime/components/react/mpx-canvas/index.tsx

@@ -33,6 +33,8 @@ import { createImageData as canvasCreateImageData } from './ImageData'
 import { useConstructorsRegistry } from './constructorsRegistry'
 import Portal from '../mpx-portal'
 
+type WebViewInstance = WebView<any>
+
 const stylesheet = StyleSheet.create({
   container: { overflow: 'hidden', flex: 0 },
   webview: {
@@ -52,7 +54,6 @@ interface CanvasProps {
   style?: Record<string, any>
   originWhitelist?: Array<string>
   'enable-var'?: boolean
-  'parent-font-size'?: number
   'parent-width'?: number
   'parent-height'?: number
   bindtouchstart?: (event: NativeSyntheticEvent<TouchEvent>) => void
@@ -64,7 +65,7 @@ interface CanvasProps {
 }
 
 const _Canvas = forwardRef<HandlerRef<CanvasProps & View, CanvasProps>, CanvasProps>((props: CanvasProps = {}, ref): JSX.Element => {
-  const { style = {}, originWhitelist = ['*'], 'enable-var': enableVar, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight } = props
+  const { style = {}, originWhitelist = ['*'], 'enable-var': enableVar, 'parent-width': parentWidth, 'parent-height': parentHeight } = props
   const [isLoaded, setIsLoaded] = useState(false)
   const nodeRef = useRef(null)
 
@@ -76,7 +77,6 @@ const _Canvas = forwardRef<HandlerRef<CanvasProps & View, CanvasProps>, CanvasPr
     setHeight
   } = useTransformStyle(extendObject({}, style, stylesheet.container), {
     enableVar,
-    parentFontSize,
     parentWidth,
     parentHeight
   })
@@ -266,7 +266,7 @@ const _Canvas = forwardRef<HandlerRef<CanvasProps & View, CanvasProps>, CanvasPr
     canvasComponent = createElement(View, innerProps, createElement(
       WebView,
       {
-        ref: (element) => {
+        ref: (element: WebViewInstance | null) => {
           if (canvasRef.current) {
             canvasRef.current.webview = element
           }
@@ -291,7 +291,7 @@ const _Canvas = forwardRef<HandlerRef<CanvasProps & View, CanvasProps>, CanvasPr
   }
 
   canvasComponent = createElement(View, innerProps, createElement(WebView, {
-    ref: (element) => {
+    ref: (element: WebViewInstance | null) => {
       if (canvasRef.current) {
         canvasRef.current.webview = element
       }

package/lib/runtime/components/react/mpx-checkbox-group.tsx

@@ -28,7 +28,6 @@ export interface CheckboxGroupProps {
   style?: ViewStyle & Record<string, any>
   'enable-offset'?: boolean
   'enable-var'?: boolean
-  'parent-font-size'?: number
   'parent-width'?: number
   'parent-height'?: number
   children: ReactNode
@@ -44,7 +43,6 @@ const CheckboxGroup = forwardRef<
   const {
     style = {},
     'enable-var': enableVar,
-    'parent-font-size': parentFontSize,
     'parent-width': parentWidth,
     'parent-height': parentHeight
   } = props
@@ -72,7 +70,7 @@ const CheckboxGroup = forwardRef<
     varContextRef,
     setWidth,
     setHeight
-  } = useTransformStyle(style, { enableVar, parentFontSize, parentWidth, parentHeight, defaultStyle })
+  } = useTransformStyle(style, { enableVar, parentWidth, parentHeight, defaultStyle })
 
   const nodeRef = useRef(null)
 

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

@@ -43,7 +43,6 @@ export interface CheckboxProps extends Selection {
   'enable-offset'?: boolean
   'enable-var'?: boolean
   'enable-text-pass-through'?: boolean
-  'parent-font-size'?: number
   'parent-width'?: number
   'parent-height'?: number
   children?: ReactNode
@@ -90,7 +89,6 @@ const Checkbox = forwardRef<HandlerRef<View, CheckboxProps>, CheckboxProps>(
       style = {},
       'enable-var': enableVar,
       'enable-text-pass-through': enableTextPassThrough,
-      'parent-font-size': parentFontSize,
       'parent-width': parentWidth,
       'parent-height': parentHeight,
       bindtap,
@@ -134,7 +132,7 @@ const Checkbox = forwardRef<HandlerRef<View, CheckboxProps>, CheckboxProps>(
       varContextRef,
       setWidth,
       setHeight
-    } = useTransformStyle(style, { enableVar, parentFontSize, parentWidth, parentHeight, defaultStyle: styles.container })
+    } = useTransformStyle(style, { enableVar, parentWidth, parentHeight, defaultStyle: styles.container })
 
     const nodeRef = useRef(null)
 

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

@@ -16,7 +16,6 @@ interface FormProps {
   'enable-offset'?: boolean
   'enable-var'?: boolean
   'enable-text-pass-through'?: boolean
-  'parent-font-size'?: number
   'parent-width'?: number
   'parent-height'?: number
   bindsubmit?: (evt: {
@@ -33,7 +32,6 @@ const _Form = forwardRef<HandlerRef<View, FormProps>, FormProps>((fromProps: For
     style,
     'enable-var': enableVar,
     'enable-text-pass-through': enableTextPassThrough,
-    'parent-font-size': parentFontSize,
     'parent-width': parentWidth,
     'parent-height': parentHeight
   } = props
@@ -45,7 +43,7 @@ const _Form = forwardRef<HandlerRef<View, FormProps>, FormProps>((fromProps: For
     varContextRef,
     setWidth,
     setHeight
-  } = useTransformStyle(style, { enableVar, parentFontSize, parentWidth, parentHeight })
+  } = useTransformStyle(style, { enableVar, parentWidth, parentHeight })
 
   const { textStyle, innerStyle = {} } = splitStyle(normalStyle)
   const textPassThrough = useTextPassThrough(textStyle, textProps, { enableTextPassThrough })

package/lib/runtime/components/react/mpx-icon/index.tsx

@@ -37,7 +37,6 @@ export interface IconProps {
   style?: TextStyle & Record<string, any>
   'enable-offset'?: boolean
   'enable-var'?: boolean
-  'parent-font-size'?: number
   'parent-width'?: number
   'parent-height'?: number
 }
@@ -62,7 +61,6 @@ const Icon = forwardRef<HandlerRef<Text, IconProps>, IconProps>(
       color,
       style = {},
       'enable-var': enableVar,
-      'parent-font-size': parentFontSize,
       'parent-width': parentWidth,
       'parent-height': parentHeight
     } = props
@@ -79,7 +77,7 @@ const Icon = forwardRef<HandlerRef<Text, IconProps>, IconProps>(
       normalStyle,
       setWidth,
       setHeight
-    } = useTransformStyle(styleObj, { enableVar, parentFontSize, parentWidth, parentHeight })
+    } = useTransformStyle(styleObj, { enableVar, parentWidth, parentHeight })
 
     const nodeRef = useRef(null)
     useNodesRef(props, ref, nodeRef, { style: normalStyle })

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

@@ -52,7 +52,6 @@ export interface ImageProps {
   style?: ImageStyle & Record<string, any>
   'enable-offset'?: boolean
   'enable-var'?: boolean
-  'parent-font-size'?: number
   'parent-width'?: number
   'parent-height'?: number
   'enable-fast-image'?: boolean
@@ -176,9 +175,7 @@ const Image = forwardRef<HandlerRef<RNImage, ImageProps>, ImageProps>((props, re
     src = '',
     mode = 'scaleToFill',
     style = {},
-    'enable-var': enableVar,
-    'parent-font-size': parentFontSize,
-    'enable-fast-image': enableFastImage,
+    'enable-var': enableVar, 'enable-fast-image': enableFastImage,
     'parent-width': parentWidth,
     'parent-height': parentHeight,
     'is-svg': isSvgProp,
@@ -223,7 +220,7 @@ const Image = forwardRef<HandlerRef<RNImage, ImageProps>, ImageProps>((props, re
     normalStyle,
     setWidth,
     setHeight
-  } = useTransformStyle(styleObj, { enableVar, transformRadiusPercent: isAndroid && !isSvg && !isLayoutMode, parentFontSize, parentWidth, parentHeight, defaultStyle: DEFAULT_IMAGE_STYLE })
+  } = useTransformStyle(styleObj, { enableVar, transformRadiusPercent: isAndroid && !isSvg && !isLayoutMode, parentWidth, parentHeight, defaultStyle: DEFAULT_IMAGE_STYLE })
 
   // normalStyle 已合入 DEFAULT_IMAGE_STYLE，对外暴露完整 style（含 default 兜底的 width/height）
   useNodesRef(props, ref, nodeRef, {

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

@@ -1,20 +1,29 @@
 import { Text, TextProps } from 'react-native'
 import { JSX, createElement, useContext } from 'react'
 
-import { extendObject, getDefaultAllowFontScaling } from './utils'
+import { extendObject, getDefaultAllowFontScaling, resolveTextLineHeightPercentStyle } from './utils'
 import { TextPassThroughContext } from './context'
 
 const InlineText = (props: TextProps): JSX.Element => {
   const inheritedText = useContext(TextPassThroughContext)
-  const style = extendObject({}, inheritedText?.textStyle, props.style)
-  const mergedProps = extendObject({}, inheritedText?.pendingTextProps, props, { style })
+  const mergedStyle = inheritedText?.textStyle
+    ? extendObject({}, inheritedText.textStyle)
+    : undefined
+  // inline-text 只包裹裸文本，消费继承文本样式中的相对 lineHeight，不处理本地样式。
+  if (inheritedText?.textStyle) {
+    resolveTextLineHeightPercentStyle(mergedStyle, inheritedText.textStyle)
+  }
+  const mergedProps = inheritedText?.pendingTextProps
+    ? extendObject({}, inheritedText.pendingTextProps, props)
+    : props
   const {
     allowFontScaling,
     children
   } = mergedProps
 
   return createElement(Text, extendObject({}, mergedProps, {
-    allowFontScaling: allowFontScaling ?? getDefaultAllowFontScaling()
+    allowFontScaling: allowFontScaling ?? getDefaultAllowFontScaling(),
+    style: mergedStyle
   }), children)
 }