@mpxjs/webpack-plugin 2.10.4-beta.19-input → 2.10.4-beta.19-input1

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

@@ -12,7 +12,6 @@ import useInnerProps, { getCustomEvent } from './getInnerListeners';
 import useNodesRef from './useNodesRef';
 import { splitProps, splitStyle, useLayout, useTransformStyle, wrapChildren, extendObject } from './utils';
 import Icon from './mpx-icon';
-import Portal from './mpx-portal';
 const styles = StyleSheet.create({
     container: {
         flexDirection: 'row',
@@ -74,7 +73,7 @@ const Radio = forwardRef((radioProps, ref) => {
         bindtap && bindtap(getCustomEvent('tap', evt, { layoutRef }, props));
         onChange(evt);
     };
-    const { hasPositionFixed, hasSelfPercent, normalStyle, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
+    const { hasSelfPercent, normalStyle, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
     const { textStyle, backgroundStyle, innerStyle = {} } = splitStyle(normalStyle);
     if (backgroundStyle) {
         warn('Radio does not support background image-related styles!');
@@ -124,7 +123,7 @@ const Radio = forwardRef((radioProps, ref) => {
             }
         }
     }, [checked]);
-    const finalComponent = createElement(View, innerProps, createElement(View, { style: defaultStyle }, createElement(Icon, {
+    return createElement(View, innerProps, createElement(View, { style: defaultStyle }, createElement(Icon, {
         type: 'success',
         size: 24,
         color: disabled ? '#E1E1E1' : color,
@@ -135,10 +134,6 @@ const Radio = forwardRef((radioProps, ref) => {
         textStyle,
         textProps
     }));
-    if (hasPositionFixed) {
-        return createElement(Portal, null, finalComponent);
-    }
-    return finalComponent;
 });
 Radio.displayName = 'MpxRadio';
 export default Radio;

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

@@ -8,7 +8,6 @@ import useNodesRef from '../useNodesRef'; // 引入辅助函数
 import { useTransformStyle, useLayout, extendObject } from '../utils';
 import { WebView } from 'react-native-webview';
 import { generateHTML } from './html';
-import Portal from '../mpx-portal';
 function jsonToHtmlStr(elements) {
     let htmlStr = '';
     for (const element of elements) {
@@ -31,7 +30,7 @@ const _RichText = forwardRef((props, ref) => {
     const { style = {}, nodes, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight } = props;
     const nodeRef = useRef(null);
     const [webViewHeight, setWebViewHeight] = useState(0);
-    const { normalStyle, hasSelfPercent, setWidth, setHeight, hasPositionFixed } = useTransformStyle(Object.assign({
+    const { normalStyle, hasSelfPercent, setWidth, setHeight } = useTransformStyle(Object.assign({
         width: '100%',
         height: webViewHeight
     }, style), {
@@ -52,19 +51,12 @@ const _RichText = forwardRef((props, ref) => {
         layoutRef
     });
     const html = typeof nodes === 'string' ? nodes : jsonToHtmlStr(nodes);
-    let finalComponent = createElement(View, innerProps, createElement(WebView, {
+    return createElement(View, innerProps, createElement(WebView, {
         source: { html: generateHTML(html) },
         onMessage: (event) => {
             setWebViewHeight(+event.nativeEvent.data);
-        },
-        style: {
-            backgroundColor: 'transparent'
         }
     }));
-    if (hasPositionFixed) {
-        finalComponent = createElement(Portal, null, finalComponent);
-    }
-    return finalComponent;
 });
 _RichText.displayName = 'mpx-rich-text';
 export default _RichText;

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

@@ -34,13 +34,12 @@
 import { ScrollView, RefreshControl, Gesture, GestureDetector } from 'react-native-gesture-handler';
 import { Animated as RNAnimated } from 'react-native';
 import { isValidElement, Children, useRef, useState, useEffect, forwardRef, useContext, useMemo, createElement } from 'react';
-import Animated, { useSharedValue, withTiming, useAnimatedStyle, runOnJS } from 'react-native-reanimated';
-import { warn, hasOwn } from '@mpxjs/utils';
+import Animated, { useAnimatedRef, useSharedValue, withTiming, useAnimatedStyle, runOnJS } from 'react-native-reanimated';
+import { warn } from '@mpxjs/utils';
 import useInnerProps, { getCustomEvent } from './getInnerListeners';
 import useNodesRef from './useNodesRef';
-import { splitProps, splitStyle, useTransformStyle, useLayout, wrapChildren, extendObject, flatGesture, HIDDEN_STYLE, useRunOnJSCallback } from './utils';
+import { splitProps, splitStyle, useTransformStyle, useLayout, wrapChildren, extendObject, flatGesture, HIDDEN_STYLE } from './utils';
 import { IntersectionObserverContext, ScrollViewContext } from './context';
-import Portal from './mpx-portal';
 const AnimatedScrollView = RNAnimated.createAnimatedComponent(ScrollView);
 const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
     const { textProps, innerProps: props = {} } = splitProps(scrollViewProps);
@@ -74,29 +73,11 @@ 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 });
+    const { normalStyle, hasVarDec, varContextRef, hasSelfPercent, setWidth, setHeight } = useTransformStyle(style, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
     const { textStyle, innerStyle = {} } = splitStyle(normalStyle);
-    const scrollViewRef = useRef(null);
-    const propsRef = useRef(props);
-    const refresherStateRef = useRef({
-        hasRefresher,
-        refresherTriggered
-    });
-    propsRef.current = props;
-    refresherStateRef.current = {
-        hasRefresher,
-        refresherTriggered
-    };
-    const runOnJSCallbackRef = useRef({
-        setEnableScroll,
-        setScrollBounces,
-        setRefreshing,
-        onRefresh
-    });
-    const runOnJSCallback = useRunOnJSCallback(runOnJSCallbackRef);
+    const scrollViewRef = useAnimatedRef();
     useNodesRef(props, ref, scrollViewRef, {
         style: normalStyle,
         scrollOffset: scrollOptions,
@@ -224,22 +205,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 || {};
@@ -259,9 +225,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, {
@@ -271,8 +236,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));
@@ -285,9 +249,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, {
@@ -295,8 +258,7 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
                     scrollLeft,
                     scrollTop,
                     scrollHeight,
-                    scrollWidth,
-                    layoutMeasurement
+                    scrollWidth
                 },
                 layoutRef
             }, props));
@@ -322,6 +284,20 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
             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) {
         bindtouchmove && bindtouchmove(e);
         if (enhanced) {
@@ -335,6 +311,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 });
@@ -343,16 +332,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);
         }
     });
@@ -360,34 +339,9 @@ 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() {
-        const { hasRefresher, refresherTriggered } = refresherStateRef.current;
         if (hasRefresher && refresherTriggered === undefined) {
             // 处理使用了自定义刷新组件，又没设置 refresherTriggered 的情况
             setRefreshing(true);
@@ -399,9 +353,9 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
                 }
             }, 500);
         }
-        const { bindrefresherrefresh } = propsRef.current;
+        const { bindrefresherrefresh } = props;
         bindrefresherrefresh &&
-            bindrefresherrefresh(getCustomEvent('refresherrefresh', {}, { layoutRef }, propsRef.current));
+            bindrefresherrefresh(getCustomEvent('refresherrefresh', {}, { layoutRef }, props));
     }
     function getRefresherContent(children) {
         let refresherContent = null;
@@ -449,7 +403,7 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
         'worklet';
         if (enableScrollValue.value !== newValue) {
             enableScrollValue.value = newValue;
-            runOnJS(runOnJSCallback)('setEnableScroll', newValue);
+            runOnJS(setEnableScroll)(newValue);
         }
     }
     const resetScrollState = (value) => {
@@ -460,7 +414,7 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
         'worklet';
         if (bouncesValue.value !== newValue) {
             bouncesValue.value = newValue;
-            runOnJS(runOnJSCallback)('setScrollBounces', newValue);
+            runOnJS(setScrollBounces)(newValue);
         }
     }
     // 处理下拉刷新的手势
@@ -505,7 +459,7 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
             if ((event.translationY > 0 && translateY.value < refresherThreshold) || event.translationY < 0) {
                 translateY.value = withTiming(0);
                 updateScrollState(true);
-                runOnJS(runOnJSCallback)('setRefreshing', false);
+                runOnJS(setRefreshing)(false);
             }
             else {
                 translateY.value = withTiming(refresherHeight.value);
@@ -514,22 +468,18 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
         else if (event.translationY >= refresherHeight.value) {
             // 触发刷新
             translateY.value = withTiming(refresherHeight.value);
-            runOnJS(runOnJSCallback)('onRefresh');
+            runOnJS(onRefresh)();
         }
         else {
             // 回弹
             translateY.value = withTiming(0);
             updateScrollState(true);
-            runOnJS(runOnJSCallback)('setRefreshing', false);
+            runOnJS(setRefreshing)(false);
         }
     })
         .simultaneousWithExternalGesture(scrollViewRef);
     const scrollAdditionalProps = extendObject({
-        style: extendObject(hasOwn(innerStyle, 'flex') || hasOwn(innerStyle, 'flexGrow')
-            ? {}
-            : {
-                flexGrow: 0
-            }, innerStyle, layoutStyle),
+        style: extendObject({}, innerStyle, layoutStyle),
         pinchGestureEnabled: false,
         alwaysBounceVertical: false,
         alwaysBounceHorizontal: false,
@@ -540,13 +490,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) {
@@ -605,11 +556,7 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
         textStyle,
         textProps
     })));
-    let scrollViewComponent = hasRefresher ? withRefresherScrollView : commonScrollView;
-    if (hasPositionFixed) {
-        scrollViewComponent = createElement(Portal, null, scrollViewComponent);
-    }
-    return scrollViewComponent;
+    return hasRefresher ? withRefresherScrollView : commonScrollView;
 });
 _ScrollView.displayName = 'MpxScrollView';
 export default _ScrollView;

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

@@ -108,9 +108,7 @@ const _StickyHeader = forwardRef((stickyHeaderProps = {}, ref) => {
 const styles = StyleSheet.create({
     content: {
         width: '100%',
-        zIndex: 10,
-        // harmony 需要手动设置 relative， zIndex 才生效
-        position: 'relative'
+        zIndex: 10
     }
 });
 _StickyHeader.displayName = 'MpxStickyHeader';

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

@@ -1,5 +1,5 @@
 import Animated, { useAnimatedStyle, interpolate } from 'react-native-reanimated';
-import { forwardRef, useRef, useContext, createElement } from 'react';
+import { forwardRef, useRef, useContext } from 'react';
 import useInnerProps from './getInnerListeners';
 import useNodesRef from './useNodesRef'; // 引入辅助函数
 import { useTransformStyle, splitStyle, splitProps, wrapChildren, useLayout, extendObject, isHarmony } from './utils';
@@ -45,16 +45,14 @@ const _SwiperItem = forwardRef((props, ref) => {
             transform: transformStyle
         });
     });
-    const mergeProps = extendObject({}, innerProps, {
-        style: [innerStyle, layoutStyle, itemAnimatedStyle, customStyle],
-        'data-itemId': props['item-id']
-    });
-    return createElement(Animated.View, mergeProps, wrapChildren(props, {
-        hasVarDec,
-        varContext: varContextRef.current,
-        textStyle,
-        textProps
-    }));
+    return (<Animated.View {...innerProps} style={[innerStyle, layoutStyle, itemAnimatedStyle, customStyle]} data-itemId={props['item-id']}>
+      {wrapChildren(props, {
+            hasVarDec,
+            varContext: varContextRef.current,
+            textStyle,
+            textProps
+        })}
+    </Animated.View>);
 });
 _SwiperItem.displayName = 'MpxSwiperItem';
 export default _SwiperItem;