@mpxjs/webpack-plugin 2.9.70-alpha.0 → 2.9.71

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

@@ -9,7 +9,7 @@ const { dash2hump } = require('../../../utils/hump-dash')
 
 module.exports = function getSpec ({ warn, error }) {
   const spec = {
-    supportedModes: ['ali', 'swan', 'qq', 'tt', 'web', 'qa', 'jd', 'dd', 'ios', 'android', 'tenon'],
+    supportedModes: ['ali', 'swan', 'qq', 'tt', 'web', 'qa', 'jd', 'dd', 'ios', 'android'],
     // props预处理
     preProps: [],
     // props后处理
@@ -28,15 +28,6 @@ module.exports = function getSpec ({ warn, error }) {
               value: parsed.result
             }
           }
-        },
-        tenon ({ name, value }) {
-          const parsed = parseMustacheWithContext(value)
-          if (parsed.hasBinding) {
-            return {
-              name: name === 'animation' ? 'v-' + name : ':' + name,
-              value: parsed.result
-            }
-          }
         }
       }
     ],
@@ -99,16 +90,6 @@ module.exports = function getSpec ({ warn, error }) {
             name: 'v-for',
             value: `(${itemName}, ${indexName}) in ${parsed.result}`
           }
-        },
-        tenon ({ value }, { el }) {
-          const parsed = parseMustacheWithContext(value)
-          const attrsMap = el.attrsMap
-          const itemName = attrsMap['wx:for-item'] || 'item'
-          const indexName = attrsMap['wx:for-index'] || 'index'
-          return {
-            name: 'v-for',
-            value: `(${itemName}, ${indexName}) in ${parsed.result}`
-          }
         }
       },
       {
@@ -134,25 +115,6 @@ module.exports = function getSpec ({ warn, error }) {
             name: ':key',
             value
           }
-        },
-        tenon ({ value }, { el }) {
-          // vue的template中不能包含key，对应于小程序中的block
-          if (el.tag === 'block') return false
-          const itemName = el.attrsMap['wx:for-item'] || 'item'
-          const keyName = value
-          if (value === '*this') {
-            value = itemName
-          } else {
-            if (isValidIdentifierStr(keyName)) {
-              value = `${itemName}.${keyName}`
-            } else {
-              value = `${itemName}['${keyName}']`
-            }
-          }
-          return {
-            name: ':key',
-            value
-          }
         }
       },
       {
@@ -163,9 +125,6 @@ module.exports = function getSpec ({ warn, error }) {
         },
         web () {
           return false
-        },
-        tenon () {
-          return false
         }
       },
       {
@@ -208,49 +167,6 @@ module.exports = function getSpec ({ warn, error }) {
               }
             ]
           }
-        },
-        tenon ({ value }, { el }) {
-          el.hasEvent = true
-          const attrsMap = el.attrsMap
-          const tagRE = /\{\{((?:.|\n|\r)+?)\}\}(?!})/
-          const stringify = JSON.stringify
-          const match = tagRE.exec(value)
-          if (match) {
-            const modelProp = attrsMap['wx:model-prop'] || 'value'
-            const modelEvent = attrsMap['wx:model-event'] || 'input'
-            const modelValuePathRaw = attrsMap['wx:model-value-path']
-            const modelValuePath = modelValuePathRaw === undefined ? 'value' : modelValuePathRaw
-            const modelFilter = attrsMap['wx:model-filter']
-            let modelValuePathArr
-            try {
-              modelValuePathArr = JSON5.parse(modelValuePath)
-            } catch (e) {
-              if (modelValuePath === '') {
-                modelValuePathArr = []
-              } else {
-                modelValuePathArr = modelValuePath.split('.')
-              }
-            }
-            const modelValue = match[1].trim()
-            return [
-              {
-                name: ':' + modelProp,
-                value: modelValue
-              },
-              {
-                name: 'mpxModelEvent',
-                value: modelEvent
-              },
-              {
-                name: 'mpxModelEventId',
-                value: Math.random().toString(36).slice(3, 11)
-              },
-              {
-                name: '@mpxModel',
-                value: `__model(${stringifyWithResolveComputed(modelValue)}, $event, ${stringify(modelValuePathArr)}, ${stringify(modelFilter)})`
-              }
-            ]
-          }
         }
       },
       {
@@ -267,12 +183,6 @@ module.exports = function getSpec ({ warn, error }) {
             name: 'ref',
             value: `__mpx_ref_${value}__`
           }
-        },
-        tenon ({ value }) {
-          return {
-            name: 'ref',
-            value: `${value}`
-          }
         }
       },
       {
@@ -322,14 +232,6 @@ module.exports = function getSpec ({ warn, error }) {
               value: classBinding[0]
             }
           }
