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

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
@@ -53,31 +55,28 @@ interface _TextProps extends TextProps {
 }
 
 const _Text = forwardRef<HandlerRef<Text, _TextProps>, _TextProps>((props, ref): JSX.Element => {
-  let stopTotal: (() => void) | undefined
-  if (__mpx_perf_framework__) stopTotal = perf.scope('text:render:total')
+  let idTotal = -1
+  if (__mpx_perf_framework__) idTotal = perf.scopeStart('text:render:total')
 
   // ───── props 阶段 ─────
-  let stopProps: (() => void) | undefined
-  if (__mpx_perf_framework__) stopProps = perf.scope('text:render:props')
-  const inheritedText = useContext(TextPassThroughContext)
-  const mergedProps = extendObject({}, inheritedText?.pendingTextProps, props)
+  let idProps = -1
+  if (__mpx_perf_framework__) idProps = perf.scopeStart('text:render: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
-  if (__mpx_perf_framework__) stopProps!()
+  } = props
+  if (__mpx_perf_framework__) perf.scopeEnd(idProps)
 
   // ───── style 阶段 ─────
-  let stopStyle: (() => void) | undefined
-  if (__mpx_perf_framework__) stopStyle = perf.scope('text:render:style')
+  let idStyle = -1
+  if (__mpx_perf_framework__) idStyle = perf.scopeStart('text:render:style')
   const {
     normalStyle,
     hasVarDec,
@@ -85,38 +84,38 @@ 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__) stopStyle!()
+  if (__mpx_perf_framework__) perf.scopeEnd(idStyle)
 
   // ───── innerProps 阶段 ─────
-  let stopInnerProps: (() => void) | undefined
-  if (__mpx_perf_framework__) stopInnerProps = perf.scope('text:render:innerProps')
+  let idInnerProps = -1
+  if (__mpx_perf_framework__) idInnerProps = perf.scopeStart('text:render:innerProps')
   const innerProps = useInnerProps(
     extendObject(
       {},
@@ -133,15 +132,13 @@ const _Text = forwardRef<HandlerRef<Text, _TextProps>, _TextProps>((props, ref):
       'decode'
     ]
   )
-  if (__mpx_perf_framework__) stopInnerProps!()
+  if (__mpx_perf_framework__) perf.scopeEnd(idInnerProps)
 
   // ───── createElement 阶段 ─────
-  let stopCreate: (() => void) | undefined
-  if (__mpx_perf_framework__) stopCreate = perf.scope('text:render:createElement')
+  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,
@@ -152,9 +149,9 @@ const _Text = forwardRef<HandlerRef<Text, _TextProps>, _TextProps>((props, ref):
   if (hasPositionFixed) {
     finalComponent = createElement(Portal, null, finalComponent)
   }
-  if (__mpx_perf_framework__) stopCreate!()
+  if (__mpx_perf_framework__) perf.scopeEnd(idCreate)
 
-  if (__mpx_perf_framework__) stopTotal!()
+  if (__mpx_perf_framework__) perf.scopeEnd(idTotal)
   return finalComponent
 })
 

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({