@mpxjs/webpack-plugin 2.10.14-beta.7 → 2.10.14-beta.9

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

@@ -14,4 +14,3 @@ declare const PopupBase: {
     displayName: string;
 };
 export default PopupBase;
-//# sourceMappingURL=popupBase.d.ts.map

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

@@ -13,4 +13,3 @@ declare const Portal: {
     update: (key: number, e: ReactNode) => void;
 };
 export default Portal;
-//# sourceMappingURL=index.d.ts.map

package/lib/runtime/components/react/dist/mpx-portal/index.jsx

@@ -1,18 +1,14 @@
 import { useContext, useEffect, useRef } from 'react';
-import { PortalContext, ProviderContext, RouteContext, VarContext } from '../context';
+import { PortalContext, RouteContext, VarContext } from '../context';
 import PortalHost, { portal } from './portal-host';
 const Portal = ({ children }) => {
     const manager = useContext(PortalContext);
     const keyRef = useRef(null);
     const { pageId } = useContext(RouteContext) || {};
     const varContext = useContext(VarContext);
-    const parentProvides = useContext(ProviderContext);
     if (varContext) {
         children = (<VarContext.Provider value={varContext} key='varContextWrap'>{children}</VarContext.Provider>);
     }
-    if (parentProvides) {
-        children = (<ProviderContext.Provider value={parentProvides} key='providerContextWrap'>{children}</ProviderContext.Provider>);
-    }
     useEffect(() => {
         manager.update(keyRef.current, children);
     }, [children]);

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

@@ -27,4 +27,3 @@ declare class PortalGuard {
 export declare const portal: PortalGuard;
 declare const PortalHost: ({ children }: PortalHostProps) => JSX.Element;
 export default PortalHost;
-//# sourceMappingURL=portal-host.d.ts.map

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

@@ -7,4 +7,3 @@ export type State = {
 };
 declare const _PortalManager: import("react").ForwardRefExoticComponent<import("react").RefAttributes<unknown>>;
 export default _PortalManager;
-//# sourceMappingURL=portal-manager.d.ts.map

package/lib/runtime/components/react/dist/mpx-portal/portal-manager.jsx

@@ -1,4 +1,5 @@
-import { useState, useCallback, forwardRef, useImperativeHandle, Fragment } from 'react';
+import { useState, useCallback, forwardRef, useImperativeHandle } from 'react';
+import { View, StyleSheet } from 'react-native';
 const _PortalManager = forwardRef((props, ref) => {
     const [state, setState] = useState({
         portals: []
@@ -30,9 +31,10 @@ const _PortalManager = forwardRef((props, ref) => {
         portals: state.portals
     }));
     return (<>
-      {state.portals.map(({ key, children }) => (<Fragment key={key}>
+      {state.portals.map(({ key, children }, i) => (<View key={key} collapsable={false} // Need collapsable=false here to clip the elevations
+         style={[StyleSheet.absoluteFill, { zIndex: 1000 + i, pointerEvents: 'box-none' }]}>
           {children}
-        </Fragment>))}
+        </View>))}
     </>);
 });
 export default _PortalManager;

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

@@ -18,4 +18,3 @@ export interface RadioGroupProps {
 }
 declare const radioGroup: import("react").ForwardRefExoticComponent<RadioGroupProps & import("react").RefAttributes<HandlerRef<View, RadioGroupProps>>>;
 export default radioGroup;
-//# sourceMappingURL=mpx-radio-group.d.ts.map

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

@@ -24,4 +24,3 @@ export interface RadioProps {
 }
 declare const Radio: import("react").ForwardRefExoticComponent<RadioProps & import("react").RefAttributes<HandlerRef<View, RadioProps>>>;
 export default Radio;
-//# sourceMappingURL=mpx-radio.d.ts.map

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

@@ -1,2 +1 @@
 export declare const generateHTML: (html: string) => string;
-//# sourceMappingURL=html.d.ts.map

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

@@ -22,4 +22,3 @@ interface _RichTextProps extends ViewProps {
 }
 declare const _RichText: import("react").ForwardRefExoticComponent<_RichTextProps & import("react").RefAttributes<HandlerRef<View, _RichTextProps>>>;
 export default _RichText;
-//# sourceMappingURL=index.d.ts.map

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

@@ -12,4 +12,3 @@ declare const _RootPortal: {
     displayName: string;
 };
 export default _RootPortal;
-//# sourceMappingURL=mpx-root-portal.d.ts.map

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

@@ -52,4 +52,3 @@ declare const _ScrollView: import("react").ForwardRefExoticComponent<ScrollViewP
     children?: ReactNode;
 } & import("react-native-gesture-handler").NativeViewGestureHandlerProps & import("react").RefAttributes<import("react").ComponentType<any>>> & import("react-native").ScrollView & View, ScrollViewProps>>>;
 export default _ScrollView;
-//# sourceMappingURL=mpx-scroll-view.d.ts.map

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

@@ -48,6 +48,8 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
     const scrollOffset = useRef(new RNAnimated.Value(0)).current;
     const simultaneousHandlers = flatGesture(originSimultaneousHandlers);
     const waitForHandlers = flatGesture(waitFor);
+    const snapScrollTop = useRef(0);
+    const snapScrollLeft = useRef(0);
     const [refreshing, setRefreshing] = useState(false);
     const [enableScroll, setEnableScroll] = useState(true);
     const enableScrollValue = useSharedValue(true);
@@ -72,7 +74,6 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
         black: ['#000'],
         white: ['#fff']
     };
-    const isContentSizeChange = useRef(false);
     const { refresherContent, otherContent } = getRefresherContent(props.children);
     const hasRefresher = refresherContent && refresherEnabled;
     const { normalStyle, hasVarDec, varContextRef, hasSelfPercent, hasPositionFixed, setWidth, setHeight } = useTransformStyle(style, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
@@ -125,12 +126,14 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
         warn('scroll-x and scroll-y cannot be set to true at the same time, Mpx will use the value of scroll-y as the criterion');
     }
     useEffect(() => {
-        initialTimeout.current = setTimeout(() => {
-            scrollToOffset(scrollLeft, scrollTop);
-        }, 0);
-        return () => {
-            initialTimeout.current && clearTimeout(initialTimeout.current);
-        };
+        if (snapScrollTop.current !== scrollTop || snapScrollLeft.current !== scrollLeft) {
+            initialTimeout.current = setTimeout(() => {
+                scrollToOffset(scrollLeft, scrollTop);
+            }, 0);
+            return () => {
+                initialTimeout.current && clearTimeout(initialTimeout.current);
+            };
+        }
     }, [scrollTop, scrollLeft]);
     useEffect(() => {
         if (scrollIntoView && __selectRef) {
@@ -220,22 +223,7 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
         }
     }
     function onContentSizeChange(width, height) {
-        isContentSizeChange.current = true;
-        const newContentLength = selectLength({ height, width });
-        const oldContentLength = scrollOptions.current.contentLength;
-        scrollOptions.current.contentLength = newContentLength;
-        // 内容高度变化时，Animated.event 的映射可能会有不生效的场景，所以需要手动设置一下 scrollOffset 的值
-        if (enableSticky && (__mpx_mode__ === 'android' || __mpx_mode__ === 'ios')) {
-            // 当内容变少时，检查当前滚动位置是否超出新的内容范围
-            if (newContentLength < oldContentLength) {
-                const { visibleLength, offset } = scrollOptions.current;
-                const maxOffset = Math.max(0, newContentLength - visibleLength);
-                // 如果当前滚动位置超出了新的内容范围，调整滚动offset
-                if (offset > maxOffset && scrollY) {
-                    scrollOffset.setValue(maxOffset);
-                }
-            }
-        }
+        scrollOptions.current.contentLength = selectLength({ height, width });
     }
     function onLayout(e) {
         const layout = e.nativeEvent.layout || {};
@@ -255,9 +243,8 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
     }
     function onScroll(e) {
         const { bindscroll } = props;
-        const { contentOffset, layoutMeasurement, contentSize } = e.nativeEvent;
-        const { x: scrollLeft, y: scrollTop } = contentOffset;
-        const { width: scrollWidth, height: scrollHeight } = contentSize;
+        const { x: scrollLeft, y: scrollTop } = e.nativeEvent.contentOffset;
+        const { width: scrollWidth, height: scrollHeight } = e.nativeEvent.contentSize;
         isAtTop.value = scrollTop <= 0;
         bindscroll &&
             bindscroll(getCustomEvent('scroll', e, {
@@ -267,8 +254,7 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
                     scrollHeight,
                     scrollWidth,
                     deltaX: scrollLeft - scrollOptions.current.scrollLeft,
-                    deltaY: scrollTop - scrollOptions.current.scrollTop,
-                    layoutMeasurement
+                    deltaY: scrollTop - scrollOptions.current.scrollTop
                 },
                 layoutRef
             }, props));
@@ -281,9 +267,8 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
     }
     function onScrollEnd(e) {
         const { bindscrollend } = props;
-        const { contentOffset, layoutMeasurement, contentSize } = e.nativeEvent;
-        const { x: scrollLeft, y: scrollTop } = contentOffset;
-        const { width: scrollWidth, height: scrollHeight } = contentSize;
+        const { x: scrollLeft, y: scrollTop } = e.nativeEvent.contentOffset;
+        const { width: scrollWidth, height: scrollHeight } = e.nativeEvent.contentSize;
         isAtTop.value = scrollTop <= 0;
         bindscrollend &&
             bindscrollend(getCustomEvent('scrollend', e, {
@@ -291,8 +276,7 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
                     scrollLeft,
                     scrollTop,
                     scrollHeight,
-                    scrollWidth,
-                    layoutMeasurement
+                    scrollWidth
                 },
                 layoutRef
             }, props));
@@ -312,6 +296,24 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
     function scrollToOffset(x = 0, y = 0, animated = scrollWithAnimation) {
         if (scrollViewRef.current) {
             scrollViewRef.current.scrollTo({ x, y, animated });
+            scrollOptions.current.scrollLeft = x;
+            scrollOptions.current.scrollTop = y;
+            snapScrollLeft.current = x;
+            snapScrollTop.current = y;
+        }
+    }
+    function onScrollTouchStart(e) {
+        const { bindtouchstart } = props;
+        bindtouchstart && bindtouchstart(e);
+        if (enhanced) {
+            binddragstart &&
+                binddragstart(getCustomEvent('dragstart', e, {
+                    detail: {
+                        scrollLeft: scrollOptions.current.scrollLeft,
+                        scrollTop: scrollOptions.current.scrollTop
+                    },
+                    layoutRef
+                }, props));
         }
     }
     function onScrollTouchMove(e) {
@@ -327,6 +329,19 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
                 }, props));
         }
     }
