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

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

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

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

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

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

@@ -5,13 +5,13 @@
  * ✔ hover-stay-time
  */
 import { View, StyleSheet, Image } from 'react-native';
-import { useRef, useState, useEffect, forwardRef, createElement } from 'react';
+import { useRef, useState, useEffect, useMemo, forwardRef, createElement } from 'react';
 import useInnerProps from './getInnerListeners';
 import Animated from 'react-native-reanimated';
 import useAnimationHooks from './animationHooks/index';
 import useNodesRef from './useNodesRef';
-import { parseUrl, PERCENT_REGEX, splitStyle, splitProps, useTransformStyle, wrapChildren, useLayout, renderImage, pickStyle, extendObject, useHover, useTextPassThroughValue } from './utils';
-import { error, isFunction } from '@mpxjs/utils';
+import { parseUrl, percentRegExp, splitStyle, splitProps, useTransformStyle, wrapChildren, useLayout, renderImage, pickStyle, extendObject, useHover, useTextPassThrough } from './utils';
+import { error, warn, hasOwn } from '@mpxjs/utils';
 import * as perf from '@mpxjs/perf';
 import LinearGradient from 'react-native-linear-gradient';
 import { GestureDetector } from 'react-native-gesture-handler';
@@ -22,6 +22,18 @@ const linearMap = new Map([
     ['left', 270],
     ['right', 90]
 ]);