-        },
-        tenon ({ name, value }) {
-          const dir = this.test.exec(name)[1]
-          const parsed = parseMustacheWithContext(value)
-          return {
-            name: ':' + dir,
-            value: parsed.result
-          }
         }
       },
       // 通用指令
@@ -387,17 +289,6 @@ module.exports = function getSpec ({ warn, error }) {
             name: 'v-' + dir,
             value: parsed.result
           }
-        },
-        tenon ({ name, value }) {
-          let dir = this.test.exec(name)[1]
-          const parsed = parseMustacheWithContext(value)
-          if (dir === 'elif') {
-            dir = 'else-if'
-          }
-          return {
-            name: 'v-' + dir,
-            value: parsed.result
-          }
         }
       },
       // 事件
@@ -493,10 +384,6 @@ module.exports = function getSpec ({ warn, error }) {
           }
         },
         web ({ name, value }, { eventRules, el, usingComponents }) {
-          const parsed = parseMustacheWithContext(value)
-          if (parsed.hasBinding) {
-            value = '__invokeHandler(' + parsed.result + ', $event)'
-          }
           const match = this.test.exec(name)
           const prefix = match[1]
           const eventName = match[2]
@@ -541,23 +428,6 @@ module.exports = function getSpec ({ warn, error }) {
             name: rPrefix + rEventName + meta.modifierStr,
             value
           }
-        },
-        tenon ({ 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
-          }
-          // 记录event监听信息用于后续判断是否需要使用内置基础组件
-          el.hasEvent = true
-          const rPrefix = runRules(spec.event.prefix, prefix, { mode: 'web', meta })
-          const rEventName = runRules(eventRules, eventName, { mode: 'web' })
-          return {
-            name: rPrefix + rEventName + meta.modifierStr,
-            value
-          }
         }
       },
       // 无障碍

package/lib/resolve-loader.js

@@ -1,6 +1,3 @@
 module.exports = function () {
-  return `
-  var currentURL = global.currentPagePath
-  var getRelativePath = require('@mpxjs/webpack-plugin/lib/utils/get-relative-path').getRelativePath
-  module.exports = __mpx_resolve_path__(${JSON.stringify(this.resource)})`
+  return `module.exports = __mpx_resolve_path__(${JSON.stringify(this.resource)})`
 }

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

@@ -33,6 +33,10 @@ export interface IntersectionObserver {
   }
 }
 
+export interface ScrollViewContextValue {
+   gestureRef: React.RefObject<any> | null
+}
+
 export const MovableAreaContext = createContext({ width: 0, height: 0 })
 
 export const FormContext = createContext<FormContextValue | null>(null)
@@ -51,4 +55,8 @@ export const IntersectionObserverContext = createContext<IntersectionObserver |
 
 export const RouteContext = createContext<number | null>(null)
 
+export const SwiperContext = createContext({})
+
 export const KeyboardAvoidContext = createContext<KeyboardAvoidContextValue | null>(null)
+
+export const ScrollViewContext = createContext<ScrollViewContextValue>({ gestureRef: null })

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

@@ -8,4 +8,6 @@ export const PickerContext = createContext(null);
 export const VarContext = createContext({});
 export const IntersectionObserverContext = createContext(null);
 export const RouteContext = createContext(null);
+export const SwiperContext = createContext({});
 export const KeyboardAvoidContext = createContext(null);
+export const ScrollViewContext = createContext({ gestureRef: null });

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

@@ -1,8 +1,13 @@
 import { useRef, useMemo } from 'react';
 import { hasOwn, collectDataset } from '@mpxjs/utils';
+import { useNavigation } from '@react-navigation/native';
 import { omit, extendObject } from './utils';
 import eventConfigMap from './event.config';