+    function onScrollTouchEnd(e) {
+        bindtouchend && bindtouchend(e);
+        if (enhanced) {
+            binddragend &&
+                binddragend(getCustomEvent('dragend', e, {
+                    detail: {
+                        scrollLeft: scrollOptions.current.scrollLeft || 0,
+                        scrollTop: scrollOptions.current.scrollTop || 0
+                    },
+                    layoutRef
+                }, props));
+        }
+    }
     function onScrollDrag(e) {
         const { x: scrollLeft, y: scrollTop } = e.nativeEvent.contentOffset;
         updateScrollOptions(e, { scrollLeft, scrollTop });
@@ -335,16 +350,6 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
     const scrollHandler = RNAnimated.event([{ nativeEvent: { contentOffset: { y: scrollOffset } } }], {
         useNativeDriver: true,
         listener: (event) => {
-            const y = event.nativeEvent.contentOffset.y || 0;
-            // 内容高度变化时，鸿蒙中 listener 回调通过scrollOffset.__getValue获取值一直等于event.nativeEvent.contentOffset.y，值是正确的，但是无法触发 sticky 动画执行，所以需要手动再 set 一次
-            if (__mpx_mode__ === 'harmony') {
-                if (isContentSizeChange.current) {
-                    scrollOffset.setValue(y);
-                    setTimeout(() => {
-                        isContentSizeChange.current = false;
-                    }, 100);
-                }
-            }
             onScroll(event);
         }
     });
@@ -352,30 +357,6 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
         hasCallScrollToLower.current = false;
         hasCallScrollToUpper.current = false;
         onScrollDrag(e);
-        if (enhanced) {
-            binddragstart &&
-                binddragstart(getCustomEvent('dragstart', e, {
-                    detail: {
-                        scrollLeft: scrollOptions.current.scrollLeft,
-                        scrollTop: scrollOptions.current.scrollTop
-                    },
-                    layoutRef
-                }, props));
-        }
-    }
-    function onScrollDragEnd(e) {
-        onScrollDrag(e);
-        if (enhanced) {
-            // 安卓上如果触发了默认的下拉刷新，binddragend可能不触发，只会触发 binddragstart
-            binddragend &&
-                binddragend(getCustomEvent('dragend', e, {
-                    detail: {
-                        scrollLeft: scrollOptions.current.scrollLeft || 0,
-                        scrollTop: scrollOptions.current.scrollTop || 0
-                    },
-                    layoutRef
-                }, props));
-        }
     }
     // 处理刷新
     function onRefresh() {
@@ -532,13 +513,14 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
         showsVerticalScrollIndicator: scrollY && showScrollbar,
         scrollEnabled: !enableScroll ? false : !!(scrollX || scrollY),
         bounces: false,
-        overScrollMode: 'never',
         ref: scrollViewRef,
         onScroll: enableSticky ? scrollHandler : onScroll,
         onContentSizeChange: onContentSizeChange,
+        bindtouchstart: ((enhanced && binddragstart) || bindtouchstart) && onScrollTouchStart,
         bindtouchmove: ((enhanced && binddragging) || bindtouchmove) && onScrollTouchMove,
+        bindtouchend: ((enhanced && binddragend) || bindtouchend) && onScrollTouchEnd,
         onScrollBeginDrag: onScrollDragStart,
-        onScrollEndDrag: onScrollDragEnd,
+        onScrollEndDrag: onScrollDrag,
         onMomentumScrollEnd: onScrollEnd
     }, (simultaneousHandlers ? { simultaneousHandlers } : {}), (waitForHandlers ? { waitFor: waitForHandlers } : {}), layoutProps);
     if (enhanced) {

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

@@ -5,4 +5,3 @@ declare const SimpleText: {
     displayName: string;
 };
 export default SimpleText;
-//# sourceMappingURL=mpx-simple-text.d.ts.map

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

@@ -5,4 +5,3 @@ declare const SimpleView: {
     displayName: string;
 };
 export default SimpleView;
-//# sourceMappingURL=mpx-simple-view.d.ts.map

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

@@ -15,4 +15,3 @@ interface StickyHeaderProps {
 }
 declare const _StickyHeader: import("react").ForwardRefExoticComponent<StickyHeaderProps & import("react").RefAttributes<HandlerRef<View, StickyHeaderProps>>>;
 export default _StickyHeader;
-//# sourceMappingURL=mpx-sticky-header.d.ts.map

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

@@ -13,4 +13,3 @@ interface StickySectionProps {
 }
 declare const _StickySection: import("react").ForwardRefExoticComponent<StickySectionProps & import("react").RefAttributes<HandlerRef<View, StickySectionProps>>>;
 export default _StickySection;
-//# sourceMappingURL=mpx-sticky-section.d.ts.map

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

@@ -16,4 +16,3 @@ interface SwiperItemProps {
 }
 declare const _SwiperItem: import("react").ForwardRefExoticComponent<SwiperItemProps & import("react").RefAttributes<HandlerRef<View, SwiperItemProps>>>;
 export default _SwiperItem;
-//# sourceMappingURL=mpx-swiper-item.d.ts.map

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

@@ -50,4 +50,3 @@ interface SwiperProps {
 }
 declare const SwiperWrapper: React.ForwardRefExoticComponent<SwiperProps & React.RefAttributes<HandlerRef<View, SwiperProps>>>;
 export default SwiperWrapper;
-//# sourceMappingURL=mpx-swiper.d.ts.map

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

@@ -120,6 +120,8 @@ const SwiperWrapper = forwardRef((props, ref) => {
     const strVelocity = 'velocity' + dir.toUpperCase();
     // 标识手指触摸和抬起, 起点在onBegin
     const touchfinish = useSharedValue(true);
+    // 记录onUpdate时的方向，用于进行onFinalize中的值修正
+    const preUpdateTransDir = useSharedValue(0);
     // 记录上一帧的绝对定位坐标
     const preAbsolutePos = useSharedValue(0);
     // 记录从onBegin 到 onTouchesUp 时移动的距离
@@ -325,11 +327,9 @@ const SwiperWrapper = forwardRef((props, ref) => {
             resumeLoop
         };
     }, []);
-    function handleSwiperChange(current, pCurrent) {
-        if (pCurrent !== currentIndex.value) {
-            const eventData = getCustomEvent('change', {}, { detail: { current, source: 'touch' }, layoutRef: layoutRef });
-            bindchange && bindchange(eventData);
-        }
+    function handleSwiperChange(current) {
+        const eventData = getCustomEvent('change', {}, { detail: { current, source: 'touch' }, layoutRef: layoutRef });
+        bindchange && bindchange(eventData);
     }
     const runOnJSCallbackRef = useRef({
         loop,
@@ -379,7 +379,7 @@ const SwiperWrapper = forwardRef((props, ref) => {
     // 1. 用户在当前页切换选中项，动画；用户携带选中index打开到swiper页直接选中不走动画
     useAnimatedReaction(() => currentIndex.value, (newIndex, preIndex) => {
         // 这里必须传递函数名, 直接写()=> {}形式会报 访问了未sharedValue信息
-        if (newIndex !== preIndex && bindchange) {
+        if (newIndex !== preIndex && preIndex !== null && preIndex !== undefined && bindchange) {
             runOnJS(runOnJSCallback)('handleSwiperChange', newIndex, propCurrent);
         }
     });
@@ -411,9 +411,9 @@ const SwiperWrapper = forwardRef((props, ref) => {
         }
     }, [children.length]);
     useEffect(() => {
-        // 1. 如果用户在touch的过程中, 外部更新了current以外部为准（小程序表现）
+        // 1. 如果用户在touch的过程中, 外部更新了current以内部为准（小程序表现）
         // 2. 手指滑动过程中更新索引，外部会把current再传入进来，导致offset直接更新，增加判断不同才更新
-        if (propCurrent !== currentIndex.value) {
+        if (propCurrent !== currentIndex.value && touchfinish.value) {
             updateCurrent(propCurrent, step.value);
         }
     }, [propCurrent]);
@@ -662,6 +662,7 @@ const SwiperWrapper = forwardRef((props, ref) => {
                 translation: moveDistance,
                 transdir: moveDistance
             };
+            preUpdateTransDir.value = moveDistance;
             // 1. 支持滑动中超出一半更新索引的能力：只更新索引并不会影响onFinalize依据当前offset计算的索引
             const { half } = computeHalf(eventData);
             if (childrenLength.value > 1 && half) {
@@ -702,11 +703,17 @@ const SwiperWrapper = forwardRef((props, ref) => {
             if (touchfinish.value)
                 return;
             touchfinish.value = true;
+            /**
+             * 安卓修正
+             * 问题：部分安卓机型onFinalize中拿到的absoluteX 有问题
+             * 案例：比如手指从右向左滑的时候，onUpdate拿到的是241.64346313476562， 而onFinalize中拿到的是241.81817626953125，理论上onFinalize中应该比onUpdate小才对吧
+             * 解决方式：修正
+            */
             // 触发过onUpdate正常情况下e[strAbso] - preAbsolutePos.value=0; 未触发过onUpdate的情况下e[strAbso] - preAbsolutePos.value 不为0
             const moveDistance = e[strAbso] - preAbsolutePos.value;
             const eventData = {
                 translation: moveDistance,
-                transdir: moveDistance !== 0 ? moveDistance : e[strAbso] - moveTranstion.value
+                transdir: Math.abs(moveDistance) > 1 ? moveDistance : preUpdateTransDir.value
             };
             // 1. 只有一个元素：循环 和 非循环状态，都走回弹效果
             if (childrenLength.value === 1) {

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

@@ -24,4 +24,3 @@ interface _SwitchProps extends SwitchProps {
 }
 declare const _Switch: import("react").ForwardRefExoticComponent<_SwitchProps & import("react").RefAttributes<HandlerRef<Switch, _SwitchProps>>>;
 export default _Switch;
-//# sourceMappingURL=mpx-switch.d.ts.map

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

@@ -1,7 +1,7 @@
 /**
  * ✔ selectable
  * ✘ space
- * ✔ decode
+ * ✘ decode
  */
 import { Text, TextStyle, TextProps } from 'react-native';
 import { ReactNode } from 'react';
@@ -16,8 +16,6 @@ interface _TextProps extends TextProps {
     'parent-font-size'?: number;
     'parent-width'?: number;
     'parent-height'?: number;
-    decode?: boolean;
 }
 declare const _Text: import("react").ForwardRefExoticComponent<_TextProps & import("react").RefAttributes<HandlerRef<Text, _TextProps>>>;
 export default _Text;
-//# sourceMappingURL=mpx-text.d.ts.map

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

@@ -1,40 +1,16 @@
 /**
  * ✔ selectable
  * ✘ space
- * ✔ decode
+ * ✘ decode
  */
 import { Text } from 'react-native';
-import { useRef, forwardRef, createElement, Children } from 'react';
+import { useRef, forwardRef, createElement } from 'react';
 import Portal from './mpx-portal';
 import useInnerProps from './getInnerListeners';
 import useNodesRef from './useNodesRef'; // 引入辅助函数
 import { useTransformStyle, wrapChildren, extendObject } from './utils';
-const decodeMap = {
-    '&lt;': '<',
-    '&gt;': '>',
-    '&quot;': '"',
-    '&amp;': '&',
-    '&#39;': '\'',
-    '&nbsp;': ' '
-};
-const encodedRe = /&(?:lt|gt|quot|amp|#39|nbsp);/g;
-function decode(value) {
-    if (value != null) {
-        return value.replace(encodedRe, function (match) {
-            return decodeMap[match];
-        });
-    }
-}
-function getDecodedChildren(children) {
-    return Children.map(children, (child) => {
-        if (typeof child === 'string') {
-            return decode(child);
-        }
-        return child;
-    });
-}
 const _Text = forwardRef((props, ref) => {
-    const { style = {}, allowFontScaling = false, selectable, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'user-select': userSelect, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, decode } = props;
+    const { style = {}, allowFontScaling = false, selectable, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'user-select': userSelect, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight } = props;
     const { normalStyle, hasVarDec, varContextRef, hasPositionFixed } = useTransformStyle(style, {
         enableVar,
         externalVarContext,
@@ -52,13 +28,9 @@ const _Text = forwardRef((props, ref) => {
         selectable: !!selectable || !!userSelect,
         allowFontScaling
     }), [
-        'user-select',
-        'decode'
+        'user-select'
     ]);
-    const children = decode ? getDecodedChildren(props.children) : props.children;
-    let finalComponent = createElement(Text, innerProps, wrapChildren(extendObject({}, props, {
-        children
-    }), {
+    let finalComponent = createElement(Text, innerProps, wrapChildren(props, {
         hasVarDec,
         varContext: varContextRef.current
     }));

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

@@ -5,4 +5,3 @@ import { HandlerRef } from './useNodesRef';
 export type TextareProps = Omit<InputProps & PrivateInputProps, 'type' | 'password' | 'multiline' | 'confirm-hold'>;
 declare const Textarea: import("react").ForwardRefExoticComponent<TextareProps & import("react").RefAttributes<HandlerRef<TextInput, TextareProps>>>;
 export default Textarea;
-//# sourceMappingURL=mpx-textarea.d.ts.map

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

@@ -99,4 +99,3 @@ interface VideoProps {
 }
 declare const MpxVideo: import("react").ForwardRefExoticComponent<VideoProps & import("react").RefAttributes<HandlerRef<View, VideoProps>>>;
 export default MpxVideo;
-//# sourceMappingURL=mpx-video.d.ts.map

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

@@ -32,4 +32,3 @@ export interface _ViewProps extends ViewProps {
 }
 declare const _View: import("react").ForwardRefExoticComponent<_ViewProps & import("react").RefAttributes<HandlerRef<View, _ViewProps>>>;
 export default _View;
-//# sourceMappingURL=mpx-view.d.ts.map

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

@@ -20,4 +20,3 @@ interface WebViewProps {
 }
 declare const _WebView: import("react").ForwardRefExoticComponent<Omit<WebViewProps, "ref"> & import("react").RefAttributes<HandlerRef<WebView<{}>, WebViewProps>>>;
 export default _WebView;
-//# sourceMappingURL=mpx-web-view.d.ts.map

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

@@ -80,25 +80,9 @@ const _WebView = forwardRef((props, ref) => {
     useNodesRef(props, ref, webViewRef, {
         style: defaultWebViewStyle
     });
-    const hostValidate = (url) => {
-        const host = url && new URL(url).host;
-        const hostWhitelists = mpx.config.rnConfig?.webviewConfig?.hostWhitelists || [];
-        if (hostWhitelists.length) {
-            return hostWhitelists.some((item) => {
-                return host.endsWith(item);
-            });
-        }
-        else {
-            return true;
-        }
-    };
     if (!src) {
         return null;
     }
-    if (!hostValidate(src)) {
-        console.error('访问页面域名不符合domainWhiteLists白名单配置，请确认是否正确配置该域名白名单');
-        return null;
-    }
     const _reload = function () {
         if (__mpx_mode__ !== 'ios') {
             fristLoaded.current = false; // 安卓需要重新设置
@@ -149,9 +133,6 @@ const _WebView = forwardRef((props, ref) => {
         }
     };
     const _message = function (res) {
-        if (!hostValidate(res.nativeEvent?.url)) {
-            return;
-        }
         let data = {};
         let asyncCallback;
         const navObj = promisify({ redirectTo, navigateTo, navigateBack, reLaunch, switchTab });
@@ -176,7 +157,7 @@ const _WebView = forwardRef((props, ref) => {
                 }
                 break;
             case 'postMessage':
-                bindmessage && bindmessage(getCustomEvent('message', {}, {
+                bindmessage && bindmessage(getCustomEvent('messsage', {}, {
                     detail: {
                         data: params[0]?.data
                     }
@@ -203,7 +184,7 @@ const _WebView = forwardRef((props, ref) => {
                 break;
             default:
                 if (type) {
-                    const implement = mpx.config.rnConfig.webviewConfig && mpx.config.rnConfig.webviewConfig.apiImplementations && mpx.config.rnConfig.webviewConfig.apiImplementations[type];
+                    const implement = mpx.config.webviewConfig.apiImplementations && mpx.config.webviewConfig.apiImplementations[type];
                     if (isFunction(implement)) {
                         asyncCallback = Promise.resolve(implement(...params));
                     }

package/lib/runtime/components/react/dist/{mpx-nav.d.ts → nav.d.ts}

@@ -6,4 +6,3 @@ export interface MpxNavProps {
 }
 declare const MpxNav: import("react").MemoExoticComponent<({ pageConfig, navigation }: MpxNavProps) => import("react").JSX.Element>;
 export default MpxNav;
-//# sourceMappingURL=mpx-nav.d.ts.map

package/lib/runtime/components/react/dist/{mpx-nav.jsx → nav.jsx}

@@ -2,6 +2,7 @@
 import { useState, useMemo, memo } from 'react';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { StatusBar, processColor, TouchableWithoutFeedback, Image, View, StyleSheet, Text } from 'react-native';
+import { useNavShared } from './useNavShared';
 function convertToHex(color) {
     try {
         const intColor = processColor(color);
@@ -80,6 +81,7 @@ const validBarTextStyle = (textStyle) => {
 const BACK_ICON = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAABICAYAAACqT5alAAAA2UlEQVR4nO3bMQrCUBRE0Yla6AYEN2nnBrTL+izcitW3MRDkEUWSvPzJvfCqgMwhZbAppWhNbbIHzB1g9wATERFRVyvpkj1irlpJ5X326D7WHh1hbdFD2CLpLmmftm7kfsEe09aNHFiBrT+wAlt/YAW2/sAKbP2BFdj6Ayuwy+ufz6XPL893krZ//O6iu2n4LT8kndLWTRTo4EC7BDo40C6BDg60S6CDA+0S6OBAuwQ6uNWiD2nrJmoIfU7cNWkR2hbb1UfbY7uuWhGWiIg+a/iHuHmA3QPs3gu4JW9Gan+OJAAAAABJRU5ErkJggg==';
 const MpxNav = memo(({ pageConfig, navigation }) => {
     const [innerPageConfig, setPageConfig] = useState(pageConfig || {});
+    const [customNav] = useNavShared();
     const safeAreaTop = useSafeAreaInsets()?.top || 0;
     navigation.setPageConfig = (config) => {
         setPageConfig(Object.assign({}, innerPageConfig, config));
@@ -89,7 +91,10 @@ const MpxNav = memo(({ pageConfig, navigation }) => {
     // 状态栏的颜色
     const statusBarElement = (<StatusBar translucent backgroundColor='transparent' barStyle={navigationBarTextStyle === NavColor.White ? 'light-content' : 'dark-content'}></StatusBar>);
     if (isCustom)
-        return statusBarElement;
+        return (<>
+        {statusBarElement}
+        {customNav}
+      </>);
     // 假设是栈导航，获取栈的长度
     const stackLength = navigation.getState()?.routes?.length;
     const onStackTopBack = mpxGlobal?.__mpx?.config?.rnConfig?.onStackTopBack;

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

@@ -37,4 +37,3 @@ export declare class ReplaceSource {
     source(): string;
 }
 export {};
-//# sourceMappingURL=parser.d.ts.map

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

@@ -30,4 +30,3 @@ export default function useAnimationHooks<T, P>(props: _ViewProps & {
     animationStyle: ExtendedViewStyle;
 };
 export {};
-//# sourceMappingURL=useAnimationHooks.d.ts.map

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

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare function useNavShared(): readonly [import("react").ReactNode, (value: import("react").ReactNode) => void];