+const FLEX_DEFAULT_STYLE = {
+    flexDirection: 'row',
+    flexBasis: 'auto',
+    flexShrink: 1,
+    flexWrap: 'nowrap'
+};
+// 用户传入 flex shorthand 时使用的精简版（裁掉 flexBasis/flexShrink）
+// 避免 number 形式 flex:1 被 default flexBasis:'auto' 反向覆盖
+const FLEX_DEFAULT_STYLE_TRIMMED = {
+    flexDirection: 'row',
+    flexWrap: 'nowrap'
+};
 // 对角线角度
 const diagonalAngleMap = {
     'top right': (width, height) => {
@@ -40,22 +52,35 @@ const diagonalAngleMap = {
 function radToAngle(r) {
     return r * 180 / Math.PI;
 }
-const applyHandlers = (handlers, args) => {
-    for (const handler of handlers) {
-        handler(...args);
+// === linear-gradient 解析相关正则（模块级，一次创建） ===
+// CSS <angle> 支持 deg/turn/rad/grad 四种单位，统一归一为 deg
+// https://www.w3.org/TR/css-values-3/#angles
+const angleRegExp = /^\s*(-?\d+(?:\.\d+)?)(deg|turn|rad|grad)\b/;
+const gradientToRegExp = /^to\b\s*/;
+// 入口形态：仅在含 linear-gradient 时走解析；提取括号内内容
+const linearGradientRegExp = /linear-gradient\((.*)\)/;
+// 顶层逗号切分（忽略 () / # 内部的逗号）
+const topLevelCommaRegExp = /,(?![^(#]*\))/;
+// 色标内空白切分（忽略色函数里的逗号边界）
+const stopWhitespaceRegExp = /(?<!,)\s+/;
+// 色标位置仅支持 `<n>%` 或裸 `0`（CSS 允许 0 作为唯一无单位 length）
+// 其它单位（px/rpx/em/vw/...）当前无法在不依赖 layout 的情况下归一为百分比，统一拒绝
+const validStopPosRegExp = /^-?\d+(?:\.\d+)?%$|^0$/;
+// color hint 检测：色标 token 仅含一个分量且以数字/正负号/小数点开头
+const colorHintLeadingRegExp = /^[-+.\d]/;
+function normalizeAngle(raw) {
+    const m = raw.match(angleRegExp);
+    if (!m)
+        return undefined;
+    const n = +m[1];
+    switch (m[2]) {
+        case 'turn': return n * 360;
+        case 'rad': return radToAngle(n);
+        case 'grad': return n * 0.9;
+        default: return n; // deg
     }
-};
-const normalizeStyle = (style = {}) => {
-    ['backgroundSize', 'backgroundPosition'].forEach(name => {
-        if (style[name] && typeof style[name] === 'string') {
-            if (style[name].trim()) {
-                style[name] = style[name].split(' ');
-            }
-        }
-    });
-    return style;
-};
-const isPercent = (val) => typeof val === 'string' && PERCENT_REGEX.test(val);
+}
+const isPercent = (val) => typeof val === 'string' && percentRegExp.test(val);
 const isBackgroundSizeKeyword = (val) => typeof val === 'string' && /^cover|contain$/.test(val);
 const isNeedLayout = (preImageInfo) => {
     const { sizeList, backgroundPosition, linearInfo, type } = preImageInfo;
@@ -167,13 +192,13 @@ function backgroundSize(imageProps, preImageInfo, imageSize, layoutInfo) {
     // 枚举值
     if (typeof width === 'string' && ['cover', 'contain'].includes(width)) {
         if (layoutInfo && imageSize) {
-            const layoutRatio = layoutWidth / imageSizeWidth;
-            const eleRatio = imageSizeWidth / imageSizeHeight;
-            // 容器宽高比 大于 图片的宽高比，依据宽度作为基准，否则以高度为基准
-            if ((layoutRatio <= eleRatio && width === 'contain') || (layoutRatio >= eleRatio && width === 'cover')) {
+            const containerRatio = layoutWidth / layoutHeight;
+            const imageRatio = imageSizeWidth / imageSizeHeight;
+            // 容器宽高比 小于等于 图片宽高比：contain 按宽缩放，cover 按高缩放
+            if ((containerRatio <= imageRatio && width === 'contain') || (containerRatio >= imageRatio && width === 'cover')) {
                 dimensions = calculateSize(layoutWidth, imageSizeHeight / imageSizeWidth, true);
             }
-            else if ((layoutRatio > eleRatio && width === 'contain') || (layoutRatio < eleRatio && width === 'cover')) {
+            else if ((containerRatio > imageRatio && width === 'contain') || (containerRatio < imageRatio && width === 'cover')) {
                 dimensions = calculateSize(layoutHeight, imageSizeWidth / imageSizeHeight);
             }
         }
@@ -238,7 +263,17 @@ function linearGradient(imageProps, preImageInfo, imageSize, layoutInfo) {
     if (type !== 'linear')
         return;
     // 角度计算
-    let angle = +(linearMap.get(direction) || direction.match(/(-?\d+(\.\d+)?)deg/)?.[1] || 180) % 360;
+    // 注意：不要用 `linearMap.get(direction) || ...`，因为 'top' 映射为 0 是 falsy 值，
+    // 会被误判为未命中并落到默认 180deg
+    let angle;
+    if (linearMap.has(direction)) {
+        angle = linearMap.get(direction);
+    }
+    else {
+        const normalized = normalizeAngle(direction);
+        angle = normalized !== undefined ? normalized : 180;
+    }
+    angle = angle % 360;
     // 对角线角度计算
     if (layoutInfo && diagonalAngleMap[direction] && imageSize && linearInfo) {
         angle = radToAngle(diagonalAngleMap[direction](width, height)) || 180;
@@ -249,16 +284,29 @@ function linearGradient(imageProps, preImageInfo, imageSize, layoutInfo) {
     imageProps.angle = angle;
 }
 const imageStyleToProps = (preImageInfo, imageSize, layoutInfo) => {
-    // 初始化
+    const { type } = preImageInfo;
     const imageProps = {
-        resizeMode: 'cover',
         style: {
             position: 'absolute'
             // ...StyleSheet.absoluteFillObject
-        },
-        colors: []
+        }
     };
-    applyHandlers([backgroundSize, backgroundImage, backgroundPosition, linearGradient], [imageProps, preImageInfo, imageSize, layoutInfo]);
+    if (type === 'image') {
+        imageProps.resizeMode = 'cover';
+    }
+    else {
+        imageProps.colors = [];
+    }
+    backgroundSize(imageProps, preImageInfo, imageSize, layoutInfo);
+    if (preImageInfo.backgroundPosition.length) {
+        backgroundPosition(imageProps, preImageInfo, imageSize, layoutInfo);
+    }
+    if (type === 'image') {
+        backgroundImage(imageProps, preImageInfo);
+    }
+    else {
+        linearGradient(imageProps, preImageInfo, imageSize, layoutInfo);
+    }
     return imageProps;
 };
 function isHorizontal(val) {
@@ -364,24 +412,61 @@ function calcSteps(startVal, endVal, len) {
     }
     return newArr;
 }
+// 返回值约定：
+//   - LinearInfo  解析成功
+//   - null        已识别为 linear-gradient 但内部已通过 error/warn 报错，外部不要再报
+//   - undefined   不是 linear-gradient 形态，外部按"不支持的 background-image"处理
 function parseLinearGradient(text) {
-    let linearText = text.trim().match(/linear-gradient\((.*)\)/)?.[1];
+    let linearText = text.trim().match(linearGradientRegExp)?.[1];
     if (!linearText)
         return;
-    // 添加默认的角度
-    if (!/^to|^-?\d+deg/.test(linearText)) {
-        linearText = '180deg ,' + linearText;
-    }
-    else {
-        linearText = linearText.replace('to', '');
+    // 多重渐变 / 多重背景：linearGradientRegExp 用了贪婪 `.*`，多渐变时括号内
+    // 会贪到下一段 `linear-gradient(`，单段则一定不含；用 includes 一次判断即可
+    if (linearText.includes('linear-gradient(')) {
+        error(`[mpx-view] background-image 暂不支持多重渐变 (multi gradients)，已丢弃，原值: ${text}`);
+        return null;
     }
     // 把 0deg, red 10%, blue 20% 解析为 ['0deg', 'red, 10%', 'blue, 20%']
-    const [direction, ...colorList] = linearText.split(/,(?![^(#]*\))/);
+    if (gradientToRegExp.test(linearText)) {
+        linearText = linearText.replace(gradientToRegExp, '');
+    }
+    else if (!angleRegExp.test(linearText)) {
+        linearText = '180deg ,' + linearText;
+    }
+    const [direction, ...colorList] = linearText.split(topLevelCommaRegExp);
     // 记录需要填充起点的起始位置
     let startIdx = 0;
     let startVal = 0;
     // 把 ['red, 10%', 'blue, 20%']解析为 [[red, 10%], [blue, 20%]]
-    const linearInfo = colorList.map(item => item.trim().split(/(?<!,)\s+/))
+    // 双位置语法展开：['red', '0%', '50%'] → [['red', '0%'], ['red', '50%']]
+    // 等价于 CSS Images Level 4 中 `red 0% 50%` ≡ `red 0%, red 50%`
+    // 同步对不支持的写法做拦截：color hint（仅一个位置 token）、非百分比位置（px/rpx 等）
+    const linearInfo = colorList
+        .map(item => item.trim().split(stopWhitespaceRegExp))
+        .reduce((acc, parts) => {
+        // color hint: 例如 `linear-gradient(red, 30%, blue)` 中的 `30%`
+        // 该 token 仅含一个位置值、无颜色；当前实现无法做颜色采样，直接丢弃
+        if (parts.length === 1 && colorHintLeadingRegExp.test(parts[0])) {
+            warn(`[mpx-view] linear-gradient 暂不支持 color hint 写法 [${parts[0]}]，已丢弃该色标`);
+            return acc;
+        }
+        const [color, ...positions] = parts;
+        if (positions.length === 0) {
+            acc.push([color]);
+        }
+        else {
+            for (const pos of positions) {
+                if (!validStopPosRegExp.test(pos)) {
+                    warn(`[mpx-view] linear-gradient 色标位置仅支持百分比 [${color} ${pos}] 已丢弃位置，仅保留颜色`);
+                    acc.push([color]);
+                }
+                else {
+                    acc.push([color, pos]);
+                }
+            }
+        }
+        return acc;
+    }, [])
         .reduce((prev, cur, idx, self) => {
         const { colors, locations } = prev;
         const [color, val] = cur;
@@ -406,6 +491,11 @@ function parseLinearGradient(text) {
         !isNaN(numberVal) && locations.push(numberVal);
         return prev;
     }, { colors: [], locations: [] });
+    // 色标全部被丢弃或不足以构成渐变（至少 2 个颜色），降级返回
+    if (linearInfo.colors.length < 2) {
+        error(`[mpx-view] linear-gradient 至少需要 2 个有效色标，已丢弃，原值: ${text}`);
+        return null;
+    }
     return extendObject({}, linearInfo, {
         direction: direction.trim()
     });
@@ -417,13 +507,19 @@ function parseBgImage(text) {
     if (src)
         return { src, type: 'image' };
     const linearInfo = parseLinearGradient(text);
-    if (!linearInfo)
+    if (!linearInfo) {
+        // null 表示 parseLinearGradient 内部已报错，外部不要重复；undefined 才属于未识别形态
+        if (linearInfo === undefined) {
+            error(`[mpx-view] background-image 暂不支持 ${text}，已丢弃，仅支持 url(...) / linear-gradient(...)。`);
+        }
         return {};
+    }
     return {
         linearInfo,
         type: 'linear'
     };
 }
+export const __parseBgImageForTest = (text) => parseBgImage(text);
 function normalizeBackgroundSize(backgroundSize, type) {
     const sizeList = backgroundSize.slice();
     if (sizeList.length === 1)
@@ -439,17 +535,6 @@ function normalizeBackgroundSize(backgroundSize, type) {
         return global.__formatValue(val);
     });
 }
-function preParseImage(imageStyle) {
-    const { backgroundImage = '', backgroundSize = ['auto'], backgroundPosition = [0, 0] } = normalizeStyle(imageStyle) || {};
-    const { type, src, linearInfo } = parseBgImage(backgroundImage);
-    return {
-        src,
-        linearInfo,
-        type,
-        sizeList: normalizeBackgroundSize(backgroundSize, type),
-        backgroundPosition: normalizeBackgroundPosition(backgroundPosition)
-    };
-}
 function isDiagonalAngle(linearInfo) {
     return !!(linearInfo?.direction && diagonalAngleMap[linearInfo.direction]);
 }
@@ -470,19 +555,39 @@ function inheritStyle(innerStyle = {}) {
         : undefined);
 }
 function useWrapImage(imageStyle, innerStyle, enableFastImage) {
-    // 预处理数据
-    const preImageInfo = preParseImage(imageStyle);
-    // 预解析
-    const { src, sizeList, type } = preImageInfo;
+    const backgroundImage = imageStyle?.backgroundImage;
+    const backgroundSize = imageStyle?.backgroundSize;
+    const backgroundPosition = imageStyle?.backgroundPosition;
+    const parsedImageInfo = useMemo(() => parseBgImage(backgroundImage), [backgroundImage]);
+    const { src, type } = parsedImageInfo;
+    const backgroundSizeKey = Array.isArray(backgroundSize) ? backgroundSize.join('|') : backgroundSize;
+    const sizeList = useMemo(() => normalizeBackgroundSize(backgroundSize ?? ['auto'], type), [backgroundSizeKey, type]);
+    const backgroundPositionKey = Array.isArray(backgroundPosition) ? backgroundPosition.join('|') : backgroundPosition;
+    const bgPosition = useMemo(() => normalizeBackgroundPosition(backgroundPosition ?? [0, 0]), [backgroundPositionKey]);
+    const preImageInfo = useMemo(() => extendObject({}, parsedImageInfo, { sizeList, backgroundPosition: bgPosition }), [parsedImageInfo, sizeList, bgPosition]);
     // 判断是否可挂载onLayout
     const { needLayout, needImageSize } = checkNeedLayout(preImageInfo);
     const [show, setShow] = useState(((type === 'image' && !!src) || type === 'linear') && !needLayout && !needImageSize);
-    const [, setImageSizeWidth] = useState(null);
-    const [, setImageSizeHeight] = useState(null);
-    const [, setLayoutInfoWidth] = useState(null);
-    const [, setLayoutInfoHeight] = useState(null);
+    const [version, setVersion] = useState(0);
     const sizeInfo = useRef(null);
     const layoutInfo = useRef(null);
+    const sizeCacheRef = useRef(new Map());
+    // sizeInfo / layoutInfo / setVersion 都是稳定引用，闭包整个生命周期只分配一次
+    const { bumpVersion, setImageSize, setLayoutInfo } = useMemo(() => ({
+        bumpVersion: () => setVersion(version => version + 1),
+        setImageSize: (width, height) => {
+            if (sizeInfo.current?.width === width && sizeInfo.current?.height === height)
+                return false;
+            sizeInfo.current = { width, height };
+            return true;
+        },
+        setLayoutInfo: (width, height) => {
+            if (layoutInfo.current?.width === width && layoutInfo.current?.height === height)
+                return false;
+            layoutInfo.current = { width, height };
+            return true;
+        }
+    }), []);
     useEffect(() => {
         sizeInfo.current = null;
         if (type === 'linear') {
@@ -500,67 +605,67 @@ function useWrapImage(imageStyle, innerStyle, enableFastImage) {
             return;
         }
         if (needImageSize) {
+            const cached = sizeCacheRef.current.get(src);
+            if (cached) {
+                const imageSizeChanged = setImageSize(cached.width, cached.height);
+                if (!needLayout || layoutInfo.current) {
+                    imageSizeChanged && bumpVersion();
+                    setShow(true);
+                }
+                return;
+            }
+            let cancelled = false;
             Image.getSize(src, (width, height) => {
-                sizeInfo.current = {
-                    width,
-                    height
-                };
+                // cache 仍然填上，避免下次同 src 再发一次请求
+                sizeCacheRef.current.set(src, { width, height });
+                if (cancelled)
+                    return;
+                const imageSizeChanged = setImageSize(width, height);
                 // 1. 当需要绑定onLayout 2. 获取到布局信息
                 if (!needLayout || layoutInfo.current) {
-                    setImageSizeWidth(width);
-                    setImageSizeHeight(height);
-                    if (layoutInfo.current) {
-                        setLayoutInfoWidth(layoutInfo.current.width);
-                        setLayoutInfoHeight(layoutInfo.current.height);
-                    }
+                    imageSizeChanged && bumpVersion();
                     setShow(true);
                 }
             });
+            return () => { cancelled = true; };
         }
         // type 添加type 处理无渐变 有渐变的场景
-    }, [src, type]);
+    }, [src, type, needLayout, needImageSize]);
+    const imageProps = useMemo(() => imageStyleToProps(preImageInfo, sizeInfo.current, layoutInfo.current), [preImageInfo, version]);
     if (!type)
         return null;
     const onLayout = (res) => {
         const { width, height } = res?.nativeEvent?.layout || {};
-        layoutInfo.current = {
-            width,
-            height
-        };
+        // layoutInfo 总是更新，Image.getSize 回调要靠 layoutInfo.current 决定是否 setShow
+        let changed = setLayoutInfo(width, height);
         if (!needImageSize) {
-            setLayoutInfoWidth(width);
-            setLayoutInfoHeight(height);
             // 有渐变角度的时候，才触发渲染组件
             if (type === 'linear') {
-                sizeInfo.current = {
-                    width: calcPercent(sizeList[0], width),
-                    height: calcPercent(sizeList[1], height)
-                };
-                setImageSizeWidth(sizeInfo.current.width);
-                setImageSizeHeight(sizeInfo.current.height);
+                changed = setImageSize(calcPercent(sizeList[0], width), calcPercent(sizeList[1], height)) || changed;
             }
+            changed && bumpVersion();
             setShow(true);
         }
         else if (sizeInfo.current) {
-            setLayoutInfoWidth(width);
-            setLayoutInfoHeight(height);
-            setImageSizeWidth(sizeInfo.current.width);
-            setImageSizeHeight(sizeInfo.current.height);
+            changed && bumpVersion();
             setShow(true);
         }
+        // needImageSize && !sizeInfo.current：等 Image.getSize 回调里 setShow(true)，此处不触发渲染
     };
     const backgroundProps = extendObject({ key: 'backgroundImage' }, needLayout ? { onLayout } : {}, { style: extendObject({}, inheritStyle(innerStyle), StyleSheet.absoluteFillObject, { overflow: 'hidden' }) });
-    return createElement(View, backgroundProps, show && type === 'linear' && createElement(LinearGradient, extendObject({ useAngle: true }, imageStyleToProps(preImageInfo, sizeInfo.current, layoutInfo.current))), show && type === 'image' && renderImage(imageStyleToProps(preImageInfo, sizeInfo.current, layoutInfo.current), enableFastImage));
+    return createElement(View, backgroundProps, show && type === 'linear' && createElement(LinearGradient, extendObject({ useAngle: true }, imageProps)), show && type === 'image' && renderImage(imageProps, enableFastImage));
 }
 function wrapWithChildren(props, { hasVarDec, enableBackground, backgroundStyle, varContext, textPassThrough, innerStyle, enableFastImage }) {
-    const children = wrapChildren(props, {
+    const children = wrapChildren(props.children, {
         hasVarDec,
         varContext,
         textPassThrough
     });
+    if (!enableBackground)
+        return children;
     return [
         // eslint-disable-next-line react-hooks/rules-of-hooks
-        enableBackground ? useWrapImage(backgroundStyle, innerStyle, enableFastImage) : null,
+        useWrapImage(backgroundStyle, innerStyle, enableFastImage),
         children
     ];
 }
@@ -574,19 +679,12 @@ const _View = forwardRef((viewProps, ref) => {
     if (__mpx_perf_framework__)
         idProps = perf.scopeStart('view:render:props');
     const { textProps, innerProps: props = {} } = splitProps(viewProps);
-    let { style = {}, 'hover-style': hoverStyle, 'hover-start-time': hoverStartTime = 50, 'hover-stay-time': hoverStayTime = 400, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'enable-background': enableBackground, 'enable-fast-image': enableFastImage, 'enable-animation': enableAnimation, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, animation, catchtransitionend, bindtransitionend } = props;
-    // 默认样式
-    const defaultStyle = style.display === 'flex'
-        ? {
-            flexDirection: 'row',
-            flexBasis: 'auto',
-            flexShrink: 1,
-            flexWrap: 'nowrap'
-        }
-        : {};
+    let { style = {}, 'hover-style': hoverStyle, 'hover-start-time': hoverStartTime = 50, 'hover-stay-time': hoverStayTime = 400, 'enable-var': enableVar, 'enable-background': enableBackground, 'enable-text-pass-through': enableTextPassThrough, 'enable-fast-image': enableFastImage, 'enable-animation': enableAnimation, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, animation, catchtransitionend, bindtransitionend } = props;
     const enableHover = !!hoverStyle;
     const { isHover, gesture } = useHover({ enableHover, hoverStartTime, hoverStayTime });
-    const styleObj = extendObject({}, defaultStyle, style, isHover ? hoverStyle : {});
+    const styleObj = isHover
+        ? extendObject({}, style, hoverStyle)
+        : style;
     if (__mpx_perf_framework__)
         perf.scopeEnd(idProps);
     // ───── style 阶段 ─────
@@ -595,13 +693,17 @@ const _View = forwardRef((viewProps, ref) => {
         idStyle = perf.scopeStart('view:render:style');
     const { normalStyle, hasSelfPercent, hasPositionFixed, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(styleObj, {
         enableVar,
-        externalVarContext,
         parentFontSize,
         parentWidth,
-        parentHeight
+        parentHeight,
+        // 基于合并后的 styleObj 判断（hover 状态切换 display 也能触发）
+        // 用户传 flex shorthand 时使用精简 default，避免 flexBasis/flexShrink 反向覆盖
+        defaultStyle: styleObj.display === 'flex'
+            ? (hasOwn(styleObj, 'flex') ? FLEX_DEFAULT_STYLE_TRIMMED : FLEX_DEFAULT_STYLE)
+            : undefined
     });
     const { textStyle, backgroundStyle, innerStyle = {} } = splitStyle(normalStyle);
-    const textPassThrough = useTextPassThroughValue(textStyle, textProps);
+    const textPassThrough = useTextPassThrough(textStyle, textProps, { enableTextPassThrough });
     enableBackground = enableBackground || !!backgroundStyle;
     const enableBackgroundRef = useRef(enableBackground);
     if (enableBackgroundRef.current !== enableBackground) {
@@ -612,18 +714,16 @@ const _View = forwardRef((viewProps, ref) => {
         style: normalStyle
     });
     const { layoutRef, layoutStyle, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef });
-    const viewStyle = extendObject({}, innerStyle, layoutStyle);
-    const transitionend = isFunction(catchtransitionend)
-        ? catchtransitionend
-        : isFunction(bindtransitionend)
-            ? bindtransitionend
-            : undefined;
+    const viewStyle = layoutStyle
+        ? extendObject({}, innerStyle, layoutStyle)
+        : innerStyle;
     const { enableStyleAnimation, animationStyle } = useAnimationHooks({
         layoutRef,
         animation,
         enableAnimation,
         style: viewStyle,
-        transitionend
+        catchtransitionend,
+        bindtransitionend
     });
     if (__mpx_perf_framework__)
         perf.scopeEnd(idStyle);
@@ -635,15 +735,16 @@ const _View = forwardRef((viewProps, ref) => {
         ref: nodeRef,
         style: enableStyleAnimation ? [viewStyle, animationStyle] : viewStyle
     }), [
-        'animation',
         'hover-start-time',
         'hover-stay-time',
         'hover-style',
         'hover-class',
-        'enable-fast-image',
+        'enable-background',
         'enable-animation',
-        'bindtransitionend',
-        'catchtransitionend'
+        'enable-fast-image',
+        'animation',
+        'catchtransitionend',
+        'bindtransitionend'
     ], {
         layoutRef
     });

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

@@ -18,6 +18,5 @@ interface WebViewProps {
     binderror?: (event: CommonCallbackEvent) => void;
     [x: string]: any;
 }
-type WebViewInstance = WebView<{}>;
-declare const _WebView: import("react").ForwardRefExoticComponent<Omit<WebViewProps, "ref"> & import("react").RefAttributes<HandlerRef<WebViewInstance, WebViewProps>>>;
+declare const _WebView: import("react").ForwardRefExoticComponent<Omit<WebViewProps, "ref"> & import("react").RefAttributes<HandlerRef<WebView<{}>, WebViewProps>>>;
 export default _WebView;

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

@@ -9,6 +9,10 @@ import useNodesRef from './useNodesRef';
 import { getCurrentPage, useNavigation } from './utils';
 import { RouteContext } from './context';
 import { StyleSheet, View, Text } from 'react-native';
+// react-native-webview@13.17+ 将 WebView 泛型默认值由 {} 改为 undefined，
+// 导致 WebViewProps & undefined 塌成 never、JSX 直接使用时 props 全部不可赋值。
+// 显式实参化为 WebView<object>（其 props 即 WebViewProps），保留类实例签名使 ref 仍解析为 WebView，兼容各版本声明。
+const RNWebView = WebView;
 const styles = StyleSheet.create({
     loadErrorContext: {
         display: 'flex',
@@ -299,7 +303,7 @@ const _WebView = forwardRef((props, ref) => {
               <View style={styles.loadErrorText}><Text style={{ fontSize: 14, color: '#999999' }}>{currentErrorText.text}</Text></View>
               <View style={styles.loadErrorButton} onTouchEnd={_reload}><Text style={{ fontSize: 12, color: '#666666' }}>{currentErrorText.button}</Text></View>
             </View>)
-            : (<WebView containerStyle={defaultWebViewStyle} source={{ uri: src }} ref={webViewRef} javaScriptEnabled={true} onNavigationStateChange={_changeUrl} onMessage={_message} injectedJavaScript={injectedJavaScript} onLoadProgress={_onLoadProgress} onLoadEnd={onLoadEnd} onHttpError={onHttpError} onError={onError} allowsBackForwardNavigationGestures={true}></WebView>)}
+            : (<RNWebView containerStyle={defaultWebViewStyle} source={{ uri: src }} ref={webViewRef} javaScriptEnabled={true} onNavigationStateChange={_changeUrl} onMessage={_message} injectedJavaScript={injectedJavaScript} onLoadProgress={_onLoadProgress} onLoadEnd={onLoadEnd} onHttpError={onHttpError} onError={onError} allowsBackForwardNavigationGestures={true}></RNWebView>)}
       </Portal>);
 });
 _WebView.displayName = 'MpxWebview';

package/lib/runtime/components/react/dist/namedColorSet.d.ts

@@ -0,0 +1,2 @@
+declare const namedColorSet: Record<string, boolean>;
+export default namedColorSet;