@mpxjs/webpack-plugin 2.10.3-beta.17 → 2.10.3-beta.18

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

@@ -10,7 +10,7 @@
  * ✔ enable-back-to-top
  * ✘ enable-passive
  * ✔ refresher-enabled
- * ✘ refresher-threshold
+ * ✔ refresher-threshold(仅自定义下拉节点样式支持)
  * ✔ refresher-default-style(仅 android 支持)
  * ✔ refresher-background(仅 android 支持)
  * ✔ refresher-triggered
@@ -31,22 +31,31 @@
  * ✔ bindscrolltolower
  * ✔ bindscroll
  */
-import { ScrollView, RefreshControl } from 'react-native-gesture-handler';
-import { useRef, useState, useEffect, forwardRef, useContext, createElement, useMemo } from 'react';
-import { useAnimatedRef } from 'react-native-reanimated';
-import { warn } from '@mpxjs/utils';
+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 useInnerProps, { getCustomEvent } from './getInnerListeners';
 import useNodesRef from './useNodesRef';
-import { splitProps, splitStyle, useTransformStyle, useLayout, wrapChildren, extendObject, flatGesture } from './utils';
+import { splitProps, splitStyle, useTransformStyle, useLayout, wrapChildren, extendObject, flatGesture, HIDDEN_STYLE, useRunOnJSCallback } 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);
-    const { enhanced = false, bounces = true, style = {}, binddragstart, binddragging, binddragend, bindtouchstart, bindtouchmove, bindtouchend, 'scroll-x': scrollX = false, 'scroll-y': scrollY = false, 'enable-back-to-top': enableBackToTop = false, 'enable-trigger-intersection-observer': enableTriggerIntersectionObserver = false, 'paging-enabled': pagingEnabled = false, 'upper-threshold': upperThreshold = 50, 'lower-threshold': lowerThreshold = 50, 'scroll-with-animation': scrollWithAnimation = false, 'refresher-enabled': refresherEnabled, 'refresher-default-style': refresherDefaultStyle, 'refresher-background': refresherBackground, 'show-scrollbar': showScrollbar = true, 'scroll-into-view': scrollIntoView = '', 'scroll-top': scrollTop = 0, 'scroll-left': scrollLeft = 0, 'refresher-triggered': refresherTriggered, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, 'simultaneous-handlers': originSimultaneousHandlers, 'wait-for': waitFor, 'scroll-event-throttle': scrollEventThrottle = 0, __selectRef } = props;
+    const { enhanced = false, bounces = true, style = {}, binddragstart, binddragging, binddragend, bindtouchstart, bindtouchmove, bindtouchend, 'scroll-x': scrollX = false, 'scroll-y': scrollY = false, 'enable-back-to-top': enableBackToTop = false, 'enable-trigger-intersection-observer': enableTriggerIntersectionObserver = false, 'paging-enabled': pagingEnabled = false, 'upper-threshold': upperThreshold = 50, 'lower-threshold': lowerThreshold = 50, 'scroll-with-animation': scrollWithAnimation = false, 'refresher-enabled': refresherEnabled, 'refresher-default-style': refresherDefaultStyle, 'refresher-background': refresherBackground, 'refresher-threshold': refresherThreshold = 45, 'show-scrollbar': showScrollbar = true, 'scroll-into-view': scrollIntoView = '', 'scroll-top': scrollTop = 0, 'scroll-left': scrollLeft = 0, 'refresher-triggered': refresherTriggered, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, 'simultaneous-handlers': originSimultaneousHandlers, 'wait-for': waitFor, 'enable-sticky': enableSticky, 'scroll-event-throttle': scrollEventThrottle = 0, 'scroll-into-view-offset': scrollIntoViewOffset = 0, __selectRef } = props;
+    const scrollOffset = useRef(new RNAnimated.Value(0)).current;
     const simultaneousHandlers = flatGesture(originSimultaneousHandlers);
     const waitForHandlers = flatGesture(waitFor);
