@mpxjs/webpack-plugin 2.10.3 → 2.10.4-beta.3

package/lib/platform/template/wx/component-config/scroll-view.js

@@ -14,6 +14,8 @@ module.exports = function ({ print }) {
   const qqPropLog = print({ platform: 'qq', tag: TAG_NAME, isError: false })
   const androidEventLog = print({ platform: 'android', tag: TAG_NAME, isError: false, type: 'event' })
   const androidPropLog = print({ platform: 'android', tag: TAG_NAME, isError: false })
+  const harmonyEventLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false, type: 'event' })
+  const harmonyPropLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false })
   const iosEventLog = print({ platform: 'ios', tag: TAG_NAME, isError: false, type: 'event' })
   const iosPropLog = print({ platform: 'ios', tag: TAG_NAME, isError: false })
 
@@ -27,6 +29,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-scroll-view'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-scroll-view'
+    },
     ios (tag, { el }) {
       el.isBuiltIn = true
       return 'mpx-scroll-view'
@@ -55,7 +61,8 @@ module.exports = function ({ print }) {
       {
         test: /^(refresher-threshold|enable-passive|scroll-anchoring|using-sticky|fast-deceleration|enable-flex)$/,
         android: androidPropLog,
-        ios: iosPropLog
+        ios: iosPropLog,
+        harmony: harmonyPropLog
       },
       {
         test: /^(refresher-default-style|refresher-background)$/,
@@ -88,7 +95,8 @@ module.exports = function ({ print }) {
       {
         test: /^(refresherpulling|refresherrestore|refresherabort)$/,
         android: androidEventLog,
-        ios: iosEventLog
+        ios: iosEventLog,
+        harmony: harmonyEventLog
       }
     ]
   }

package/lib/platform/template/wx/component-config/swiper-item.js

@@ -8,6 +8,7 @@ module.exports = function ({ print }) {
   const qqPropLog = print({ platform: 'qq', tag: TAG_NAME, isError: false })
   const iosPropLog = print({ platform: 'ios', tag: TAG_NAME, isError: false })
   const androidPropLog = print({ platform: 'android', tag: TAG_NAME, isError: false })
+  const harmonyPropLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false })
 
   return {
     test: TAG_NAME,
@@ -23,12 +24,17 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-swiper-item'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-swiper-item'
+    },
     props: [
       {
         test: /^(item-id)$/,
         ali: aliPropLog,
         ios: iosPropLog,
-        android: androidPropLog
+        android: androidPropLog,
+        harmony: harmonyPropLog
       },
       {
         test: /^(skip-hidden-item-layout)$/,

package/lib/platform/template/wx/component-config/swiper.js

@@ -14,6 +14,8 @@ module.exports = function ({ print }) {
   const iosEventLog = print({ platform: 'ios', tag: TAG_NAME, isError: false, type: 'event' })
   const androidPropLog = print({ platform: 'android', tag: TAG_NAME, isError: false })
   const androidEventLog = print({ platform: 'android', tag: TAG_NAME, isError: false, type: 'event' })
+  const harmonyPropLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false })
+  const harmonyEventLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false, type: 'event' })
 
   return {
     test: TAG_NAME,
@@ -29,6 +31,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-swiper'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-swiper'
+    },
     props: [
       {
         test: /^(display-multiple-items|skip-hidden-item-layout)$/,
@@ -61,7 +67,8 @@ module.exports = function ({ print }) {
       {
         test: /^(display-multiple-items|snap-to-edge|easing-function)$/,
         ios: iosPropLog,
-        android: androidPropLog
+        android: androidPropLog,
+        harmony: harmonyPropLog
       }
     ],
     event: [
@@ -80,12 +87,14 @@ module.exports = function ({ print }) {
         swan: baiduEventLog,
         jd: jdEventLog,
         ios: iosEventLog,
-        android: androidEventLog
+        android: androidEventLog,
+        harmony: harmonyEventLog
       },
       {
         test: /^(animationfinish)$/,
         ios: iosEventLog,
-        android: androidEventLog
+        android: androidEventLog,
+        harmony: harmonyEventLog
       }
     ]
   }

package/lib/platform/template/wx/component-config/switch.js

@@ -18,6 +18,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-switch'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-switch'
+    },
     props: [
       {
         test: /^type$/,

package/lib/platform/template/wx/component-config/text.js

@@ -8,6 +8,7 @@ module.exports = function ({ print }) {
   const qqPropLog = print({ platform: 'qq', tag: TAG_NAME, isError: false })
   const iosPropLog = print({ platform: 'ios', tag: TAG_NAME, isError: false })
   const androidPropLog = print({ platform: 'android', tag: TAG_NAME, isError: false })
+  const harmonyPropLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false })
 
   return {
     test: TAG_NAME,
@@ -24,11 +25,15 @@ module.exports = function ({ print }) {
     },
     ios (tag, { el }) {
       el.isBuiltIn = true
-      return 'mpx-text'
+      return el.isSimple ? 'mpx-simple-text' : 'mpx-text'
     },
     android (tag, { el }) {
       el.isBuiltIn = true
-      return 'mpx-text'
+      return el.isSimple ? 'mpx-simple-text' : 'mpx-text'
+    },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return el.isSimple ? 'mpx-simple-text' : 'mpx-text'
     },
     props: [
       {
@@ -45,7 +50,8 @@ module.exports = function ({ print }) {
       {
         test: /^(space|decode)$/,
         ios: iosPropLog,
-        android: androidPropLog
+        android: androidPropLog,
+        harmony: harmonyPropLog
       },
       {
         test: /^(selectable|space|decode|use-built-in)$/,
@@ -53,6 +59,21 @@ module.exports = function ({ print }) {
           el.isBuiltIn = true
         },
         qa: qaPropLog
+      },
+      {
+        test: /^(is-simple)$/,
+        android (prop, { el }) {
+          el.isSimple = true
+          return false
+        },
+        harmony (prop, { el }) {
+          el.isSimple = true
+          return false
+        },
+        ios (prop, { el }) {
+          el.isSimple = true
+          return false
+        }
       }
     ]
   }

package/lib/platform/template/wx/component-config/textarea.js

@@ -20,6 +20,9 @@ module.exports = function ({ print }) {
   const androidValueLogError = print({ platform: 'android', tag: TAG_NAME, isError: true, type: 'value' })
   const androidPropLog = print({ platform: 'android', tag: TAG_NAME, isError: false })
   const androidEventLog = print({ platform: 'android', tag: TAG_NAME, isError: false, type: 'event' })
+  const harmonyValueLogError = print({ platform: 'harmony', tag: TAG_NAME, isError: true, type: 'value' })
+  const harmonyPropLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false })
+  const harmonyEventLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false, type: 'event' })
 
   return {
     test: TAG_NAME,
@@ -36,6 +39,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-textarea'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-textarea'
+    },
     props: [
       {
         test: /^(auto-focus|fixed|cursor-spacing|cursor|show-confirm-bar|selection-start|selection-end|adjust-position|hold-keyboard|disable-default-padding|confirm-type)$/,
@@ -75,12 +82,19 @@ module.exports = function ({ print }) {
           if (notSupported.includes(value)) {
             androidValueLogError({ name, value })
           }
+        },
+        harmony ({ name, value }) {
+          const notSupported = ['return']
+          if (notSupported.includes(value)) {
+            harmonyValueLogError({ name, value })
+          }
         }
       },
       {
         test: /^(always-embed|hold-keyboard|disable-default-padding|adjust-keyboard-to|fixed|show-confirm-bar)$/,
         ios: iosPropLog,
-        android: androidPropLog
+        android: androidPropLog,
+        harmony: harmonyPropLog
       }
     ],
     event: [
@@ -109,7 +123,8 @@ module.exports = function ({ print }) {
       {
         test: /^keyboard.+$/,
         ios: iosEventLog,
-        android: androidEventLog
+        android: androidEventLog,
+        harmony: harmonyEventLog
       }
     ]
   }

