@mpxjs/webpack-plugin 2.10.0 → 2.10.1

package/lib/runtime/components/react/dist/event.config.js

@@ -1,3 +1,4 @@
+export const TAP_EVENTS = ['bindtap', 'catchtap', 'capture-bindtap', 'capture-catchtap'];
 const eventConfigMap = {
     bindtap: { bitFlag: '0', events: ['onTouchStart', 'onTouchMove', 'onTouchEnd'] },
     bindlongpress: { bitFlag: '1', events: ['onTouchStart', 'onTouchMove', 'onTouchEnd', 'onTouchCancel'] },

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

@@ -1,7 +1,7 @@
 import { useRef, useMemo } from 'react';
 import { hasOwn, collectDataset } from '@mpxjs/utils';
 import { omit, extendObject, useNavigation } from './utils';
-import eventConfigMap from './event.config';
+import eventConfigMap, { TAP_EVENTS } from './event.config';
 const globalEventState = {
     needPress: true
 };
@@ -136,11 +136,15 @@ function handleTouchmove(e, type, ref, propsRef, config, navigation) {
     ];
     const currentTouchEvent = type === 'bubble' ? bubbleTouchEvent : captureTouchEvent;
     handleEmitEvent(currentTouchEvent, 'touchmove', e, propsRef, config, navigation);
-    checkIsNeedPress(e, type, ref);
+    if (TAP_EVENTS.some(eventName => propsRef.current[eventName])) {
+        checkIsNeedPress(e, type, ref);
+    }
 }
 function handleTouchend(e, type, ref, propsRef, config, navigation) {
     // move event may not be triggered
-    checkIsNeedPress(e, type, ref);
+    if (TAP_EVENTS.some(eventName => propsRef.current[eventName])) {
+        checkIsNeedPress(e, type, ref);
+    }
     const bubbleTouchEvent = ['catchtouchend', 'bindtouchend'];
     const bubbleTapEvent = ['catchtap', 'bindtap'];
     const captureTouchEvent = [

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

@@ -31,8 +31,7 @@
  * ✔ bindscrolltolower
  * ✔ bindscroll
  */
-import { ScrollView } from 'react-native-gesture-handler';
-import { RefreshControl } from 'react-native';
+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';

package/lib/runtime/components/react/event.config.ts

@@ -2,6 +2,8 @@ interface EventConfig {
   [key: string]: string[];
 }
 
+export const TAP_EVENTS = ['bindtap', 'catchtap', 'capture-bindtap', 'capture-catchtap']
+
 const eventConfigMap: { [key: string]: { bitFlag: string; events: string[] } } = {
   bindtap: { bitFlag: '0', events: ['onTouchStart', 'onTouchMove', 'onTouchEnd'] },
   bindlongpress: { bitFlag: '1', events: ['onTouchStart', 'onTouchMove', 'onTouchEnd', 'onTouchCancel'] },

package/lib/runtime/components/react/getInnerListeners.ts

@@ -1,7 +1,7 @@
 import { useRef, useMemo, RefObject } from 'react'
 import { hasOwn, collectDataset } from '@mpxjs/utils'
 import { omit, extendObject, useNavigation } from './utils'
-import eventConfigMap from './event.config'
+import eventConfigMap, { TAP_EVENTS } from './event.config'
 import {
   Props,
   AdditionalProps,
@@ -197,12 +197,16 @@ function handleTouchmove (e: NativeTouchEvent, type: 'bubble' | 'capture', ref:
   const currentTouchEvent =
         type === 'bubble' ? bubbleTouchEvent : captureTouchEvent
   handleEmitEvent(currentTouchEvent, 'touchmove', e, propsRef, config, navigation)
-  checkIsNeedPress(e, type, ref)
+  if (TAP_EVENTS.some(eventName => propsRef.current[eventName])) {
+    checkIsNeedPress(e, type, ref)
+  }
 }
 
 function handleTouchend (e: NativeTouchEvent, type: 'bubble' | 'capture', ref: RefObject<InnerRef>, propsRef: Record<string, any>, config: UseInnerPropsConfig, navigation: Navigation) {
   // move event may not be triggered
-  checkIsNeedPress(e, type, ref)
+  if (TAP_EVENTS.some(eventName => propsRef.current[eventName])) {
+    checkIsNeedPress(e, type, ref)
+  }
   const bubbleTouchEvent = ['catchtouchend', 'bindtouchend']
   const bubbleTapEvent = ['catchtap', 'bindtap']
   const captureTouchEvent = [

package/lib/runtime/components/react/mpx-scroll-view.tsx

@@ -31,8 +31,8 @@
  * ✔ bindscrolltolower
  * ✔ bindscroll
  */
-import { ScrollView } from 'react-native-gesture-handler'
-import { View, RefreshControl, NativeSyntheticEvent, NativeScrollEvent, LayoutChangeEvent, ViewStyle } from 'react-native'
+import { ScrollView, RefreshControl } from 'react-native-gesture-handler'
+import { View, NativeSyntheticEvent, NativeScrollEvent, LayoutChangeEvent, ViewStyle } from 'react-native'
 import { JSX, ReactNode, RefObject, useRef, useState, useEffect, forwardRef, useContext, createElement, useMemo } from 'react'
 import { useAnimatedRef } from 'react-native-reanimated'
 import { warn } from '@mpxjs/utils'

package/lib/template-compiler/compiler.js

@@ -1832,9 +1832,13 @@ function processRefReact (el, meta) {
       selectors.push({ prefix: '', selector: `"${refConf.key}"` })
     }
     const selectorsConf = selectors.map(item => `["${item.prefix}", ${item.selector}]`)
+    const refFnId = forScopes.reduce((preV, curV) => {
+      return `${preV} + "_" + ${curV.index}`
+    }, `"ref_fn_${++refId}"`)
+
     addAttrs(el, [{
       name: 'ref',
-      value: `{{ this.__getRefVal('${type}', [${selectorsConf}], 'ref_fn_${++refId}') }}`
+      value: `{{ this.__getRefVal('${type}', [${selectorsConf}], ${refFnId}) }}`
     }])
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -84,7 +84,7 @@
   "devDependencies": {
     "@ant-design/react-native": "^5.2.2",
     "@d11/react-native-fast-image": "^8.6.12",
-    "@mpxjs/api-proxy": "^2.10.0",
+    "@mpxjs/api-proxy": "^2.10.1",
     "@types/babel-traverse": "^6.25.4",
     "@types/babel-types": "^7.0.4",
     "@types/react": "^18.2.79",
@@ -101,5 +101,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "d9f3e76c6367341e4fc168b37f063c41f7321a7c"
+  "gitHead": "7e4f9ab5528f1ab0ae08fdfad1bfbbb445088848"
 }