-    const [refreshing, setRefreshing] = useState(true);
-    const snapScrollTop = useRef(0);
-    const snapScrollLeft = useRef(0);
+    const [refreshing, setRefreshing] = useState(false);
+    const [enableScroll, setEnableScroll] = useState(true);
+    const enableScrollValue = useSharedValue(true);
+    const [scrollBounces, setScrollBounces] = useState(false);
+    const bouncesValue = useSharedValue(!!false);
+    const translateY = useSharedValue(0);
+    const isAtTop = useSharedValue(true);
+    const refresherHeight = useSharedValue(0);
     const scrollOptions = useRef({
         contentLength: 0,
         offset: 0,
@@ -58,10 +67,34 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
     const hasCallScrollToLower = useRef(false);
     const initialTimeout = useRef(null);
     const intersectionObservers = useContext(IntersectionObserverContext);
-    const firstScrollIntoViewChange = useRef(false);
-    const { normalStyle, hasVarDec, varContextRef, hasSelfPercent, setWidth, setHeight } = useTransformStyle(style, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
+    const firstScrollIntoViewChange = useRef(true);
+    const refreshColor = {
+        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 { textStyle, innerStyle = {} } = splitStyle(normalStyle);
-    const scrollViewRef = useAnimatedRef();
+    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);
     useNodesRef(props, ref, scrollViewRef, {
         style: normalStyle,
         scrollOffset: scrollOptions,
@@ -72,56 +105,73 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
             pagingEnabled,
             fastDeceleration: false,
             decelerationDisabled: false,
-            scrollTo
+            scrollTo,
+            scrollIntoView: handleScrollIntoView
         },
         gestureRef: scrollViewRef
     });
+    const { layoutRef, layoutStyle, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef: scrollViewRef, onLayout });
     const contextValue = useMemo(() => {
         return {
-            gestureRef: scrollViewRef
+            gestureRef: scrollViewRef,
+            scrollOffset
         };
     }, []);
-    const { layoutRef, layoutStyle, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef: scrollViewRef, onLayout });
+    const hasRefresherLayoutRef = useRef(false);
+    // layout 完成前先隐藏，避免安卓闪烁问题
+    const refresherLayoutStyle = useMemo(() => { return !hasRefresherLayoutRef.current ? HIDDEN_STYLE : {}; }, [hasRefresherLayoutRef.current]);
     const lastOffset = useRef(0);
     if (scrollX && scrollY) {
         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(() => {
-        if (snapScrollTop.current !== scrollTop || snapScrollLeft.current !== scrollLeft) {
-            initialTimeout.current = setTimeout(() => {
-                scrollToOffset(scrollLeft, scrollTop);
-            }, 0);
-            return () => {
-                initialTimeout.current && clearTimeout(initialTimeout.current);
-            };
-        }
+        initialTimeout.current = setTimeout(() => {
+            scrollToOffset(scrollLeft, scrollTop);
+        }, 0);
+        return () => {
+            initialTimeout.current && clearTimeout(initialTimeout.current);
+        };
     }, [scrollTop, scrollLeft]);
-    useEffect(() => {
-        if (refreshing !== refresherTriggered) {
-            setRefreshing(!!refresherTriggered);
-        }
-    }, [refresherTriggered]);
     useEffect(() => {
         if (scrollIntoView && __selectRef) {
-            if (!firstScrollIntoViewChange.current) {
-                setTimeout(handleScrollIntoView);
+            if (firstScrollIntoViewChange.current) {
+                setTimeout(() => {
+                    handleScrollIntoView(scrollIntoView, { offset: scrollIntoViewOffset, animated: scrollWithAnimation });
+                });
             }
             else {
-                handleScrollIntoView();
+                handleScrollIntoView(scrollIntoView, { offset: scrollIntoViewOffset, animated: scrollWithAnimation });
             }
         }
-        firstScrollIntoViewChange.current = true;
+        firstScrollIntoViewChange.current = false;
     }, [scrollIntoView]);
+    useEffect(() => {
+        if (refresherEnabled) {
+            setRefreshing(!!refresherTriggered);
+            if (!refresherContent)
+                return;
+            if (refresherTriggered) {
+                translateY.value = withTiming(refresherHeight.value);
+                resetScrollState(false);
+            }
+            else {
+                translateY.value = withTiming(0);
+                resetScrollState(true);
+            }
+        }
+    }, [refresherTriggered]);
     function scrollTo({ top = 0, left = 0, animated = false }) {
         scrollToOffset(left, top, animated);
     }
-    function handleScrollIntoView() {
-        const refs = __selectRef(`#${scrollIntoView}`, 'node');
+    function handleScrollIntoView(selector = '', { offset = 0, animated = true } = {}) {
+        const refs = __selectRef(`#${selector}`, 'node');
         if (!refs)
             return;
         const { nodeRef } = refs.getNodeInstance();
         nodeRef.current?.measureLayout(scrollViewRef.current, (left, top) => {
-            scrollToOffset(left, top);
+            const adjustedLeft = scrollX ? left + offset : left;
+            const adjustedTop = scrollY ? top + offset : top;
+            scrollToOffset(adjustedLeft, adjustedTop, animated);
         });
     }
     function selectLength(size) {
@@ -170,7 +220,22 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
         }
     }
     function onContentSizeChange(width, height) {
-        scrollOptions.current.contentLength = selectLength({ height, width });
+        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);
+                }
+            }
+        }
     }
     function onLayout(e) {
         const layout = e.nativeEvent.layout || {};
@@ -190,8 +255,10 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
     }
     function onScroll(e) {
         const { bindscroll } = props;
-        const { x: scrollLeft, y: scrollTop } = e.nativeEvent.contentOffset;
-        const { width: scrollWidth, height: scrollHeight } = e.nativeEvent.contentSize;
+        const { contentOffset, layoutMeasurement, contentSize } = e.nativeEvent;
+        const { x: scrollLeft, y: scrollTop } = contentOffset;
+        const { width: scrollWidth, height: scrollHeight } = contentSize;
+        isAtTop.value = scrollTop <= 0;
         bindscroll &&
             bindscroll(getCustomEvent('scroll', e, {
                 detail: {
@@ -200,7 +267,8 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
                     scrollHeight,
                     scrollWidth,
                     deltaX: scrollLeft - scrollOptions.current.scrollLeft,
-                    deltaY: scrollTop - scrollOptions.current.scrollTop
+                    deltaY: scrollTop - scrollOptions.current.scrollTop,
+                    layoutMeasurement
                 },
                 layoutRef
             }, props));
@@ -213,15 +281,18 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
     }
     function onScrollEnd(e) {
         const { bindscrollend } = props;
-        const { x: scrollLeft, y: scrollTop } = e.nativeEvent.contentOffset;
-        const { width: scrollWidth, height: scrollHeight } = e.nativeEvent.contentSize;
+        const { contentOffset, layoutMeasurement, contentSize } = e.nativeEvent;
+        const { x: scrollLeft, y: scrollTop } = contentOffset;
+        const { width: scrollWidth, height: scrollHeight } = contentSize;
+        isAtTop.value = scrollTop <= 0;
         bindscrollend &&
             bindscrollend(getCustomEvent('scrollend', e, {
                 detail: {
                     scrollLeft,
                     scrollTop,
                     scrollHeight,
-                    scrollWidth
+                    scrollWidth,
+                    layoutMeasurement
                 },
                 layoutRef
             }, props));
@@ -241,47 +312,61 @@ 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 onRefresh() {
-        const { bindrefresherrefresh } = props;
-        bindrefresherrefresh &&
-            bindrefresherrefresh(getCustomEvent('refresherrefresh', {}, { layoutRef }, props));
-    }
-    function onScrollTouchStart(e) {
-        const { bindtouchstart } = props;
-        bindtouchstart && bindtouchstart(e);
+    function onScrollTouchMove(e) {
+        bindtouchmove && bindtouchmove(e);
         if (enhanced) {
-            binddragstart &&
-                binddragstart(getCustomEvent('dragstart', e, {
+            binddragging &&
+                binddragging(getCustomEvent('dragging', e, {
                     detail: {
-                        scrollLeft: scrollOptions.current.scrollLeft,
-                        scrollTop: scrollOptions.current.scrollTop
+                        scrollLeft: scrollOptions.current.scrollLeft || 0,
+                        scrollTop: scrollOptions.current.scrollTop || 0
                     },
                     layoutRef
                 }, props));
         }
     }
-    function onScrollTouchMove(e) {
-        bindtouchmove && bindtouchmove(e);
+    function onScrollDrag(e) {
+        const { x: scrollLeft, y: scrollTop } = e.nativeEvent.contentOffset;
+        updateScrollOptions(e, { scrollLeft, scrollTop });
+        updateIntersection();
+    }
+    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);
+        }
+    });
+    function onScrollDragStart(e) {
+        hasCallScrollToLower.current = false;
+        hasCallScrollToUpper.current = false;
+        onScrollDrag(e);
         if (enhanced) {
-            binddragging &&
-                binddragging(getCustomEvent('dragging', e, {
+            binddragstart &&
+                binddragstart(getCustomEvent('dragstart', e, {
                     detail: {
-                        scrollLeft: scrollOptions.current.scrollLeft || 0,
-                        scrollTop: scrollOptions.current.scrollTop || 0
+                        scrollLeft: scrollOptions.current.scrollLeft,
+                        scrollTop: scrollOptions.current.scrollTop
                     },
                     layoutRef
                 }, props));
         }
     }
-    function onScrollTouchEnd(e) {
-        bindtouchend && bindtouchend(e);
+    function onScrollDragEnd(e) {
+        onScrollDrag(e);
         if (enhanced) {
+            // 安卓上如果触发了默认的下拉刷新，binddragend可能不触发，只会触发 binddragstart
             binddragend &&
                 binddragend(getCustomEvent('dragend', e, {
                     detail: {
@@ -292,18 +377,151 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
                 }, props));
         }
     }
-    function onScrollDrag(e) {
-        const { x: scrollLeft, y: scrollTop } = e.nativeEvent.contentOffset;
-        updateScrollOptions(e, { scrollLeft, scrollTop });
-        updateIntersection();
+    // 处理刷新
+    function onRefresh() {
+        const { hasRefresher, refresherTriggered } = refresherStateRef.current;
+        if (hasRefresher && refresherTriggered === undefined) {
+            // 处理使用了自定义刷新组件，又没设置 refresherTriggered 的情况
+            setRefreshing(true);
+            setTimeout(() => {
+                setRefreshing(false);
+                translateY.value = withTiming(0);
+                if (!enableScrollValue.value) {
+                    resetScrollState(true);
+                }
+            }, 500);
+        }
+        const { bindrefresherrefresh } = propsRef.current;
+        bindrefresherrefresh &&
+            bindrefresherrefresh(getCustomEvent('refresherrefresh', {}, { layoutRef }, propsRef.current));
     }
-    function onScrollDragStart(e) {
-        hasCallScrollToLower.current = false;
-        hasCallScrollToUpper.current = false;
-        onScrollDrag(e);
+    function getRefresherContent(children) {
+        let refresherContent = null;
+        const otherContent = [];
+        Children.forEach(children, (child) => {
+            if (isValidElement(child) && child.props.slot === 'refresher') {
+                refresherContent = child;
+            }
+            else {
+                otherContent.push(child);
+            }
+        });
+        return {
+            refresherContent,
+            otherContent
+        };
+    }
+    // 刷新控件的动画样式
+    const refresherAnimatedStyle = useAnimatedStyle(() => {
+        return {
+            position: 'absolute',
+            left: 0,
+            right: 0,
+            top: -refresherHeight.value,
+            transform: [{ translateY: Math.min(translateY.value, refresherHeight.value) }],
+            backgroundColor: refresherBackground || 'transparent'
+        };
+    });
+    // 内容区域的动画样式 - 只有内容区域需要下移
+    const contentAnimatedStyle = useAnimatedStyle(() => {
+        return {
+            transform: [{
+                    translateY: translateY.value > refresherHeight.value
+                        ? refresherHeight.value
+                        : translateY.value
+                }]
+        };
+    });
+    function onRefresherLayout(e) {
+        const { height } = e.nativeEvent.layout;
+        refresherHeight.value = height;
+        hasRefresherLayoutRef.current = true;
+    }
+    function updateScrollState(newValue) {
+        'worklet';
+        if (enableScrollValue.value !== newValue) {
+            enableScrollValue.value = newValue;
+            runOnJS(runOnJSCallback)('setEnableScroll', newValue);
+        }
     }
+    const resetScrollState = (value) => {
+        enableScrollValue.value = value;
+        setEnableScroll(value);
+    };
+    function updateBouncesState(newValue) {
+        'worklet';
+        if (bouncesValue.value !== newValue) {
+            bouncesValue.value = newValue;
+            runOnJS(runOnJSCallback)('setScrollBounces', newValue);
+        }
+    }
+    // 处理下拉刷新的手势
+    const panGesture = Gesture.Pan()
+        .onUpdate((event) => {
+        'worklet';
+        if (enhanced && !!bounces) {
+            if (event.translationY > 0 && bouncesValue.value) {
+                updateBouncesState(false);
+            }
+            else if ((event.translationY < 0) && !bouncesValue.value) {
+                updateBouncesState(true);
+            }
+        }
+        if (translateY.value <= 0 && event.translationY < 0) {
+            // 滑动到顶再向上开启滚动
+            updateScrollState(true);
+        }
+        else if (event.translationY > 0 && isAtTop.value) {
+            // 滚动到顶再向下禁止滚动
+            updateScrollState(false);
+        }
+        // 禁止滚动后切换为滑动
+        if (!enableScrollValue.value && isAtTop.value) {
+            if (refreshing) {
+                // 从完全展开状态(refresherHeight.value)开始计算偏移
+                translateY.value = Math.max(0, Math.min(refresherHeight.value, refresherHeight.value + event.translationY));
+            }
+            else if (event.translationY > 0) {
+                // 非刷新状态下的下拉逻辑保持不变
+                translateY.value = Math.min(event.translationY * 0.6, refresherHeight.value);
+            }
+        }
+    })
+        .onEnd((event) => {
+        'worklet';
+        if (enableScrollValue.value)
+            return;
+        if (refreshing) {
+            // 刷新状态下，根据滑动距离决定是否隐藏
+            // 如果向下滑动没超过 refresherThreshold，就完全隐藏，如果向上滑动完全隐藏
+            if ((event.translationY > 0 && translateY.value < refresherThreshold) || event.translationY < 0) {
+                translateY.value = withTiming(0);
+                updateScrollState(true);
+                runOnJS(runOnJSCallback)('setRefreshing', false);
+            }
+            else {
+                translateY.value = withTiming(refresherHeight.value);
+            }
+        }
+        else if (event.translationY >= refresherHeight.value) {
+            // 触发刷新
+            translateY.value = withTiming(refresherHeight.value);
+            runOnJS(runOnJSCallback)('onRefresh');
+        }
+        else {
+            // 回弹
+            translateY.value = withTiming(0);
+            updateScrollState(true);
+            runOnJS(runOnJSCallback)('setRefreshing', false);
+        }
+    })
+        .simultaneousWithExternalGesture(scrollViewRef);
     const scrollAdditionalProps = extendObject({
-        style: extendObject({}, innerStyle, layoutStyle),
+        style: extendObject(hasOwn(innerStyle, 'flex') || hasOwn(innerStyle, 'flexGrow')
+            ? {}
+            : {
+                flexGrow: 0
+            }, innerStyle, layoutStyle),
         pinchGestureEnabled: false,
         alwaysBounceVertical: false,
         alwaysBounceHorizontal: false,
@@ -312,24 +530,24 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
         scrollsToTop: enableBackToTop,
         showsHorizontalScrollIndicator: scrollX && showScrollbar,
         showsVerticalScrollIndicator: scrollY && showScrollbar,
-        scrollEnabled: scrollX || scrollY,
+        scrollEnabled: !enableScroll ? false : !!(scrollX || scrollY),
+        bounces: false,
+        overScrollMode: 'never',
         ref: scrollViewRef,
-        onScroll: onScroll,
+        onScroll: enableSticky ? scrollHandler : onScroll,
         onContentSizeChange: onContentSizeChange,
-        bindtouchstart: ((enhanced && binddragstart) || bindtouchstart) && onScrollTouchStart,
         bindtouchmove: ((enhanced && binddragging) || bindtouchmove) && onScrollTouchMove,
-        bindtouchend: ((enhanced && binddragend) || bindtouchend) && onScrollTouchEnd,
         onScrollBeginDrag: onScrollDragStart,
-        onScrollEndDrag: onScrollDrag,
+        onScrollEndDrag: onScrollDragEnd,
         onMomentumScrollEnd: onScrollEnd
     }, (simultaneousHandlers ? { simultaneousHandlers } : {}), (waitForHandlers ? { waitFor: waitForHandlers } : {}), layoutProps);
     if (enhanced) {
         Object.assign(scrollAdditionalProps, {
-            bounces,
+            bounces: hasRefresher ? scrollBounces : !!bounces,
             pagingEnabled
         });
     }
-    const innerProps = useInnerProps(props, scrollAdditionalProps, [
+    const innerProps = useInnerProps(extendObject({}, props, scrollAdditionalProps), [
         'id',
         'scroll-x',
         'scroll-y',
@@ -356,17 +574,22 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
         'bindscrolltolower',
         'bindrefresherrefresh'
     ], { layoutRef });
-    const refreshColor = {
-        black: ['#000'],
-        white: ['#fff']
-    };
-    return createElement(ScrollView, extendObject({}, innerProps, {
+    const ScrollViewComponent = enableSticky ? AnimatedScrollView : ScrollView;
+    const withRefresherScrollView = createElement(GestureDetector, { gesture: panGesture }, createElement(ScrollViewComponent, innerProps, createElement(Animated.View, { style: [refresherAnimatedStyle, refresherLayoutStyle], onLayout: onRefresherLayout }, refresherContent), createElement(Animated.View, { style: contentAnimatedStyle }, createElement(ScrollViewContext.Provider, { value: contextValue }, wrapChildren(extendObject({}, props, { children: otherContent }), {
+        hasVarDec,
+        varContext: varContextRef.current,
+        textStyle,
+        textProps
+    })))));
+    const commonScrollView = createElement(ScrollViewComponent, extendObject({}, innerProps, {
         refreshControl: refresherEnabled
             ? createElement(RefreshControl, extendObject({
                 progressBackgroundColor: refresherBackground,
                 refreshing: refreshing,
                 onRefresh: onRefresh
-            }, (refresherDefaultStyle && refresherDefaultStyle !== 'none' ? { colors: refreshColor[refresherDefaultStyle] } : null)))
+            }, refresherDefaultStyle && refresherDefaultStyle !== 'none'
+                ? { colors: refreshColor[refresherDefaultStyle] }
+                : {}))
             : undefined
     }), createElement(ScrollViewContext.Provider, { value: contextValue }, wrapChildren(props, {
         hasVarDec,
@@ -374,6 +597,11 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
         textStyle,
         textProps
     })));
+    let scrollViewComponent = hasRefresher ? withRefresherScrollView : commonScrollView;
+    if (hasPositionFixed) {
+        scrollViewComponent = createElement(Portal, null, scrollViewComponent);
+    }
+    return scrollViewComponent;
 });
 _ScrollView.displayName = 'MpxScrollView';
 export default _ScrollView;

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

@@ -1,11 +1,13 @@
 import { Text } from 'react-native';
 import { createElement } from 'react';
+import useInnerProps from './getInnerListeners';
 import { extendObject } from './utils';
-const _Text2 = (props) => {
-    const { allowFontScaling = false } = props;
-    return createElement(Text, extendObject({}, props, {
+const SimpleText = (props) => {
+    const { allowFontScaling = false, children } = props;
+    const innerProps = useInnerProps(extendObject({}, props, {
         allowFontScaling
     }));
+    return createElement(Text, innerProps, children);
 };
-_Text2.displayName = 'MpxSimpleText';
-export default _Text2;
+SimpleText.displayName = 'MpxSimpleText';
+export default SimpleText;

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

@@ -1,22 +1,18 @@
 import { View } from 'react-native';
-import { createElement, forwardRef, useRef } from 'react';
-import useNodesRef from './useNodesRef';
-import { extendObject, splitProps, splitStyle, wrapChildren } from './utils';
-const _View2 = forwardRef((simpleViewProps, ref) => {
-    const nodeRef = useRef(null);
+import { createElement } from 'react';
+import { splitProps, splitStyle, wrapChildren, extendObject } from './utils';
+import useInnerProps from './getInnerListeners';
+const SimpleView = (simpleViewProps) => {
     const { textProps, innerProps: props = {} } = splitProps(simpleViewProps);
     const { textStyle, innerStyle = {} } = splitStyle(props.style || {});
-    useNodesRef(props, ref, nodeRef, {
-        style: innerStyle || {}
-    });
-    return createElement(View, extendObject({}, props, {
-        style: innerStyle,
-        ref: nodeRef
-    }), wrapChildren(props, {
+    const innerProps = useInnerProps(extendObject({}, props, {
+        style: innerStyle
+    }));
+    return createElement(View, innerProps, wrapChildren(props, {
         hasVarDec: false,
         textStyle: textStyle,
         textProps
     }));
-});
-_View2.displayName = 'MpxSimpleView';
-export default _View2;
+};
+SimpleView.displayName = 'MpxSimpleView';
+export default SimpleView;