package/lib/platform/template/wx/component-config/unsupported.js

@@ -26,6 +26,7 @@ module.exports = function ({ print }) {
   const qaUnsupportedTagError = print({ platform: 'qa', isError: true, type: 'tag' })
   const iosUnsupportedTagError = print({ platform: 'ios', isError: true, type: 'tag' })
   const androidUnsupportedTagError = print({ platform: 'android', isError: true, type: 'tag' })
+  const harmonyUnsupportedTagError = print({ platform: 'harmony', isError: true, type: 'tag' })
 
   const aliUnsupportedExp = new RegExp('^(' + ALI_UNSUPPORTED_TAG_NAME_ARR.join('|') + ')$')
   const baiduUnsupportedExp = new RegExp('^(' + BAIDU_UNSUPPORTED_TAG_NAME_ARR.join('|') + ')$')
@@ -35,6 +36,7 @@ module.exports = function ({ print }) {
   const qaUnsupportedExp = new RegExp('^(' + QA_UNSUPPORTED_TAG_NAME_ARR.join('|') + ')$')
   const iosUnsupportedExp = new RegExp('^(' + RN_UNSUPPORTED_TAG_NAME_ARR.join('|') + ')$')
   const androidUnsupportedExp = new RegExp('^(' + RN_UNSUPPORTED_TAG_NAME_ARR.join('|') + ')$')
+  const harmonyUnsupportedExp = new RegExp('^(' + RN_UNSUPPORTED_TAG_NAME_ARR.join('|') + ')$')
 
   return [
     {
@@ -76,6 +78,11 @@ module.exports = function ({ print }) {
       supportedModes: ['android'],
       test: androidUnsupportedExp,
       android: androidUnsupportedTagError
+    },
+    {
+      supportedModes: ['harmony'],
+      test: harmonyUnsupportedExp,
+      harmony: harmonyUnsupportedTagError
     }
   ]
 }

package/lib/platform/template/wx/component-config/video.js

@@ -15,6 +15,8 @@ module.exports = function ({ print }) {
   const iosEventLogError = print({ platform: 'ios', tag: TAG_NAME, isError: false, type: 'event' })
   const androidPropLog = print({ platform: 'android', tag: TAG_NAME, isError: false })
   const androidEventLogError = print({ platform: 'android', tag: TAG_NAME, isError: false, type: 'event' })
+  const harmonyPropLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false })
+  const harmonyEventLogError = print({ platform: 'harmony', tag: TAG_NAME, isError: false, type: 'event' })
   return {
     test: TAG_NAME,
     web (tag, { el }) {
@@ -25,6 +27,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-video'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-video'
+    },
     ios (tag, { el }) {
       el.isBuiltIn = true
       return 'mpx-video'
@@ -66,7 +72,8 @@ module.exports = function ({ print }) {
       },
       {
         test: /^(duration|enable-danmu|danmu-btn|page-gesture|direction|show-progress|show-fullscreen-btn|show-center-play-btn|enable-progress-gesture|show-mute-btn|title|play-btn-position|enable-play-gesture|auto-pause-if-navigate|auto-pause-if-open-native|vslide-gesture|vslide-gesture-in-fullscreen|show-bottom-progress|ad-unit-id|poster-for-crawler|show-casting-button|picture-in-picture-mode|picture-in-picture-show-progress| picture-in-picture-init-position|enable-auto-rotation|show-snapshot-button|show-screen-lock-button|show-background-playback-button|background-poster|referrer-policy|is-live)$/,
-        android: androidPropLog
+        android: androidPropLog,
+        harmony: harmonyPropLog
       }
     ],
     event: [
@@ -108,7 +115,8 @@ module.exports = function ({ print }) {
       },
       {
         test: /^(progress|enterpictureinpicture|leavepictureinpicture|castinguserselect|castingstatechange|castinginterrupt)$/,
-        android: androidEventLogError
+        android: androidEventLogError,
+        harmony: harmonyEventLogError
       }
     ]
   }

package/lib/platform/template/wx/component-config/view.js

@@ -5,6 +5,7 @@ module.exports = function ({ print }) {
   const qaEventLogError = print({ platform: 'qa', tag: TAG_NAME, isError: false, type: 'event' })
   const iosPropLog = print({ platform: 'ios', tag: TAG_NAME, isError: false })
   const androidPropLog = print({ platform: 'android', tag: TAG_NAME, isError: false })
+  const harmonyPropLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false })
 
   return {
     // 匹配标签名，可传递正则
@@ -31,6 +32,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return el.isSimple ? 'mpx-simple-view' : 'mpx-view'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return el.isSimple ? 'mpx-simple-view' : 'mpx-view'
+    },
     qa (tag) {
       return 'div'
     },