-const getTouchEvent = (type, event, props, config) => {
+const globalEventState = {
+    needPress: true
+};
+const getTouchEvent = (type, event, props, config, navigation) => {
+    const { y: navigationY = 0 } = navigation?.layout || {};
     const nativeEvent = event.nativeEvent;
     const { timestamp, pageX, pageY, touches, changedTouches } = nativeEvent;
     const { id } = props;
@@ -25,24 +30,24 @@ const getTouchEvent = (type, event, props, config) => {
         target,
         detail: {
             x: pageX,
-            y: pageY
+            y: pageY - navigationY
         },
         touches: touches.map((item) => {
             return {
                 identifier: item.identifier,
                 pageX: item.pageX,
-                pageY: item.pageY,
-                clientX: item.locationX,
-                clientY: item.locationY
+                pageY: item.pageY - navigationY,
+                clientX: item.pageX,
+                clientY: item.pageY - navigationY
             };
         }),
         changedTouches: changedTouches.map((item) => {
             return {
                 identifier: item.identifier,
                 pageX: item.pageX,
-                pageY: item.pageY,
-                clientX: item.locationX,
-                clientY: item.locationY
+                pageY: item.pageY - navigationY,
+                clientX: item.pageX,
+                clientY: item.pageY - navigationY
             };
         }),
         persist: event.persist,
@@ -66,14 +71,14 @@ export const getCustomEvent = (type = '', oe = {}, { detail = {}, layoutRef }, p
         preventDefault: oe.preventDefault
     });
 };
-function handleEmitEvent(events, type, oe, propsRef, config) {
+function handleEmitEvent(events, type, oe, propsRef, config, navigation) {
     events.forEach((event) => {
         if (propsRef.current[event]) {
             const match = /^(catch|capture-catch):?(.*?)(?:\.(.*))?$/.exec(event);
             if (match) {
                 oe.stopPropagation();
             }
-            propsRef.current[event](getTouchEvent(type, oe, propsRef.current, config));
+            propsRef.current[event](getTouchEvent(type, oe, propsRef.current, config, navigation));
         }
     });
 }
@@ -82,15 +87,15 @@ function checkIsNeedPress(e, type, ref) {
     const nativeEvent = e.nativeEvent;
     const currentPageX = nativeEvent.changedTouches[0].pageX;
     const currentPageY = nativeEvent.changedTouches[0].pageY;
-    if (Math.abs(currentPageX - tapDetailInfo.x) > 1 ||
-        Math.abs(currentPageY - tapDetailInfo.y) > 1) {
-        ref.current.needPress[type] = false;
+    if (Math.abs(currentPageX - tapDetailInfo.x) > 3 ||
+        Math.abs(currentPageY - tapDetailInfo.y) > 3) {
+        globalEventState.needPress = false;
         ref.current.startTimer[type] &&
             clearTimeout(ref.current.startTimer[type]);
         ref.current.startTimer[type] = null;
     }
 }
-function handleTouchstart(e, type, ref, propsRef, config) {
+function handleTouchstart(e, type, ref, propsRef, config, navigation) {
     e.persist();
     const bubbleTouchEvent = ['catchtouchstart', 'bindtouchstart'];
     const bubblePressEvent = ['catchlongpress', 'bindlongpress'];
@@ -103,7 +108,7 @@ function handleTouchstart(e, type, ref, propsRef, config) {
         'capture-bindlongpress'
     ];
     ref.current.startTimer[type] = null;
-    ref.current.needPress[type] = true;
+    globalEventState.needPress = true;
     const nativeEvent = e.nativeEvent;
     ref.current.mpxPressInfo.detail = {
         x: nativeEvent.changedTouches[0].pageX,
@@ -111,29 +116,30 @@ function handleTouchstart(e, type, ref, propsRef, config) {
     };
     const currentTouchEvent = type === 'bubble' ? bubbleTouchEvent : captureTouchEvent;
     const currentPressEvent = type === 'bubble' ? bubblePressEvent : capturePressEvent;
-    handleEmitEvent(currentTouchEvent, 'touchstart', e, propsRef, config);
+    handleEmitEvent(currentTouchEvent, 'touchstart', e, propsRef, config, navigation);
     const { catchlongpress, bindlongpress, 'capture-catchlongpress': captureCatchlongpress, 'capture-bindlongpress': captureBindlongpress } = propsRef.current;
     if (catchlongpress ||
         bindlongpress ||
         captureCatchlongpress ||
         captureBindlongpress) {
         ref.current.startTimer[type] = setTimeout(() => {
-            ref.current.needPress[type] = false;
-            handleEmitEvent(currentPressEvent, 'longpress', e, propsRef, config);
+            // 只要触发过longpress, 全局就不再触发tap
+            globalEventState.needPress = false;
+            handleEmitEvent(currentPressEvent, 'longpress', e, propsRef, config, navigation);
         }, 350);
     }
 }
-function handleTouchmove(e, type, ref, propsRef, config) {
+function handleTouchmove(e, type, ref, propsRef, config, navigation) {
     const bubbleTouchEvent = ['catchtouchmove', 'bindtouchmove'];
     const captureTouchEvent = [
         'capture-catchtouchmove',
         'capture-bindtouchmove'
     ];
     const currentTouchEvent = type === 'bubble' ? bubbleTouchEvent : captureTouchEvent;
-    handleEmitEvent(currentTouchEvent, 'touchmove', e, propsRef, config);
+    handleEmitEvent(currentTouchEvent, 'touchmove', e, propsRef, config, navigation);
     checkIsNeedPress(e, type, ref);
 }
-function handleTouchend(e, type, ref, propsRef, config) {
+function handleTouchend(e, type, ref, propsRef, config, navigation) {
     // move event may not be triggered
     checkIsNeedPress(e, type, ref);
     const bubbleTouchEvent = ['catchtouchend', 'bindtouchend'];
@@ -148,15 +154,15 @@ function handleTouchend(e, type, ref, propsRef, config) {
     ref.current.startTimer[type] &&
         clearTimeout(ref.current.startTimer[type]);
     ref.current.startTimer[type] = null;
-    handleEmitEvent(currentTouchEvent, 'touchend', e, propsRef, config);
-    if (ref.current.needPress[type]) {
+    handleEmitEvent(currentTouchEvent, 'touchend', e, propsRef, config, navigation);
+    if (globalEventState.needPress) {
         if (type === 'bubble' && config.disableTap) {
             return;
         }
-        handleEmitEvent(currentTapEvent, 'tap', e, propsRef, config);
+        handleEmitEvent(currentTapEvent, 'tap', e, propsRef, config, navigation);
     }
 }
-function handleTouchcancel(e, type, ref, propsRef, config) {
+function handleTouchcancel(e, type, ref, propsRef, config, navigation) {
     const bubbleTouchEvent = ['catchtouchcancel', 'bindtouchcancel'];
     const captureTouchEvent = [
         'capture-catchtouchcancel',
@@ -166,10 +172,10 @@ function handleTouchcancel(e, type, ref, propsRef, config) {
     ref.current.startTimer[type] &&
         clearTimeout(ref.current.startTimer[type]);
     ref.current.startTimer[type] = null;
-    handleEmitEvent(currentTouchEvent, 'touchcancel', e, propsRef, config);
+    handleEmitEvent(currentTouchEvent, 'touchcancel', e, propsRef, config, navigation);
 }
 function createTouchEventHandler(eventName, type) {
-    return (e, ref, propsRef, config) => {
+    return (e, ref, propsRef, config, navigation) => {
         const handlerMap = {
             onTouchStart: handleTouchstart,
             onTouchMove: handleTouchmove,
@@ -178,7 +184,7 @@ function createTouchEventHandler(eventName, type) {
         };
         const handler = handlerMap[eventName];
         if (handler) {
-            handler(e, type, ref, propsRef, config);
+            handler(e, type, ref, propsRef, config, navigation);
         }
     };
 }
@@ -198,10 +204,6 @@ const useInnerProps = (props = {}, additionalProps = {}, userRemoveProps = [], r
             bubble: null,
             capture: null
         },
-        needPress: {
-            bubble: false,
-            capture: false
-        },
         mpxPressInfo: {
             detail: {
                 x: 0,
@@ -213,9 +215,9 @@ const useInnerProps = (props = {}, additionalProps = {}, userRemoveProps = [], r
     const eventConfig = {};
     const config = rawConfig || {
         layoutRef: { current: {} },
-        disableTouch: false,
         disableTap: false
     };
+    const navigation = useNavigation();
     const removeProps = [
         'children',
         'enable-background',
@@ -237,10 +239,10 @@ const useInnerProps = (props = {}, additionalProps = {}, userRemoveProps = [], r
             rawEventKeys.push(key);
         }
     }
-    if (!rawEventKeys.length || config.disableTouch) {
-        return omit(propsRef.current, removeProps);
-    }
     const events = useMemo(() => {
+        if (!rawEventKeys.length) {
+            return {};
+        }
         const transformedEventKeys = rawEventKeys.reduce((acc, key) => {
             if (propsRef.current[key]) {
                 return acc.concat(eventConfig[key]);
@@ -251,7 +253,7 @@ const useInnerProps = (props = {}, additionalProps = {}, userRemoveProps = [], r
         const events = {};
         touchEventList.forEach((item) => {
             if (finalEventKeys.includes(item.eventName)) {
-                events[item.eventName] = (e) => item.handler(e, ref, propsRef, config);
+                events[item.eventName] = (e) => item.handler(e, ref, propsRef, config, navigation);
             }
         });
         return events;

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

@@ -34,10 +34,11 @@
  * ✘ bindagreeprivacyauthorization
  * ✔ bindtap
  */
-import { createElement, useEffect, useRef, useState, forwardRef, useContext } from 'react';
+import { createElement, useEffect, useRef, forwardRef, useContext } from 'react';
 import { View, StyleSheet, Animated, Easing } from 'react-native';
 import { warn } from '@mpxjs/utils';
-import { getCurrentPage, splitProps, splitStyle, useLayout, useTransformStyle, wrapChildren, extendObject } from './utils';
+import { GestureDetector } from 'react-native-gesture-handler';
+import { getCurrentPage, splitProps, splitStyle, useLayout, useTransformStyle, wrapChildren, extendObject, useHover } from './utils';
 import useInnerProps, { getCustomEvent } from './getInnerListeners';
 import useNodesRef from './useNodesRef';
 import { RouteContext, FormContext } from './context';
@@ -128,38 +129,34 @@ const Loading = ({ alone = false }) => {
 };
 const Button = forwardRef((buttonProps, ref) => {
     const { textProps, innerProps: props = {} } = splitProps(buttonProps);
-    const { size = 'default', type = 'default', plain = false, disabled = false, loading = false, 'hover-class': hoverClass, 'hover-style': hoverStyle = {}, 'hover-start-time': hoverStartTime = 20, 'hover-stay-time': hoverStayTime = 70, 'open-type': openType, 'form-type': formType, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, style = {}, children, bindgetuserinfo, bindtap, bindtouchstart, bindtouchend } = props;
+    const { size = 'default', type = 'default', plain = false, disabled = false, loading = false, 'hover-class': hoverClass, 'hover-style': hoverStyle = {}, 'hover-start-time': hoverStartTime = 20, 'hover-stay-time': hoverStayTime = 70, 'open-type': openType, 'form-type': formType, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, style = {}, children, bindgetuserinfo, bindtap } = props;
     const pageId = useContext(RouteContext);
     const formContext = useContext(FormContext);
+    const enableHover = hoverClass !== 'none';
+    const { isHover, gesture } = useHover({ enableHover, hoverStartTime, hoverStayTime, disabled });
     let submitFn;
     let resetFn;
     if (formContext) {
         submitFn = formContext.submit;
         resetFn = formContext.reset;
     }
-    const refs = useRef({
-        hoverStartTimer: undefined,
-        hoverStayTimer: undefined
-    });
-    const [isHover, setIsHover] = useState(false);
     const isMiniSize = size === 'mini';
-    const applyHoverEffect = isHover && hoverClass !== 'none';
     const [color, hoverColor, plainColor, disabledColor] = TypeColorMap[type];
-    const normalBackgroundColor = disabled ? disabledColor : applyHoverEffect || loading ? hoverColor : color;
+    const normalBackgroundColor = disabled ? disabledColor : isHover || loading ? hoverColor : color;
     const plainBorderColor = disabled
         ? 'rgba(0, 0, 0, .2)'
-        : applyHoverEffect
+        : isHover
             ? `rgba(${plainColor},.6)`
             : `rgb(${plainColor})`;
     const normalBorderColor = type === 'default' ? 'rgba(0, 0, 0, .2)' : normalBackgroundColor;
     const plainTextColor = disabled
         ? 'rgba(0, 0, 0, .2)'
-        : applyHoverEffect
+        : isHover
             ? `rgba(${plainColor}, .6)`
             : `rgb(${plainColor})`;
     const normalTextColor = type === 'default'
-        ? `rgba(0, 0, 0, ${disabled ? 0.3 : applyHoverEffect || loading ? 0.6 : 1})`
-        : `rgba(255 ,255 ,255 , ${disabled || applyHoverEffect || loading ? 0.6 : 1})`;
+        ? `rgba(0, 0, 0, ${disabled ? 0.3 : isHover || loading ? 0.6 : 1})`
+        : `rgba(255 ,255 ,255 , ${disabled || isHover || loading ? 0.6 : 1})`;
     const viewStyle = {
         borderWidth: 1,
         borderStyle: 'solid',
@@ -169,7 +166,7 @@ const Button = forwardRef((buttonProps, ref) => {
     const defaultViewStyle = extendObject({}, styles.button, isMiniSize ? styles.buttonMini : null, viewStyle);
     const defaultTextStyle = extendObject({}, styles.text, isMiniSize ? styles.textMini : {}, { color: plain ? plainTextColor : normalTextColor });
     const defaultStyle = extendObject({}, defaultViewStyle, defaultTextStyle);
-    const styleObj = extendObject({}, defaultStyle, style, applyHoverEffect ? hoverStyle : {});
+    const styleObj = extendObject({}, defaultStyle, style, isHover ? hoverStyle : {});
     const { hasSelfPercent, normalStyle, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
     const nodeRef = useRef(null);
     useNodesRef(props, ref, nodeRef, { style: normalStyle });
@@ -224,32 +221,6 @@ const Button = forwardRef((buttonProps, ref) => {
             });
         }
     };
-    const setStayTimer = () => {
-        clearTimeout(refs.current.hoverStayTimer);
-        refs.current.hoverStayTimer = setTimeout(() => {
-            setIsHover(false);
-            clearTimeout(refs.current.hoverStayTimer);
-        }, hoverStayTime);
-    };
-    const setStartTimer = () => {
-        clearTimeout(refs.current.hoverStartTimer);
-        refs.current.hoverStartTimer = setTimeout(() => {
-            setIsHover(true);
-            clearTimeout(refs.current.hoverStartTimer);
-        }, hoverStartTime);
-    };
-    const onTouchStart = (evt) => {
-        bindtouchstart && bindtouchstart(evt);
-        if (disabled)
-            return;
-        setStartTimer();
-    };
-    const onTouchEnd = (evt) => {
-        bindtouchend && bindtouchend(evt);
-        if (disabled)
-            return;
-        setStayTimer();
-    };
     const handleFormTypeFn = () => {
         if (formType === 'submit') {
             submitFn && submitFn();
@@ -269,8 +240,6 @@ const Button = forwardRef((buttonProps, ref) => {
         ref: nodeRef,
         style: extendObject({}, innerStyle, layoutStyle)
     }, layoutProps, {
-        bindtouchstart: (bindtouchstart || !disabled) && onTouchStart,
-        bindtouchend: (bindtouchend || !disabled) && onTouchEnd,
         bindtap: !disabled && onTap
     }), [
         'disabled',
@@ -288,12 +257,15 @@ const Button = forwardRef((buttonProps, ref) => {
         layoutRef,
         disableTap: disabled
     });
-    return createElement(View, innerProps, loading && createElement(Loading, { alone: !children }), wrapChildren(props, {
+    const baseButton = createElement(View, innerProps, loading && createElement(Loading, { alone: !children }), wrapChildren(props, {
         hasVarDec,
         varContext: varContextRef.current,
         textStyle,
         textProps
     }));
+    return enableHover
+        ? createElement(GestureDetector, { gesture: gesture }, baseButton)
+        : baseButton;
 });
 Button.displayName = 'MpxButton';
 export default Button;

package/lib/runtime/components/react/dist/mpx-canvas/html.js

@@ -316,8 +316,7 @@ var handleError = function (err, message) {
   document.removeEventListener('message', handleIncomingMessage);
 };
 
-function handleIncomingMessage(e) {
-  var data = JSON.parse(e.data);
+function handleIncomingMessage(data) {
   if (Array.isArray(data)) {
     for (var i = 0; i < data.length; i++) {
       try {
@@ -335,8 +334,7 @@ function handleIncomingMessage(e) {
   }
 }
 
-window.addEventListener('message', handleIncomingMessage);
-document.addEventListener('message', handleIncomingMessage);
+window.mpxWebviewMessageCallback = handleIncomingMessage
 </script>
   
 

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

@@ -69,7 +69,11 @@ const _Canvas = forwardRef((props = {}, ref) => {
     useEffect(() => {
         const webviewPostMessage = (message) => {
             if (canvasRef.current.webview) {
-                canvasRef.current.webview.postMessage(JSON.stringify(message));
+                const jsCode = `
+        window.mpxWebviewMessageCallback(${JSON.stringify(message)});
+        true;
+      `;
+                canvasRef.current.webview.injectJavaScript(jsCode);
             }
         };
         // 设置bus