@mpxjs/webpack-plugin 2.10.14 → 2.10.15-2

package/lib/index.js

@@ -199,6 +199,7 @@ class MpxWebpackPlugin {
     }, options.nativeConfig)
     options.webConfig = options.webConfig || {}
     options.rnConfig = options.rnConfig || {}
+    options.rnConfig.supportSubpackage = options.rnConfig.supportSubpackage !== undefined ? options.rnConfig.supportSubpackage : true
     options.partialCompileRules = options.partialCompileRules || null
     options.asyncSubpackageRules = options.asyncSubpackageRules || []
     options.optimizeRenderRules = options.optimizeRenderRules ? (Array.isArray(options.optimizeRenderRules) ? options.optimizeRenderRules : [options.optimizeRenderRules]) : []
@@ -1447,7 +1448,10 @@ class MpxWebpackPlugin {
               // 删除root query
               if (queryObj.root) request = addQuery(request, {}, false, ['root'])
               // wx、ali和web平台支持require.async，其余平台使用CommonJsAsyncDependency进行模拟抹平
-              if (mpx.supportRequireAsync) {
+              const supportRequireAsync = isReact(mpx.mode)
+              ? (mpx.supportRequireAsync && this.options.rnConfig.supportSubpackage)
+              : mpx.supportRequireAsync
+              if (supportRequireAsync) {
                 if (isWeb(mpx.mode) || isReact(mpx.mode)) {
                   if (isReact(mpx.mode)) tarRoot = transSubpackage(mpx.transSubpackageRules, tarRoot)
                   request = addQuery(request, {
@@ -1726,6 +1730,23 @@ class MpxWebpackPlugin {
               source.add('// inject pageconfigmap for screen\n' +
                 'var context = (function() { return this })() || Function("return this")();\n')
               source.add(`context.__mpxPageConfigsMap = ${JSON.stringify(mpx.pageConfigsMap)};\n`)
+
+              if (process.env.NODE_ENV !== 'production') {
+                source.add(`
+${globalObject}.__mpxClearAsyncChunkCache = ${globalObject}.__mpxClearAsyncChunkCache || function (ids) {
+  ids = JSON.stringify(ids)
+  var arr = ${globalObject}['${chunkLoadingGlobal}'] || []
+  for (var i = arr.length - 1; i >= 0; i--) {
+    if (JSON.stringify(arr[i][0]) === ids) {
+      arr.splice(i, 1)
+    }
+  }
+};\n`)
+              }
+            } else {
+              if (process.env.NODE_ENV !== 'production') {
+                source.add(`${globalObject}.__mpxClearAsyncChunkCache && ${globalObject}.__mpxClearAsyncChunkCache(${JSON.stringify(chunk.ids)});\n`)
+              }
             }
             source.add(originalSource)
             compilation.assets[chunkFile] = source
@@ -1825,6 +1846,7 @@ try {
 
         compilation.chunkGroups.forEach((chunkGroup) => {
           if (!chunkGroup.isInitial()) {
+            isReact(mpx.mode) && chunkGroup.chunks.forEach((chunk) => processChunk(chunk, false, []))
             return
           }
 

package/lib/platform/style/wx/index.js

@@ -547,6 +547,17 @@ module.exports = function getSpec ({ warn, error }) {
   //   })
   //   return cssMap
   // }
+  const formatBorder = ({ prop, value, selector }, { mode }) => {
+    value = value.trim()
+    if (value === 'none') {
+      return {
+        prop: 'borderWidth',
+        value: 0
+      }
+    } else {
+      return formatAbbreviation({ prop, value, selector }, { mode })
+    }
+  }
 
   return {
     supportedModes: ['ios', 'android', 'harmony'],
@@ -593,6 +604,12 @@ module.exports = function getSpec ({ warn, error }) {
       //   android: formatBoxShadow,
       //   harmony: formatBoxShadow
       // },
+      {
+        test: 'border',
+        ios: formatBorder,
+        android: formatBorder,
+        harmony: formatBorder
+      },
       // 通用的简写格式匹配
       {
         test: new RegExp('^(' + Object.keys(AbbreviationMap).join('|') + ')$'),

package/lib/react/processScript.js

@@ -46,7 +46,8 @@ import { getComponent, getAsyncSuspense } from ${stringifyRequest(loaderContext,
     const componentsMap = buildComponentsMap({
       localComponentsMap,
       loaderContext,
-      jsonConfig
+      jsonConfig,
+      rnConfig
     })
     output += buildGlobalParams({ moduleId, scriptSrcMode, loaderContext, isProduction, ctorType, jsonConfig, componentsMap, pagesMap, firstPage, hasApp })
     output += getRequireScript({ ctorType, script, loaderContext })
@@ -58,7 +59,8 @@ import { getComponent, getAsyncSuspense } from ${stringifyRequest(loaderContext,
       localComponentsMap,
       builtInComponentsMap,
       loaderContext,
-      jsonConfig
+      jsonConfig,
+      rnConfig
     })
 
     output += buildGlobalParams({ moduleId, scriptSrcMode, loaderContext, isProduction, ctorType, jsonConfig, componentsMap, outputPath, genericsInfo, componentGenerics, hasApp })

package/lib/react/script-helper.js

@@ -59,7 +59,7 @@ function buildPagesMap ({ localPagesMap, loaderContext, jsonConfig, rnConfig })
   Object.keys(localPagesMap).forEach((pagePath) => {
     const pageCfg = localPagesMap[pagePath]
     const pageRequest = stringifyRequest(loaderContext, pageCfg.resource)
-    if (pageCfg.async) {
+    if (pageCfg.async && rnConfig.supportSubpackage) {
       const moduleId = mpx.getModuleId(pageCfg.resource)
       const getFallback = rnConfig.asyncChunk && rnConfig.asyncChunk.fallback && getComponentGetter(getComponent(stringifyRequest(loaderContext, addQuery(rnConfig.asyncChunk.fallback, { isComponent: true })), 'PageFallback'))
       const getLoading = rnConfig.asyncChunk && rnConfig.asyncChunk.loading && getComponentGetter(getComponent(stringifyRequest(loaderContext, addQuery(rnConfig.asyncChunk.loading, { isComponent: true })), 'PageLoading'))
@@ -81,14 +81,14 @@ function buildPagesMap ({ localPagesMap, loaderContext, jsonConfig, rnConfig })
   }
 }
 
-function buildComponentsMap ({ localComponentsMap, builtInComponentsMap, loaderContext, jsonConfig }) {
+function buildComponentsMap ({ localComponentsMap, builtInComponentsMap, loaderContext, jsonConfig, rnConfig }) {
   const componentsMap = {}
   const mpx = loaderContext.getMpx()
   if (localComponentsMap) {
     Object.keys(localComponentsMap).forEach((componentName) => {
       const componentCfg = localComponentsMap[componentName]
       const componentRequest = stringifyRequest(loaderContext, componentCfg.resource)
-      if (componentCfg.async) {
+      if (componentCfg.async && rnConfig.supportSubpackage) {
         const moduleId = mpx.getModuleId(componentCfg.resource)
         const placeholder = jsonConfig.componentPlaceholder && jsonConfig.componentPlaceholder[componentName]
         let getFallback

package/lib/runtime/components/react/dist/mpx-async-suspense.jsx

@@ -100,8 +100,8 @@ const AsyncSuspense = ({ type, chunkName, moduleId, innerProps, getLoading, getF
                             });
                         });
                     }
-                    if (type === 'page' && typeof mpxGlobal.__mpx.config?.rnConfig?.lazyLoadPageErrorHandler === 'function') {
-                        mpxGlobal.__mpx.config.rnConfig.lazyLoadPageErrorHandler({
+                    if (type === 'page' && typeof mpxGlobal.__mpx.config?.rnConfig?.onLazyLoadPageError === 'function') {
+                        mpxGlobal.__mpx.config.rnConfig.onLazyLoadPageError({
                             subpackage: chunkName,
                             errType: e.type
                         });

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

@@ -22,7 +22,7 @@ import { StyleSheet } from 'react-native';
 import useInnerProps, { getCustomEvent } from './getInnerListeners';
 import useNodesRef from './useNodesRef';
 import { MovableAreaContext } from './context';
-import { useTransformStyle, splitProps, splitStyle, HIDDEN_STYLE, wrapChildren, flatGesture, extendObject, omit, useNavigation } from './utils';
+import { useTransformStyle, splitProps, splitStyle, HIDDEN_STYLE, wrapChildren, flatGesture, extendObject, omit, useNavigation, useRunOnJSCallback } from './utils';
 import { GestureDetector, Gesture } from 'react-native-gesture-handler';
 import Animated, { useSharedValue, useAnimatedStyle, withDecay, runOnJS, runOnUI, withSpring } from 'react-native-reanimated';
 import { collectDataset, noop } from '@mpxjs/utils';
@@ -106,7 +106,7 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
         const now = Date.now();
         if (now - lastChangeTime.value >= changeThrottleTime) {
             lastChangeTime.value = now;
-            runOnJS(handleTriggerChange)({ x, y, type });
+            runOnJS(runOnJSCallback)('handleTriggerChange', { x, y, type });
         }
     }, [changeThrottleTime]);
     useEffect(() => {
@@ -130,7 +130,7 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
                         : newY;
                 }
                 if (bindchange) {
-                    runOnJS(handleTriggerChange)({
+                    runOnJS(runOnJSCallback)('handleTriggerChange', {
                         x: newX,
                         y: newY,
                         type: 'setData'
@@ -295,13 +295,20 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
         bindtouchend && bindtouchend(e);
         catchtouchend && catchtouchend(e);
     };
+    const runOnJSCallbackRef = useRef({
+        handleTriggerChange,
+        triggerStartOnJS,
+        triggerMoveOnJS,
+        triggerEndOnJS
+    });
+    const runOnJSCallback = useRunOnJSCallback(runOnJSCallbackRef);
     const gesture = useMemo(() => {
         const handleTriggerMove = (e) => {
             'worklet';
             const hasTouchmove = !!bindhtouchmove || !!bindvtouchmove || !!bindtouchmove;
             const hasCatchTouchmove = !!catchhtouchmove || !!catchvtouchmove || !!catchtouchmove;
             if (hasTouchmove || hasCatchTouchmove) {
-                runOnJS(triggerMoveOnJS)({
+                runOnJS(runOnJSCallback)('triggerMoveOnJS', {
                     e,
                     touchEvent: touchEvent.value,
                     hasTouchmove,
@@ -319,7 +326,7 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
                 y: changedTouches.y
             };
             if (bindtouchstart || catchtouchstart) {
-                runOnJS(triggerStartOnJS)({ e });
+                runOnJS(runOnJSCallback)('triggerStartOnJS', { e });
             }
         })
             .onStart(() => {
@@ -376,7 +383,7 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
             isFirstTouch.value = true;
             isMoving.value = false;
             if (bindtouchend || catchtouchend) {
-                runOnJS(triggerEndOnJS)({ e });
+                runOnJS(runOnJSCallback)('triggerEndOnJS', { e });
             }
         })
             .onEnd((e) => {
@@ -405,7 +412,7 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
                             : y;
                     }
                     if (bindchange) {
-                        runOnJS(handleTriggerChange)({
+                        runOnJS(runOnJSCallback)('handleTriggerChange', {
                             x,
                             y
                         });
@@ -423,7 +430,7 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
                     }, () => {
                         xInertialMotion.value = false;
                         if (bindchange) {
-                            runOnJS(handleTriggerChange)({
+                            runOnJS(runOnJSCallback)('handleTriggerChange', {
                                 x: offsetX.value,
                                 y: offsetY.value
                             });
@@ -439,7 +446,7 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
                     }, () => {
                         yInertialMotion.value = false;
                         if (bindchange) {
-                            runOnJS(handleTriggerChange)({
+                            runOnJS(runOnJSCallback)('handleTriggerChange', {
                                 x: offsetX.value,
                                 y: offsetY.value
                             });

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

@@ -157,8 +157,8 @@ const _PickerViewColumn = forwardRef((props, ref) => {
     }, [itemRawH, maxIndex, snapToOffsets, onMomentumScrollEnd, resetScrollPosition]);
     const onScroll = useCallback((e) => {
         // 全局注册的振动触感 hook
-        const pickerVibrate = global.__mpx?.config?.rnConfig?.pickerVibrate;
-        if (typeof pickerVibrate !== 'function') {
+        const onPickerVibrate = global.__mpx?.config?.rnConfig?.onPickerVibrate;
+        if (typeof onPickerVibrate !== 'function') {
             return;
         }
         const { y } = e.nativeEvent.contentOffset;
@@ -172,7 +172,7 @@ const _PickerViewColumn = forwardRef((props, ref) => {
                         y: currentId * itemRawH
                     };
                     // vibrateShort({ type: 'selection' })
-                    pickerVibrate();
+                    onPickerVibrate();
                 }
             }
         }

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

@@ -38,7 +38,7 @@ import Animated, { useSharedValue, withTiming, useAnimatedStyle, runOnJS } from
 import { warn, hasOwn } from '@mpxjs/utils';
 import useInnerProps, { getCustomEvent } from './getInnerListeners';
 import useNodesRef from './useNodesRef';
-import { splitProps, splitStyle, useTransformStyle, useLayout, wrapChildren, extendObject, flatGesture, HIDDEN_STYLE } 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);
@@ -79,6 +79,13 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
     const { normalStyle, hasVarDec, varContextRef, hasSelfPercent, hasPositionFixed, setWidth, setHeight } = useTransformStyle(style, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
     const { textStyle, innerStyle = {} } = splitStyle(normalStyle);
     const scrollViewRef = useRef(null);
+    const runOnJSCallbackRef = useRef({
+        setEnableScroll,
+        setScrollBounces,
+        setRefreshing,
+        onRefresh
+    });
+    const runOnJSCallback = useRunOnJSCallback(runOnJSCallbackRef);
     useNodesRef(props, ref, scrollViewRef, {
         style: normalStyle,
         scrollOffset: scrollOptions,
@@ -285,20 +292,6 @@ 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) {
@@ -312,19 +305,6 @@ 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 });
@@ -340,6 +320,30 @@ 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() {
@@ -404,7 +408,7 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
         'worklet';
         if (enableScrollValue.value !== newValue) {
             enableScrollValue.value = newValue;
-            runOnJS(setEnableScroll)(newValue);
+            runOnJS(runOnJSCallback)('setEnableScroll', newValue);
         }
     }
     const resetScrollState = (value) => {
@@ -415,7 +419,7 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
         'worklet';
         if (bouncesValue.value !== newValue) {
             bouncesValue.value = newValue;
-            runOnJS(setScrollBounces)(newValue);
+            runOnJS(runOnJSCallback)('setScrollBounces', newValue);
         }
     }
     // 处理下拉刷新的手势
@@ -460,7 +464,7 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
             if ((event.translationY > 0 && translateY.value < refresherThreshold) || event.translationY < 0) {
                 translateY.value = withTiming(0);
                 updateScrollState(true);
-                runOnJS(setRefreshing)(false);
+                runOnJS(runOnJSCallback)('setRefreshing', false);
             }
             else {
                 translateY.value = withTiming(refresherHeight.value);
@@ -469,13 +473,13 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
         else if (event.translationY >= refresherHeight.value) {
             // 触发刷新
             translateY.value = withTiming(refresherHeight.value);
-            runOnJS(onRefresh)();
+            runOnJS(runOnJSCallback)('onRefresh');
         }
         else {
             // 回弹
             translateY.value = withTiming(0);
             updateScrollState(true);
-            runOnJS(setRefreshing)(false);
+            runOnJS(runOnJSCallback)('setRefreshing', false);
         }
     })
         .simultaneousWithExternalGesture(scrollViewRef);
@@ -498,11 +502,9 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
         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: onScrollDrag,
+        onScrollEndDrag: onScrollDragEnd,
         onMomentumScrollEnd: onScrollEnd
     }, (simultaneousHandlers ? { simultaneousHandlers } : {}), (waitForHandlers ? { waitFor: waitForHandlers } : {}), layoutProps);
     if (enhanced) {

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

@@ -4,7 +4,7 @@ import Animated, { useAnimatedStyle, useSharedValue, withTiming, Easing, runOnJS
 import React, { forwardRef, useRef, useEffect, useMemo, createElement } from 'react';
 import useInnerProps, { getCustomEvent } from './getInnerListeners';
 import useNodesRef from './useNodesRef'; // 引入辅助函数
-import { useTransformStyle, splitStyle, splitProps, useLayout, wrapChildren, extendObject, flatGesture } from './utils';
+import { useTransformStyle, splitStyle, splitProps, useLayout, wrapChildren, extendObject, flatGesture, useRunOnJSCallback } from './utils';
 import { SwiperContext } from './context';
 import Portal from './mpx-portal';
 /**
@@ -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, bindchange } = 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, current: propCurrent = 0, bindchange } = props;
     const easeingFunc = props['easing-function'] || 'default';
     const easeDuration = props.duration || 500;
     const horizontal = props.vertical !== undefined ? !props.vertical : true;
@@ -112,10 +112,10 @@ const SwiperWrapper = forwardRef((props, ref) => {
     // 每个元素的宽度 or 高度，有固定值直接初始化无则0
     const step = useSharedValue(initStep);
     // 记录选中元素的索引值
-    const currentIndex = useSharedValue(props.current || 0);
+    const currentIndex = useSharedValue(propCurrent);
     // const initOffset = getOffset(props.current || 0, initStep)
     // 记录元素的偏移量
-    const offset = useSharedValue(getOffset(props.current || 0, initStep));
+    const offset = useSharedValue(getOffset(propCurrent, initStep));
     const strAbso = 'absolute' + dir.toUpperCase();
     const strVelocity = 'velocity' + dir.toUpperCase();
     // 标识手指触摸和抬起, 起点在onBegin
@@ -170,7 +170,7 @@ const SwiperWrapper = forwardRef((props, ref) => {
         const iStep = dir === 'x' ? realWidth : realHeight;
         if (iStep !== step.value) {
             step.value = iStep;
-            updateCurrent(props.current || 0, iStep);
+            updateCurrent(propCurrent, iStep);
             updateAutoplay();
         }
     }
@@ -272,7 +272,7 @@ const SwiperWrapper = forwardRef((props, ref) => {
                     easing: easeMap[easeingFunc]
                 }, () => {
                     currentIndex.value = nextIndex;
-                    runOnJS(loop)();
+                    runOnJS(runOnJSCallback)('loop');
                 });
             }
             else {
@@ -288,7 +288,7 @@ const SwiperWrapper = forwardRef((props, ref) => {
                         // 将开始位置设置为真正的位置
                         offset.value = initOffset;
                         currentIndex.value = nextIndex;
-                        runOnJS(loop)();
+                        runOnJS(runOnJSCallback)('loop');
                     });
                 }
                 else {
@@ -300,7 +300,7 @@ const SwiperWrapper = forwardRef((props, ref) => {
                         easing: easeMap[easeingFunc]
                     }, () => {
                         currentIndex.value = nextIndex;
-                        runOnJS(loop)();
+                        runOnJS(runOnJSCallback)('loop');
                     });
                 }
             }
@@ -325,12 +325,19 @@ const SwiperWrapper = forwardRef((props, ref) => {
             resumeLoop
         };
     }, []);
-    function handleSwiperChange(current) {
-        if (props.current !== currentIndex.value) {
+    function handleSwiperChange(current, pCurrent) {
+        if (pCurrent !== currentIndex.value) {
             const eventData = getCustomEvent('change', {}, { detail: { current, source: 'touch' }, layoutRef: layoutRef });
             bindchange && bindchange(eventData);
         }
     }
+    const runOnJSCallbackRef = useRef({
+        loop,
+        pauseLoop,
+        resumeLoop,
+        handleSwiperChange
+    });
+    const runOnJSCallback = useRunOnJSCallback(runOnJSCallbackRef);
     function getOffset(index, stepValue) {
         if (!stepValue)
             return 0;
@@ -348,12 +355,12 @@ const SwiperWrapper = forwardRef((props, ref) => {
         const targetOffset = getOffset(index || 0, stepValue);
         if (targetOffset !== offset.value) {
             // 内部基于props.current!==currentIndex.value决定是否使用动画及更新currentIndex.value
-            if (props.current !== undefined && props.current !== currentIndex.value) {
+            if (propCurrent !== undefined && propCurrent !== currentIndex.value) {
                 offset.value = withTiming(targetOffset, {
                     duration: easeDuration,
                     easing: easeMap[easeingFunc]
                 }, () => {
-                    currentIndex.value = props.current || 0;
+                    currentIndex.value = propCurrent;
                 });
             }
             else {
@@ -373,7 +380,7 @@ const SwiperWrapper = forwardRef((props, ref) => {
     useAnimatedReaction(() => currentIndex.value, (newIndex, preIndex) => {
         // 这里必须传递函数名, 直接写()=> {}形式会报 访问了未sharedValue信息
         if (newIndex !== preIndex && bindchange) {
-            runOnJS(handleSwiperChange)(newIndex);
+            runOnJS(runOnJSCallback)('handleSwiperChange', newIndex, propCurrent);
         }
     });
     useEffect(() => {
@@ -406,10 +413,10 @@ const SwiperWrapper = forwardRef((props, ref) => {
     useEffect(() => {
         // 1. 如果用户在touch的过程中, 外部更新了current以外部为准（小程序表现）
         // 2. 手指滑动过程中更新索引，外部会把current再传入进来，导致offset直接更新，增加判断不同才更新
-        if (props.current !== currentIndex.value) {
-            updateCurrent(props.current || 0, step.value);
+        if (propCurrent !== currentIndex.value) {
+            updateCurrent(propCurrent, step.value);
         }
-    }, [props.current]);
+    }, [propCurrent]);
     useEffect(() => {
         autoplayShared.value = autoplay;
         updateAutoplay();
@@ -502,7 +509,7 @@ const SwiperWrapper = forwardRef((props, ref) => {
                     if (touchfinish.value !== false) {
                         currentIndex.value = selectedIndex;
                         offset.value = resetOffset;
-                        runOnJS(resumeLoop)();
+                        runOnJS(runOnJSCallback)('resumeLoop');
                     }
                 });
             }
@@ -513,7 +520,7 @@ const SwiperWrapper = forwardRef((props, ref) => {
                 }, () => {
                     if (touchfinish.value !== false) {
                         currentIndex.value = selectedIndex;
-                        runOnJS(resumeLoop)();
+                        runOnJS(runOnJSCallback)('resumeLoop');
                     }
                 });
             }
@@ -535,7 +542,7 @@ const SwiperWrapper = forwardRef((props, ref) => {
             }, () => {
                 if (touchfinish.value !== false) {
                     currentIndex.value = moveToIndex;
-                    runOnJS(resumeLoop)();
+                    runOnJS(runOnJSCallback)('resumeLoop');
                 }
             });
         }
@@ -562,20 +569,11 @@ const SwiperWrapper = forwardRef((props, ref) => {
             'worklet';
             const { diffOffset, half, isTriggerUpdateHalf } = computeHalf(eventData);
             if (+diffOffset === 0) {
-                runOnJS(resumeLoop)();
+                runOnJS(runOnJSCallback)('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)();
-                    }
-                });
+                // 如果触发了onUpdate时的索引变更
+                handleEnd(eventData);
             }
             else if (half) {
                 handleEnd(eventData);
@@ -651,15 +649,15 @@ const SwiperWrapper = forwardRef((props, ref) => {
                 return;
             touchfinish.value = false;
             cancelAnimation(offset);
-            runOnJS(pauseLoop)();
+            runOnJS(runOnJSCallback)('pauseLoop');
             preAbsolutePos.value = e[strAbso];
             moveTranstion.value = e[strAbso];
         })
             .onUpdate((e) => {
             'worklet';
-            if (touchfinish.value)
-                return;
             const moveDistance = e[strAbso] - preAbsolutePos.value;
+            if (touchfinish.value || moveDistance === 0)
+                return;
             const eventData = {
                 translation: moveDistance,
                 transdir: moveDistance

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

@@ -146,8 +146,8 @@ const AsyncSuspense: React.FC<AsyncSuspenseProps> = ({
                 })
               })
             }
-            if (type === 'page' && typeof mpxGlobal.__mpx.config?.rnConfig?.lazyLoadPageErrorHandler === 'function') {
-              mpxGlobal.__mpx.config.rnConfig.lazyLoadPageErrorHandler({
+            if (type === 'page' && typeof mpxGlobal.__mpx.config?.rnConfig?.onLazyLoadPageError === 'function') {
+              mpxGlobal.__mpx.config.rnConfig.onLazyLoadPageError({
                 subpackage: chunkName,
                 errType: e.type
               })