@@ -46,13 +51,18 @@ module.exports = function ({ print }) {
       }, {
         test: /^(hover-stop-propagation)$/,
         android: androidPropLog,
-        ios: iosPropLog
+        ios: iosPropLog,
+        harmony: harmonyPropLog
       }, {
         test: /^(is-simple)$/,
         android (prop, { el }) {
           el.isSimple = true
           return false
         },
+        harmony (prop, { el }) {
+          el.isSimple = true
+          return false
+        },
         ios (prop, { el }) {
           el.isSimple = true
           return false

package/lib/platform/template/wx/component-config/web-view.js

@@ -14,6 +14,10 @@ module.exports = function () {
     android (tag, { el }) {
       el.isBuiltIn = true
       return 'mpx-web-view'
+    },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-web-view'
     }
   }
 }

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

@@ -8,8 +8,43 @@ const normalize = require('../../../utils/normalize')
 const { dash2hump } = require('../../../utils/hump-dash')
 
 module.exports = function getSpec ({ warn, error }) {
+  function getRnDirectiveEventHandle (mode) {
+    return function ({ name, value }, { eventRules, el }) {
+      const match = this.test.exec(name)
+      const prefix = match[1]
+      const eventName = match[2]
+      const modifierStr = match[3] || ''
+      const meta = {
+        modifierStr
+      }
+      const rPrefix = runRules(spec.event.prefix, prefix, { mode })
+      const rEventName = runRules(eventRules, eventName, { mode, data: { el } })
+      return {
+        name: rPrefix + rEventName + meta.modifierStr,
+        value
+      }
+    }
+  }
+
+  function rnEventRulesHandle (eventName) {
+    const eventMap = {
+      tap: 'tap',
+      longtap: 'longpress',
+      longpress: 'longpress',
+      touchstart: 'touchstart',
+      touchmove: 'touchmove',
+      touchend: 'touchend',
+      touchcancel: 'touchcancel'
+    }
+    if (eventMap[eventName]) {
+      return eventMap[eventName]
+    } else {
+      error(`React native environment does not support [${eventName}] event!`)
+    }
+  }
+
   const spec = {
-    supportedModes: ['ali', 'swan', 'qq', 'tt', 'web', 'qa', 'jd', 'dd', 'ios', 'android'],
+    supportedModes: ['ali', 'swan', 'qq', 'tt', 'web', 'qa', 'jd', 'dd', 'ios', 'android', 'harmony'],
     // props预处理
     preProps: [],
     // props后处理
@@ -347,18 +382,6 @@ module.exports = function getSpec ({ warn, error }) {
             value
           }
         },
-        // tt ({ name, value }, { eventRules }) {
-        //   const match = this.test.exec(name)
-        //   const prefix = match[1]
-        //   const eventName = match[2]
-        //   const modifierStr = match[3] || ''
-        //   const rEventName = runRules(eventRules, eventName, { mode: 'tt' })
-        //   return {
-        //     // 字节将所有事件转为小写
-        //     name: prefix + rEventName.toLowerCase() + modifierStr,
-        //     value
-        //   }
-        // },
         tt ({ name, value }, { eventRules }) {
           const match = this.test.exec(name)
           const prefix = match[1]
@@ -401,36 +424,9 @@ module.exports = function getSpec ({ warn, error }) {
             value
           }
         },
-        ios ({ name, value }, { eventRules, el }) {
-          const match = this.test.exec(name)
-          const prefix = match[1]
-          const eventName = match[2]
-          const modifierStr = match[3] || ''
-          const meta = {
-            modifierStr
-          }
-          const rPrefix = runRules(spec.event.prefix, prefix, { mode: 'ios' })
-          const rEventName = runRules(eventRules, eventName, { mode: 'ios', data: { el } })
-          return {
-            name: rPrefix + rEventName + meta.modifierStr,
-            value
-          }
-        },
-        android ({ name, value }, { eventRules, el }) {
-          const match = this.test.exec(name)
-          const prefix = match[1]
-          const eventName = match[2]
-          const modifierStr = match[3] || ''
-          const meta = {
-            modifierStr
-          }
-          const rPrefix = runRules(spec.event.prefix, prefix, { mode: 'android' })
-          const rEventName = runRules(eventRules, eventName, { mode: 'android', data: { el } })
-          return {
-            name: rPrefix + rEventName + meta.modifierStr,
-            value
-          }
-        }
+        ios: getRnDirectiveEventHandle('ios'),
+        android: getRnDirectiveEventHandle('android'),
+        harmony: getRnDirectiveEventHandle('harmony')
       },
       // 无障碍
       {
@@ -534,38 +530,9 @@ module.exports = function getSpec ({ warn, error }) {
               error(`Web environment does not support [${eventName}] event!`)
             }
           },
