@mpxjs/webpack-plugin 2.10.21 → 2.10.24-beta.1

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

@@ -566,13 +566,13 @@ function wrapWithChildren(props, { hasVarDec, enableBackground, backgroundStyle,
 }
 const _View = forwardRef((viewProps, ref) => {
     // 性能探针 - total
-    let stopTotal;
+    let idTotal = -1;
     if (__mpx_perf_framework__)
-        stopTotal = perf.scope('view:render:total');
+        idTotal = perf.scopeStart('view:render:total');
     // ───── props 阶段 ─────
-    let stopProps;
+    let idProps = -1;
     if (__mpx_perf_framework__)
-        stopProps = perf.scope('view:render:props');
+        idProps = perf.scopeStart('view:render:props');
     const { textProps, innerProps: props = {} } = splitProps(viewProps);
     let { style = {}, 'hover-style': hoverStyle, 'hover-start-time': hoverStartTime = 50, 'hover-stay-time': hoverStayTime = 400, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'enable-background': enableBackground, 'enable-fast-image': enableFastImage, 'enable-animation': enableAnimation, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, animation, catchtransitionend, bindtransitionend } = props;
     // 默认样式
@@ -588,11 +588,11 @@ const _View = forwardRef((viewProps, ref) => {
     const { isHover, gesture } = useHover({ enableHover, hoverStartTime, hoverStayTime });
     const styleObj = extendObject({}, defaultStyle, style, isHover ? hoverStyle : {});
     if (__mpx_perf_framework__)
-        stopProps();
+        perf.scopeEnd(idProps);
     // ───── style 阶段 ─────
-    let stopStyle;
+    let idStyle = -1;
     if (__mpx_perf_framework__)
-        stopStyle = perf.scope('view:render:style');
+        idStyle = perf.scopeStart('view:render:style');
     const { normalStyle, hasSelfPercent, hasPositionFixed, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(styleObj, {
         enableVar,
         externalVarContext,
@@ -626,11 +626,11 @@ const _View = forwardRef((viewProps, ref) => {
         transitionend
     });
     if (__mpx_perf_framework__)
-        stopStyle();
+        perf.scopeEnd(idStyle);
     // ───── innerProps 阶段 ─────
-    let stopInnerProps;
+    let idInnerProps = -1;
     if (__mpx_perf_framework__)
-        stopInnerProps = perf.scope('view:render:innerProps');
+        idInnerProps = perf.scopeStart('view:render:innerProps');
     const innerProps = useInnerProps(extendObject({}, props, layoutProps, {
         ref: nodeRef,
         style: enableStyleAnimation ? [viewStyle, animationStyle] : viewStyle
@@ -648,11 +648,11 @@ const _View = forwardRef((viewProps, ref) => {
         layoutRef
     });
     if (__mpx_perf_framework__)
-        stopInnerProps();
+        perf.scopeEnd(idInnerProps);
     // ───── createElement 阶段 ─────
-    let stopCreate;
+    let idCreate = -1;
     if (__mpx_perf_framework__)
-        stopCreate = perf.scope('view:render:createElement');
+        idCreate = perf.scopeStart('view:render:createElement');
     const childNode = wrapWithChildren(props, {
         hasVarDec,
         enableBackground: enableBackgroundRef.current,
@@ -672,9 +672,9 @@ const _View = forwardRef((viewProps, ref) => {
         finalComponent = createElement(Portal, null, finalComponent);
     }
     if (__mpx_perf_framework__)
-        stopCreate();
+        perf.scopeEnd(idCreate);
     if (__mpx_perf_framework__)
-        stopTotal();
+        perf.scopeEnd(idTotal);
     return finalComponent;
 });
 _View.displayName = 'MpxView';

package/lib/runtime/components/react/dist/mpx-web-view.d.ts

@@ -18,5 +18,6 @@ interface WebViewProps {
     binderror?: (event: CommonCallbackEvent) => void;
     [x: string]: any;
 }
-declare const _WebView: import("react").ForwardRefExoticComponent<Omit<WebViewProps, "ref"> & import("react").RefAttributes<HandlerRef<WebView<{}>, WebViewProps>>>;
+type WebViewInstance = WebView<{}>;
+declare const _WebView: import("react").ForwardRefExoticComponent<Omit<WebViewProps, "ref"> & import("react").RefAttributes<HandlerRef<WebViewInstance, WebViewProps>>>;
 export default _WebView;

package/lib/runtime/components/react/dist/utils.d.ts

@@ -113,6 +113,7 @@ export interface GestureHandler {
         };
     }>;
     current?: unknown;
+    handlerTag?: number;
 }
 export declare function flatGesture(gestures?: Array<GestureHandler>): any[];
 export declare function getCurrentPage(pageId: number | null | undefined): any;

package/lib/runtime/components/react/dist/utils.jsx

@@ -698,7 +698,10 @@ export function flatGesture(gestures = []) {
             return gesture.nodeRefs
                 .map((item) => item.getNodeInstance()?.instance?.gestureRef || {});
         }
-        return gesture?.current ? [gesture] : [];
+        if (gesture && (gesture.current || gesture.handlerTag !== undefined)) {
+            return [gesture];
+        }
+        return [];
     })) || [];
 }
 export function getCurrentPage(pageId) {

package/lib/runtime/components/react/mpx-canvas/index.tsx

@@ -33,6 +33,8 @@ import { createImageData as canvasCreateImageData } from './ImageData'
 import { useConstructorsRegistry } from './constructorsRegistry'
 import Portal from '../mpx-portal'
 
+type WebViewInstance = WebView<{}>
+
 const stylesheet = StyleSheet.create({
   container: { overflow: 'hidden', flex: 0 },
   webview: {
@@ -268,7 +270,7 @@ const _Canvas = forwardRef<HandlerRef<CanvasProps & View, CanvasProps>, CanvasPr
     canvasComponent = createElement(View, innerProps, createElement(
       WebView,
       {
-        ref: (element) => {
+        ref: (element: WebViewInstance | null) => {
           if (canvasRef.current) {
             canvasRef.current.webview = element
           }
@@ -293,7 +295,7 @@ const _Canvas = forwardRef<HandlerRef<CanvasProps & View, CanvasProps>, CanvasPr
   }
 
   canvasComponent = createElement(View, innerProps, createElement(WebView, {
-    ref: (element) => {
+    ref: (element: WebViewInstance | null) => {
       if (canvasRef.current) {
         canvasRef.current.webview = element
       }

package/lib/runtime/components/react/mpx-canvas/utils.tsx

@@ -2,6 +2,8 @@ import { useEffect, useRef } from 'react'
 import { WebView } from 'react-native-webview'
 import Bus from './Bus'
 
+type WebViewInstance = WebView<{}>
+
 export const WEBVIEW_TARGET = '@@WEBVIEW_TARGET'
 
 export const constructors: Record<string, any> = {}
@@ -42,7 +44,7 @@ export interface WebviewMessage {
 }
 
 export interface CanvasInstance {
-  webview: WebView | null;
+  webview: WebViewInstance | null;
   bus: Bus | null;
   context2D: CanvasRenderingContext2D;
   getContext: (contextType: string) => CanvasRenderingContext2D | null;