@mpxjs/webpack-plugin 2.10.16-perf.1 → 2.10.16-xp.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, current: propCurrent = 0, 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, 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(propCurrent);
+    const currentIndex = useSharedValue(propCurrent || 0);
     // const initOffset = getOffset(props.current || 0, initStep)
     // 记录元素的偏移量
-    const offset = useSharedValue(getOffset(propCurrent, initStep));
+    const offset = useSharedValue(getOffset(propCurrent || 0, 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(propCurrent, iStep);
+            updateCurrent(propCurrent || 0, iStep);
             updateAutoplay();
         }
     }
@@ -414,7 +414,7 @@ const SwiperWrapper = forwardRef((props, ref) => {
         // 1. 如果用户在touch的过程中, 外部更新了current以外部为准（小程序表现）
         // 2. 手指滑动过程中更新索引，外部会把current再传入进来，导致offset直接更新，增加判断不同才更新
         if (propCurrent !== currentIndex.value) {
-            updateCurrent(propCurrent, step.value);
+            updateCurrent(propCurrent || 0, step.value);
         }
     }, [propCurrent]);
     useEffect(() => {
@@ -696,6 +696,10 @@ const SwiperWrapper = forwardRef((props, ref) => {
                 offset.value = moveDistance + offset.value;
             }
             preAbsolutePos.value = e[strAbso];
+        })
+            .onEnd((e) => {
+            // 修复部分安卓机型下onFinalize拿到的absolute值 和 onUpdate不一致的情况，通过onEnd进行修正为最终的位置
+            preAbsolutePos.value = e[strAbso];
         })
             .onFinalize((e) => {
             'worklet';

package/lib/runtime/components/react/mpx-swiper.tsx

@@ -148,7 +148,7 @@ const SwiperWrapper = forwardRef<HandlerRef<View, SwiperProps>, SwiperProps>((pr
     autoplay = false,
     circular = false,
     disableGesture = false,
-    current: propCurrent = 0,
+    current: propCurrent,
     bindchange
   } = props
   const easeingFunc = props['easing-function'] || 'default'
@@ -199,10 +199,10 @@ const SwiperWrapper = forwardRef<HandlerRef<View, SwiperProps>, SwiperProps>((pr
   // 每个元素的宽度 or 高度，有固定值直接初始化无则0
   const step = useSharedValue(initStep)
   // 记录选中元素的索引值
-  const currentIndex = useSharedValue(propCurrent)
+  const currentIndex = useSharedValue(propCurrent || 0)
   // const initOffset = getOffset(props.current || 0, initStep)
   // 记录元素的偏移量
-  const offset = useSharedValue(getOffset(propCurrent, initStep))
+  const offset = useSharedValue(getOffset(propCurrent || 0, initStep))
   const strAbso = 'absolute' + dir.toUpperCase() as StrAbsoType
   const strVelocity = 'velocity' + dir.toUpperCase() as StrVelocityType
   // 标识手指触摸和抬起, 起点在onBegin
@@ -271,7 +271,7 @@ const SwiperWrapper = forwardRef<HandlerRef<View, SwiperProps>, SwiperProps>((pr
     const iStep = dir === 'x' ? realWidth : realHeight
     if (iStep !== step.value) {
       step.value = iStep
-      updateCurrent(propCurrent, iStep)
+      updateCurrent(propCurrent || 0, iStep)
       updateAutoplay()
     }
   }
@@ -520,7 +520,7 @@ const SwiperWrapper = forwardRef<HandlerRef<View, SwiperProps>, SwiperProps>((pr
     // 1. 如果用户在touch的过程中, 外部更新了current以外部为准（小程序表现）
     // 2. 手指滑动过程中更新索引，外部会把current再传入进来，导致offset直接更新，增加判断不同才更新
     if (propCurrent !== currentIndex.value) {
-      updateCurrent(propCurrent, step.value)
+      updateCurrent(propCurrent || 0, step.value)
     }
   }, [propCurrent])
 
@@ -790,6 +790,10 @@ const SwiperWrapper = forwardRef<HandlerRef<View, SwiperProps>, SwiperProps>((pr
         }
         preAbsolutePos.value = e[strAbso]
       })
+      .onEnd((e) => {
+        // 修复部分安卓机型下onFinalize拿到的absolute值 和 onUpdate不一致的情况，通过onEnd进行修正为最终的位置
+        preAbsolutePos.value = e[strAbso]
+      })
       .onFinalize((e: GestureStateChangeEvent<PanGestureHandlerEventPayload>) => {
         'worklet'
         if (touchfinish.value) return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.10.16-perf.1",
+  "version": "2.10.16-xp.1",
   "description": "mpx compile core",
   "keywords": [
     "mpx"