-          ios (eventName) {
-            const eventMap = {
-              tap: 'tap',
-              longtap: 'longpress',
-              longpress: 'longpress',
-              touchstart: 'touchstart',
-              touchmove: 'touchmove',
-              touchend: 'touchend',
-              touchcancel: 'touchcancel'
-            }
-            if (eventMap[eventName]) {
-              return eventMap[eventName]
-            } else {
-              error(`React native environment does not support [${eventName}] event!`)
-            }
-          },
-          android (eventName) {
-            const eventMap = {
-              tap: 'tap',
-              longtap: 'longpress',
-              longpress: 'longpress',
-              touchstart: 'touchstart',
-              touchmove: 'touchmove',
-              touchend: 'touchend',
-              touchcancel: 'touchcancel'
-            }
-            if (eventMap[eventName]) {
-              return eventMap[eventName]
-            } else {
-              error(`React native environment does not support [${eventName}] event!`)
-            }
-          }
+          ios: rnEventRulesHandle,
+          android: rnEventRulesHandle,
+          harmony: rnEventRulesHandle
         },
         // web event escape
         {

package/lib/react/processJSON.js

@@ -113,13 +113,14 @@ module.exports = function (jsonContent, {
   }
 
   if (ctorType === 'page') {
-    const keysToExtract = ['navigationStyle']
+    // const keysToExtract = ['navigationStyle']
     const configObj = {}
-    keysToExtract.forEach(key => {
-      if (jsonObj[key]) {
-        configObj[key] = jsonObj[key]
-      }
-    })
+    // 暂时先不注入数据，后续如需要使用再用
+    // keysToExtract.forEach(key => {
+    //   if (jsonObj[key]) {
+    //     configObj[key] = jsonObj[key]
+    //   }
+    // })
     loaderContext._module.addPresentationalDependency(new RecordPageConfigsMapDependency(parseRequest(loaderContext.resource).resourcePath, configObj))
   }
 

package/lib/react/processScript.js

@@ -17,7 +17,6 @@ module.exports = function (script, {
   genericsInfo
 }, callback) {
   let scriptSrcMode = srcMode
-  const mode = loaderContext.getMpx().mode
   if (script) {
     scriptSrcMode = script.mode || scriptSrcMode
   } else {
@@ -28,23 +27,7 @@ module.exports = function (script, {
   if (ctorType === 'app') {
     output += `
 import { getComponent } from ${stringifyRequest(loaderContext, optionProcessorPath)}
-import { NavigationContainer, StackActions } from '@react-navigation/native'
-${mode === 'ios' ? "import { createNativeStackNavigator as createStackNavigator } from '@react-navigation/native-stack'" : "import { createStackNavigator } from '@react-navigation/stack'"}
-import PortalHost from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/mpx-portal/portal-host'
-import { useHeaderHeight } from '@react-navigation/elements';
-import { SafeAreaProvider, useSafeAreaInsets } from 'react-native-safe-area-context'
-import { GestureHandlerRootView } from 'react-native-gesture-handler'
-
-global.__navigationHelper = {
-  NavigationContainer: NavigationContainer,
-  createStackNavigator: createStackNavigator,
-  useHeaderHeight: useHeaderHeight,
-  StackActions: StackActions,
-  GestureHandlerRootView: GestureHandlerRootView,
-  PortalHost: PortalHost,
-  SafeAreaProvider: SafeAreaProvider,
-  useSafeAreaInsets: useSafeAreaInsets
-}\n`
+\n`
     const { pagesMap, firstPage } = buildPagesMap({
       localPagesMap,
       loaderContext,

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

@@ -1,4 +1,5 @@
 export const TAP_EVENTS = ['bindtap', 'catchtap', 'capture-bindtap', 'capture-catchtap'];
+export const LONGPRESS_EVENTS = ['bindlongpress', 'catchlongpress', 'capture-bindlongpress', 'capture-catchlongpress'];
 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, { TAP_EVENTS } from './event.config';
+import eventConfigMap, { TAP_EVENTS, LONGPRESS_EVENTS } from './event.config';
 const globalEventState = {
     needPress: true
 };
@@ -74,8 +74,23 @@ function handleEmitEvent(events, type, oe, propsRef, config, navigation) {
     events.forEach((event) => {
         if (propsRef.current[event]) {
             const match = /^(catch|capture-catch):?(.*?)(?:\.(.*))?$/.exec(event);
+            // 检查是否已经被上层的 catch 阻止
+            if ((type === 'tap' || type === 'longpress') && oe._stoppedEventTypes?.has(type)) {
+                return;
+            }
             if (match) {
-                oe.stopPropagation();
+                const eventBase = match[2] || '';
+                if (eventBase === 'tap' || eventBase === 'longpress') {
+                    // 为 tap、longpress 添加标记，影响后续的冒泡
+                    if (!oe._stoppedEventTypes) {
+                        oe._stoppedEventTypes = new Set();
+                    }
+                    oe._stoppedEventTypes.add(eventBase);
+                }
+                else {
+                    // 原生 touch 事件使用 stopPropagation
+                    oe.stopPropagation();
+                }
             }
             propsRef.current[event](getTouchEvent(type, oe, propsRef.current, config, navigation));
         }
@@ -116,11 +131,7 @@ function handleTouchstart(e, type, ref, propsRef, config, navigation) {
     const currentTouchEvent = type === 'bubble' ? bubbleTouchEvent : captureTouchEvent;
     const currentPressEvent = type === 'bubble' ? bubblePressEvent : capturePressEvent;
     handleEmitEvent(currentTouchEvent, 'touchstart', e, propsRef, config, navigation);
-    const { catchlongpress, bindlongpress, 'capture-catchlongpress': captureCatchlongpress, 'capture-bindlongpress': captureBindlongpress } = propsRef.current;
-    if (catchlongpress ||
-        bindlongpress ||
-        captureCatchlongpress ||
-        captureBindlongpress) {
+    if (LONGPRESS_EVENTS.some(eventName => propsRef.current[eventName])) {
         ref.current.startTimer[type] = setTimeout(() => {
             // 只要触发过longpress, 全局就不再触发tap
             globalEventState.needPress = false;

package/lib/runtime/components/react/dist/mpx-canvas/index.jsx

@@ -193,7 +193,7 @@ const _Canvas = forwardRef((props = {}, ref) => {
         node: canvasRef.current,
         context: context2D
     });
-    if (Platform.OS === 'android') {
+    if (__mpx_mode__ !== 'ios') {
         const isAndroid9 = Platform.Version >= 28;
         return createElement(View, innerProps, createElement(WebView, {
             ref: (element) => {

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

@@ -0,0 +1,11 @@
+import { Text } from 'react-native';
+import { createElement } from 'react';
+import { extendObject } from './utils';
+const InlineText = (props) => {
+    const { allowFontScaling = false } = props;
+    return createElement(Text, extendObject({}, props, {
+        allowFontScaling
+    }));
+};
+InlineText.displayName = 'MpxInlineText';
+export default InlineText;