@mpxjs/webpack-plugin 2.10.11 → 2.10.13-beta.1

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

@@ -71,7 +71,7 @@ const easeMap = {
     easeInOutCubic: Easing.inOut(Easing.cubic)
 };
 const SwiperWrapper = forwardRef((props, ref) => {
-    const { 'indicator-dots': showPagination, 'indicator-color': dotColor = 'rgba(0, 0, 0, .3)', 'indicator-active-color': activeDotColor = '#000000', 'enable-var': enableVar = false, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, 'external-var-context': externalVarContext, 'simultaneous-handlers': originSimultaneousHandlers = [], 'wait-for': waitFor = [], style = {}, autoplay = false, circular = false, disableGesture = false } = props;
+    const { 'indicator-dots': showPagination, 'indicator-color': dotColor = 'rgba(0, 0, 0, .3)', 'indicator-active-color': activeDotColor = '#000000', 'enable-var': enableVar = false, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, 'external-var-context': externalVarContext, 'simultaneous-handlers': originSimultaneousHandlers = [], 'wait-for': waitFor = [], style = {}, autoplay = false, circular = false, disableGesture = false, bindchange } = props;
     const easeingFunc = props['easing-function'] || 'default';
     const easeDuration = props.duration || 500;
     const horizontal = props.vertical !== undefined ? !props.vertical : true;
@@ -117,14 +117,13 @@ const SwiperWrapper = forwardRef((props, ref) => {
     // 记录元素的偏移量
     const offset = useSharedValue(getOffset(props.current || 0, initStep));
     const strAbso = 'absolute' + dir.toUpperCase();
+    const strVelocity = 'velocity' + dir.toUpperCase();
     // 标识手指触摸和抬起, 起点在onBegin
     const touchfinish = useSharedValue(true);
     // 记录上一帧的绝对定位坐标
     const preAbsolutePos = useSharedValue(0);
     // 记录从onBegin 到 onTouchesUp 时移动的距离
     const moveTranstion = useSharedValue(0);
-    // 记录从onBegin 到 onTouchesUp 的时间
-    const moveTime = useSharedValue(0);
     const timerId = useRef(0);
     const intervalTimer = props.interval || 500;
     const simultaneousHandlers = flatGesture(originSimultaneousHandlers);
@@ -329,7 +328,7 @@ const SwiperWrapper = forwardRef((props, ref) => {
     function handleSwiperChange(current) {
         if (props.current !== currentIndex.value) {
             const eventData = getCustomEvent('change', {}, { detail: { current, source: 'touch' }, layoutRef: layoutRef });
-            props.bindchange && props.bindchange(eventData);
+            bindchange && bindchange(eventData);
         }
     }
     function getOffset(index, stepValue) {
@@ -373,7 +372,7 @@ const SwiperWrapper = forwardRef((props, ref) => {
     // 1. 用户在当前页切换选中项，动画；用户携带选中index打开到swiper页直接选中不走动画
     useAnimatedReaction(() => currentIndex.value, (newIndex, preIndex) => {
         // 这里必须传递函数名, 直接写()=> {}形式会报 访问了未sharedValue信息
-        if (newIndex !== preIndex && props.bindchange) {
+        if (newIndex !== preIndex && bindchange) {
             runOnJS(handleSwiperChange)(newIndex);
         }
     });
@@ -405,7 +404,11 @@ const SwiperWrapper = forwardRef((props, ref) => {
         }
     }, [children.length]);
     useEffect(() => {
-        updateCurrent(props.current || 0, step.value);
+        // 1. 如果用户在touch的过程中, 外部更新了current以外部为准（小程序表现）
+        // 2. 手指滑动过程中更新索引，外部会把current再传入进来，导致offset直接更新，增加判断不同才更新
+        if (props.current !== currentIndex.value) {
+            updateCurrent(props.current || 0, step.value);
+        }
     }, [props.current]);
     useEffect(() => {
         autoplayShared.value = autoplay;
@@ -427,7 +430,7 @@ const SwiperWrapper = forwardRef((props, ref) => {
         function getTargetPosition(eventData) {
             'worklet';
             // 移动的距离
-            const { translation } = eventData;
+            const { transdir } = eventData;
             let resetOffsetPos = 0;
             let selectedIndex = currentIndex.value;
             // 是否临界点
@@ -435,9 +438,9 @@ const SwiperWrapper = forwardRef((props, ref) => {
             // 真实滚动到的偏移量坐标
             let moveToTargetPos = 0;
             const tmp = !circularShared.value ? 0 : preMarginShared.value;
-            const currentOffset = translation < 0 ? offset.value - tmp : offset.value + tmp;
+            const currentOffset = transdir < 0 ? offset.value - tmp : offset.value + tmp;
             const computedIndex = Math.abs(currentOffset) / step.value;
-            const moveToIndex = translation < 0 ? Math.ceil(computedIndex) : Math.floor(computedIndex);
+            const moveToIndex = transdir < 0 ? Math.ceil(computedIndex) : Math.floor(computedIndex);
             // 实际应该定位的索引值
             if (!circularShared.value) {
                 selectedIndex = moveToIndex;
@@ -470,14 +473,18 @@ const SwiperWrapper = forwardRef((props, ref) => {
         }
         function canMove(eventData) {
             'worklet';
-            const { translation } = eventData;
-            const currentOffset = Math.abs(offset.value);
+            // 旧版：如果在快速多次滑动时，只根据当前的offset判断，会出现offset没超出，加上translation后越界的场景(如在倒数第二个元素快速滑动)
+            // 新版：会加上translation
+            const { translation, transdir } = eventData;
+            const gestureMovePos = offset.value + translation;
             if (!circularShared.value) {
-                if (translation < 0) {
-                    return currentOffset < step.value * (childrenLength.value - 1);
+                // 如果只判断区间，中间非滑动状态(handleResistanceMove)向左滑动，突然改为向右滑动，但是还在非滑动态，本应该可滑动判断为了不可滑动
+                const posEnd = -step.value * (childrenLength.value - 1);
+                if (transdir < 0) {
+                    return gestureMovePos > posEnd;
                 }
                 else {
-                    return currentOffset > 0;
+                    return gestureMovePos < 0;
                 }
             }
             else {
@@ -511,25 +518,16 @@ const SwiperWrapper = forwardRef((props, ref) => {
                 });
             }
         }
-        function handleBackInit() {
-            'worklet';
-            // 微信的效果
-            // 1. 只有一个元素，即使设置了circular，也不会产生循环的效果，2. 可以响应手势，但是会有回弹的效果
-            offset.value = withTiming(0, {
-                duration: easeDuration,
-                easing: easeMap[easeingFunc]
-            });
-        }
         function handleBack(eventData) {
             'worklet';
-            const { translation } = eventData;
+            const { transdir } = eventData;
             // 向右滑动的back:trans < 0， 向左滑动的back: trans < 0
             let currentOffset = Math.abs(offset.value);
             if (circularShared.value) {
-                currentOffset += translation < 0 ? preMarginShared.value : -preMarginShared.value;
+                currentOffset += transdir < 0 ? preMarginShared.value : -preMarginShared.value;
             }
             const curIndex = currentOffset / step.value;
-            const moveToIndex = (translation < 0 ? Math.floor(curIndex) : Math.ceil(curIndex)) - patchElmNumShared.value;
+            const moveToIndex = (transdir < 0 ? Math.floor(curIndex) : Math.ceil(curIndex)) - patchElmNumShared.value;
             const targetOffset = -(moveToIndex + patchElmNumShared.value) * step.value + (circularShared.value ? preMarginShared.value : 0);
             offset.value = withTiming(targetOffset, {
                 duration: easeDuration,
@@ -541,65 +539,111 @@ const SwiperWrapper = forwardRef((props, ref) => {
                 }
             });
         }
-        function handleLongPress() {
+        // 当前的offset和index多对应的offset进行对比，判断是否超过一半
+        function computeHalf(eventData) {
             'worklet';
+            const { transdir } = eventData;
             const currentOffset = Math.abs(offset.value);
             let preOffset = (currentIndex.value + patchElmNumShared.value) * step.value;
             if (circularShared.value) {
                 preOffset -= preMarginShared.value;
             }
-            // 正常事件中拿到的transition值(正向滑动<0，倒着滑>0)
+            // 正常事件中拿到的translation值(正向滑动<0，倒着滑>0)
             const diffOffset = preOffset - currentOffset;
             const half = Math.abs(diffOffset) > step.value / 2;
+            const isTriggerUpdateHalf = (transdir < 0 && currentOffset < preOffset) || (transdir > 0 && currentOffset > preOffset);
+            return {
+                diffOffset,
+                half,
+                isTriggerUpdateHalf
+            };
+        }
+        function handleLongPress(eventData) {
+            'worklet';
+            const { diffOffset, half, isTriggerUpdateHalf } = computeHalf(eventData);
             if (+diffOffset === 0) {
                 runOnJS(resumeLoop)();
             }
+            else if (isTriggerUpdateHalf) {
+                // 如果触发了onUpdate时的索引变更，则直接以update时的index为准
+                const targetIndex = !circularShared.value ? currentIndex.value : currentIndex.value + patchElmNumShared.value - 1;
+                offset.value = withTiming(-targetIndex * step.value, {
+                    duration: easeDuration,
+                    easing: easeMap[easeingFunc]
+                }, () => {
+                    if (touchfinish.value !== false) {
+                        currentIndex.value = targetIndex;
+                        runOnJS(resumeLoop)();
+                    }
+                });
+            }
             else if (half) {
-                handleEnd({ translation: diffOffset });
+                handleEnd(eventData);
             }
             else {
-                handleBack({ translation: diffOffset });
+                handleBack(eventData);
             }
         }
         function reachBoundary(eventData) {
             'worklet';
-            // 移动的距离
+            // 1. 基于当前的offset和translation判断是否超过当前边界值
             const { translation } = eventData;
-            const elementsLength = step.value * childrenLength.value;
+            const boundaryStart = -patchElmNumShared.value * step.value;
+            const boundaryEnd = -(childrenLength.value + patchElmNumShared.value) * step.value;
+            const moveToOffset = offset.value + translation;
             let isBoundary = false;
             let resetOffset = 0;
-            // Y轴向下滚动, transDistance > 0, 向上滚动 < 0 X轴向左滚动, transDistance > 0
-            const currentOffset = offset.value;
-            const moveStep = Math.ceil(translation / elementsLength);
-            if (translation < 0) {
-                const posEnd = (childrenLength.value + patchElmNumShared.value + 1) * step.value;
-                const posReverseEnd = (patchElmNumShared.value - 1) * step.value;
-                if (currentOffset < -posEnd + step.value) {
-                    isBoundary = true;
-                    resetOffset = Math.abs(moveStep) === 0 ? patchElmNumShared.value * step.value + translation : moveStep * elementsLength;
-                }
-                if (currentOffset > -posReverseEnd) {
-                    isBoundary = true;
-                    resetOffset = moveStep * elementsLength;
-                }
+            if (moveToOffset < boundaryEnd) {
+                isBoundary = true;
+                // 超过边界的距离
+                const exceedLength = Math.abs(moveToOffset) - Math.abs(boundaryEnd);
+                // 计算对标正常元素所在的offset
+                resetOffset = patchElmNumShared.value * step.value + exceedLength;
             }
-            else if (translation > 0) {
-                const posEnd = (patchElmNumShared.value - 1) * step.value;
-                const posReverseEnd = (patchElmNumShared.value + childrenLength.value) * step.value;
-                if (currentOffset > -posEnd) {
-                    isBoundary = true;
-                    resetOffset = moveStep * elementsLength + step.value + (moveStep === 1 ? translation : 0);
-                }
-                if (currentOffset < -posReverseEnd) {
-                    isBoundary = true;
-                    resetOffset = moveStep * elementsLength + patchElmNumShared.value * step.value;
-                }
+            if (moveToOffset > boundaryStart) {
+                isBoundary = true;
+                // 超过边界的距离
+                const exceedLength = Math.abs(boundaryStart) - Math.abs(moveToOffset);
+                // 计算对标正常元素所在的offset
+                resetOffset = (patchElmNumShared.value + childrenLength.value - 1) * step.value + (step.value - exceedLength);
             }
             return {
                 isBoundary,
                 resetOffset: -resetOffset
             };
         }
+        // 非循环超出边界，应用阻力; 开始滑动少阻力小，滑动越长阻力越大
+        function handleResistanceMove(eventData) {
+            'worklet';
+            const { translation, transdir } = eventData;
+            const moveToOffset = offset.value + translation;
+            const maxOverDrag = Math.floor(step.value / 2);
+            const maxOffset = translation < 0 ? -(childrenLength.value - 1) * step.value : 0;
+            let resistance = 0.1;
+            let overDrag = 0;
+            let finalOffset = 0;
+            // 向右向下小于0, 向左向上大于0；
+            if (transdir < 0) {
+                overDrag = Math.abs(moveToOffset - maxOffset);
+            }
+            else {
+                overDrag = Math.abs(moveToOffset);
+            }
+            // 滑动越多resistance越小
+            resistance = 1 - overDrag / maxOverDrag;
+            // 确保阻力在合理范围内
+            resistance = Math.min(0.5, resistance);
+            // 限制在最大拖拽范围内
+            if (transdir < 0) {
+                const adjustOffset = offset.value + translation * resistance;
+                finalOffset = Math.max(adjustOffset, maxOffset - maxOverDrag);
+            }
+            else {
+                const adjustOffset = offset.value + translation * resistance;
+                finalOffset = Math.min(adjustOffset, maxOverDrag);
+            }
+            return finalOffset;
+        }
         const gesturePan = Gesture.Pan()
             .onBegin((e) => {
             'worklet';
@@ -610,21 +654,42 @@ const SwiperWrapper = forwardRef((props, ref) => {
             runOnJS(pauseLoop)();
             preAbsolutePos.value = e[strAbso];
             moveTranstion.value = e[strAbso];
-            moveTime.value = new Date().getTime();
         })
-            .onTouchesMove((e) => {
+            .onUpdate((e) => {
             'worklet';
             if (touchfinish.value)
                 return;
-            const touchEventData = e.changedTouches[0];
-            const moveDistance = touchEventData[strAbso] - preAbsolutePos.value;
+            const moveDistance = e[strAbso] - preAbsolutePos.value;
             const eventData = {
-                translation: moveDistance
+                translation: moveDistance,
+                transdir: moveDistance !== 0 ? moveDistance : e[strAbso] - moveTranstion.value
             };
-            // 处理用户一直拖拽到临界点的场景, 不会执行onEnd
-            if (!circularShared.value && !canMove(eventData)) {
+            // 1. 支持滑动中超出一半更新索引的能力：只更新索引并不会影响onFinalize依据当前offset计算的索引
+            const { half } = computeHalf(eventData);
+            if (childrenLength.value > 1 && half) {
+                const { selectedIndex } = getTargetPosition(eventData);
+                currentIndex.value = selectedIndex;
+            }
+            // 2. 非循环: 处理用户一直拖拽到临界点的场景,如果放到onFinalize无法阻止offset.value更新为越界的值
+            if (!circularShared.value) {
+                if (canMove(eventData)) {
+                    offset.value = moveDistance + offset.value;
+                }
+                else {
+                    const finalOffset = handleResistanceMove(eventData);
+                    offset.value = finalOffset;
+                }
+                preAbsolutePos.value = e[strAbso];
                 return;
             }
+            // 3. 循环更新: 只有一个元素时可滑动，加入阻力
+            if (circularShared.value && childrenLength.value === 1) {
+                const finalOffset = handleResistanceMove(eventData);
+                offset.value = finalOffset;
+                preAbsolutePos.value = e[strAbso];
+                return;
+            }
+            // 4. 循环更新：正常
             const { isBoundary, resetOffset } = reachBoundary(eventData);
             if (childrenLength.value > 1 && isBoundary && circularShared.value) {
                 offset.value = resetOffset;
@@ -632,28 +697,43 @@ const SwiperWrapper = forwardRef((props, ref) => {
             else {
                 offset.value = moveDistance + offset.value;
             }
-            preAbsolutePos.value = touchEventData[strAbso];
+            preAbsolutePos.value = e[strAbso];
         })
-            .onTouchesUp((e) => {
+            .onFinalize((e) => {
             'worklet';
             if (touchfinish.value)
                 return;
-            const touchEventData = e.changedTouches[0];
-            const moveDistance = touchEventData[strAbso] - moveTranstion.value;
             touchfinish.value = true;
+            // 触发过onUpdate正常情况下e[strAbso] - preAbsolutePos.value=0; 未触发过onUpdate的情况下e[strAbso] - preAbsolutePos.value 不为0
+            const moveDistance = e[strAbso] - preAbsolutePos.value;
             const eventData = {
-                translation: moveDistance
+                translation: moveDistance,
+                transdir: moveDistance !== 0 ? moveDistance : e[strAbso] - moveTranstion.value
             };
+            // 1. 只有一个元素：循环 和 非循环状态，都走回弹效果
             if (childrenLength.value === 1) {
-                return handleBackInit();
+                offset.value = withTiming(0, {
+                    duration: easeDuration,
+                    easing: easeMap[easeingFunc]
+                });
+                return;
             }
-            // 用户手指按下起来, 需要计算正确的位置, 比如在滑动过程中突然按下然后起来,需要计算到正确的位置
+            // 2.非循环状态不可移动态：最后一个元素 和 第一个元素
+            // 非循环支持最后元素可滑动能力后，向左快速移动未超过最大可移动范围一半，因为offset为正值，向左滑动handleBack，默认向上取整
+            // 但是在offset大于0时，取0。[-100, 0](back取0), [0, 100](back取1)， 所以handleLongPress里的处理逻辑需要兼容支持，因此这里直接单独处理，不耦合下方公共的判断逻辑。
             if (!circularShared.value && !canMove(eventData)) {
+                if (eventData.transdir < 0) {
+                    handleBack(eventData);
+                }
+                else {
+                    handleEnd(eventData);
+                }
                 return;
             }
-            const strVelocity = moveDistance / (new Date().getTime() - moveTime.value) * 1000;
-            if (Math.abs(strVelocity) < longPressRatio) {
-                handleLongPress();
+            // 3. 非循环状态可移动态、循环状态, 正常逻辑处理
+            const velocity = e[strVelocity];
+            if (Math.abs(velocity) < longPressRatio) {
+                handleLongPress(eventData);
             }
             else {
                 handleEnd(eventData);

package/lib/runtime/components/react/dist/useAnimationHooks.js

@@ -1,6 +1,7 @@
 import { useEffect, useMemo, useRef } from 'react';
 import { Easing, useSharedValue, withTiming, useAnimatedStyle, withSequence, withDelay, makeMutable, cancelAnimation, runOnJS } from 'react-native-reanimated';
 import { error, hasOwn, collectDataset } from '@mpxjs/utils';
+import { useRunOnJSCallback } from './utils';
 // 微信 timingFunction 和 RN Easing 对应关系
 const EasingKey = {
     linear: Easing.linear,
@@ -182,13 +183,19 @@ export default function useAnimationHooks(props) {
             timeStamp: Date.now()
         });
     }
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    const runOnJSCallbackRef = useRef({
+        withTimingCallback
+    });
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    const runOnJSCallback = useRunOnJSCallback(runOnJSCallbackRef);
     // 创建单个animation
     function getAnimation({ key, value }, { delay, duration, easing }, callback) {
         const animation = typeof callback === 'function'
             ? withTiming(value, { duration, easing }, (finished, current) => {
                 callback(finished, current);
                 if (transitionend && finished) {
-                    runOnJS(withTimingCallback)(finished, current, duration);
+                    runOnJS(runOnJSCallback)('withTimingCallback', finished, current, duration);
                 }
             })
             : withTiming(value, { duration, easing });

package/lib/runtime/components/react/dist/utils.jsx

@@ -5,7 +5,6 @@ import { VarContext, ScrollViewContext, RouteContext } from './context';
 import { ExpressionParser, parseFunc, ReplaceSource } from './parser';
 import { initialWindowMetrics } from 'react-native-safe-area-context';
 import FastImage from '@d11/react-native-fast-image';
-import { runOnJS } from 'react-native-reanimated';
 import { Gesture } from 'react-native-gesture-handler';
 export const TEXT_STYLE_REGEX = /color|font.*|text.*|letterSpacing|lineHeight|includeFontPadding|writingDirection/;
 export const PERCENT_REGEX = /^\s*-?\d+(\.\d+)?%\s*$/;
@@ -663,13 +662,11 @@ export function useHover({ enableHover, hoverStartTime, hoverStayTime, disabled
     const gesture = useMemo(() => {
         return Gesture.Pan()
             .onTouchesDown(() => {
-            'worklet';
-            runOnJS(setStartTimer)();
+            setStartTimer();
         })
             .onTouchesUp(() => {
-            'worklet';
-            runOnJS(setStayTimer)();
-        });
+            setStayTimer();
+        }).runOnJS(true);
     }, []);
     if (gestureRef) {
         gesture.simultaneousWithExternalGesture(gestureRef);
@@ -679,3 +676,17 @@ export function useHover({ enableHover, hoverStartTime, hoverStayTime, disabled
         gesture
     };
 }
+export function useRunOnJSCallback(callbackMapRef) {
+    const invokeCallback = useCallback((key, ...args) => {
+        const callback = callbackMapRef.current[key];
+        // eslint-disable-next-line node/no-callback-literal
+        if (isFunction(callback))
+            return callback(...args);
+    }, []);
+    useEffect(() => {
+        return () => {
+            callbackMapRef.current = {};
+        };
+    }, []);
+    return invokeCallback;
+}

package/lib/runtime/components/react/mpx-async-suspense.tsx

@@ -1,6 +1,7 @@
 import { useState, ComponentType, useEffect, useCallback, useRef, ReactNode, createElement } from 'react'
 import { View, Image, StyleSheet, Text, TouchableOpacity } from 'react-native'
 import FastImage from '@d11/react-native-fast-image'
+import { AnyFunc } from './types/common'
 
 const asyncChunkMap = new Map()
 
@@ -136,10 +137,19 @@ const AsyncSuspense: React.FC<AsyncSuspenseProps> = ({
           .catch((e) => {
             if (cancelled) return
             if (type === 'component') {
-              global.onLazyLoadError({
-                type: 'subpackage',
-                subpackage: [chunkName],
-                errMsg: `loadSubpackage: ${e.type}`
+              global.__mpxAppCbs.lazyLoad.forEach((cb: AnyFunc) => {
+                // eslint-disable-next-line node/no-callback-literal
+                cb({
+                  type: 'subpackage',
+                  subpackage: [chunkName],
+                  errMsg: `loadSubpackage: ${e.type}`
+                })
+              })
+            }
+            if (type === 'page' && typeof mpxGlobal.__mpx.config?.rnConfig?.lazyLoadPageErrorHandler === 'function') {
+              mpxGlobal.__mpx.config.rnConfig.lazyLoadPageErrorHandler({
+                subpackage: chunkName,
+                errType: e.type
               })
             }
             loadChunkPromise.current = null