@mpxjs/webpack-plugin 2.9.69-beta.5 → 2.9.69-beta.7

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

@@ -10,7 +10,7 @@ import useInnerProps from './getInnerListeners';
 import Animated from 'react-native-reanimated';
 import useAnimationHooks from './useAnimationHooks';
 import useNodesRef from './useNodesRef';
-import { parseUrl, PERCENT_REGEX, splitStyle, splitProps, useTransformStyle, wrapChildren, useLayout, renderImage, pickStyle, extendObject, useHoverStyle } from './utils';
+import { parseUrl, PERCENT_REGEX, splitStyle, splitProps, useTransformStyle, wrapChildren, useLayout, renderImage, pickStyle, extendObject, useHover } from './utils';
 import { error } from '@mpxjs/utils';
 import LinearGradient from 'react-native-linear-gradient';
 import { GestureDetector } from 'react-native-gesture-handler';
@@ -442,7 +442,7 @@ function inheritStyle(innerStyle = {}) {
         }
         : undefined);
 }
-function wrapImage(imageStyle, innerStyle, enableFastImage) {
+function useWrapImage(imageStyle, innerStyle, enableFastImage) {
     // 预处理数据
     const preImageInfo = preParseImage(imageStyle);
     // 预解析
@@ -528,11 +528,6 @@ function wrapImage(imageStyle, innerStyle, enableFastImage) {
   </View>;
 }
 function wrapWithChildren(props, { hasVarDec, enableBackground, textStyle, backgroundStyle, varContext, textProps, innerStyle, enableFastImage }) {
-    enableBackground = enableBackground || !!backgroundStyle;
-    const enableBackgroundRef = useRef(enableBackground);
-    if (enableBackgroundRef.current !== enableBackground) {
-        error('[Mpx runtime error]: background use should be stable in the component lifecycle, or you can set [enable-background] with true.');
-    }
     const children = wrapChildren(props, {
         hasVarDec,
         varContext,
@@ -540,13 +535,14 @@ function wrapWithChildren(props, { hasVarDec, enableBackground, textStyle, backg
         textProps
     });
     return [
-        enableBackground ? wrapImage(backgroundStyle, innerStyle, enableFastImage) : null,
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        enableBackground ? useWrapImage(backgroundStyle, innerStyle, enableFastImage) : null,
         children
     ];
 }
 const _View = forwardRef((viewProps, ref) => {
     const { textProps, innerProps: props = {} } = splitProps(viewProps);
-    const { 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 } = props;
+    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 } = props;
     // 默认样式
     const defaultStyle = style.display === 'flex'
         ? {
@@ -556,7 +552,8 @@ const _View = forwardRef((viewProps, ref) => {
             flexWrap: 'nowrap'
         }
         : {};
-    const { isHover, enableHoverStyle, gesture } = useHoverStyle({ hoverStyle, hoverStartTime, hoverStayTime });
+    const enableHover = !!hoverStyle;
+    const { isHover, gesture } = useHover({ enableHover, hoverStartTime, hoverStayTime });
     const styleObj = extendObject({}, defaultStyle, style, isHover ? hoverStyle : {});
     const { normalStyle, hasSelfPercent, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(styleObj, {
         enableVar,
@@ -566,6 +563,11 @@ const _View = forwardRef((viewProps, ref) => {
         parentHeight
     });
     const { textStyle, backgroundStyle, innerStyle = {} } = splitStyle(normalStyle);
+    enableBackground = enableBackground || !!backgroundStyle;
+    const enableBackgroundRef = useRef(enableBackground);
+    if (enableBackgroundRef.current !== enableBackground) {
+        error('[Mpx runtime error]: background use should be stable in the component lifecycle, or you can set [enable-background] with true.');
+    }
     const nodeRef = useRef(null);
     useNodesRef(props, ref, nodeRef, {
         style: normalStyle
@@ -590,7 +592,7 @@ const _View = forwardRef((viewProps, ref) => {
     });
     const childNode = wrapWithChildren(props, {
         hasVarDec,
-        enableBackground,
+        enableBackground: enableBackgroundRef.current,
         textStyle,
         backgroundStyle,
         varContext: varContextRef.current,
@@ -601,8 +603,8 @@ const _View = forwardRef((viewProps, ref) => {
     const BaseComponent = enableStyleAnimation
         ? createElement(Animated.View, innerProps, childNode)
         : createElement(View, innerProps, childNode);
-    return enableHoverStyle
-        ? createElement(GestureDetector, { gesture }, BaseComponent)
+    return enableHover
+        ? createElement(GestureDetector, { gesture: gesture }, BaseComponent)
         : BaseComponent;
 });
 _View.displayName = 'MpxView';

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

@@ -1,13 +1,14 @@
 import { forwardRef, useRef, useContext, useMemo, useState, useCallback, useEffect } from 'react';
-import { warn, getFocusedNavigation, isFunction } from '@mpxjs/utils';
+import { warn, isFunction } from '@mpxjs/utils';
 import Portal from './mpx-portal';
 import { getCustomEvent } from './getInnerListeners';
 import { promisify, redirectTo, navigateTo, navigateBack, reLaunch, switchTab } from '@mpxjs/api-proxy';
 import { WebView } from 'react-native-webview';
 import useNodesRef from './useNodesRef';
-import { getCurrentPage, extendObject } from './utils';
+import { getCurrentPage } from './utils';
+import { useNavigation } from '@react-navigation/native';
 import { RouteContext } from './context';
-import { BackHandler, StyleSheet, View, Text, Platform } from 'react-native';
+import { BackHandler, StyleSheet, View, Text } from 'react-native';
 const styles = StyleSheet.create({
     loadErrorContext: {
         display: 'flex',
@@ -53,6 +54,7 @@ const _WebView = forwardRef((props, ref) => {
     const [pageLoadErr, setPageLoadErr] = useState(false);
     const currentPage = useMemo(() => getCurrentPage(pageId), [pageId]);
     const webViewRef = useRef(null);
+    const isLoaded = useRef(false);
     const defaultWebViewStyle = {
         position: 'absolute',
         left: 0,
@@ -61,6 +63,7 @@ const _WebView = forwardRef((props, ref) => {
         bottom: 0
     };
     const canGoBack = useRef(false);
+    const isNavigateBack = useRef(false);
     const onAndroidBackPress = useCallback(() => {
         if (canGoBack.current) {
             webViewRef.current?.goBack();
@@ -69,42 +72,27 @@ const _WebView = forwardRef((props, ref) => {
         return false;
     }, [canGoBack]);
     const beforeRemoveHandle = useCallback((e) => {
-        if (canGoBack.current) {
+        if (canGoBack.current && !isNavigateBack.current) {
             webViewRef.current?.goBack();
             e.preventDefault();
         }
+        isNavigateBack.current = false;
     }, [canGoBack]);
-    const navigation = getFocusedNavigation();
-    // ios 16以下版本 的hash会被转义，因此对于iOS环境下在页面load之后再注入hash部分的逻辑
-    let [baseUrl, hashParams = ''] = src.split('#');
-    if (hashParams)
-        hashParams = '#' + hashParams;
-    const source = useMemo(() => {
-        if (Platform.OS === 'ios') {
-            return { uri: baseUrl };
-        }
-        return { uri: baseUrl + hashParams };
-    }, [baseUrl, hashParams]);
-    const hashInjectedJavascript = useMemo(() => {
-        if (Platform.OS === 'ios' && hashParams) {
-            return `(function() {
-        try {
-          location.hash = '${hashParams}';
-        } catch(e) {
-        }
-      })()`;
-        }
-        return '';
-    }, [hashParams]);
-    navigation?.addListener('beforeRemove', beforeRemoveHandle);
+    const navigation = useNavigation();
     useEffect(() => {
         if (__mpx_mode__ === 'android') {
             BackHandler.addEventListener('hardwareBackPress', onAndroidBackPress);
-            return () => {
-                BackHandler.removeEventListener('hardwareBackPress', onAndroidBackPress);
-                navigation?.removeListener('beforeRemove', beforeRemoveHandle);
-            };
         }
+        const addListener = navigation?.addListener.bind(navigation);
+        const beforeRemoveSubscription = addListener?.('beforeRemove', beforeRemoveHandle);
+        return () => {
+            if (__mpx_mode__ === 'android') {
+                BackHandler.removeEventListener('hardwareBackPress', onAndroidBackPress);
+            }
+            if (isFunction(beforeRemoveSubscription)) {
+                beforeRemoveSubscription();
+            }
+        };
     }, []);
     useNodesRef(props, ref, webViewRef, {
         style: defaultWebViewStyle
@@ -112,27 +100,6 @@ const _WebView = forwardRef((props, ref) => {
     if (!src) {
         return null;
     }
-    const _load = function (res) {
-        const result = {
-            type: 'load',
-            timeStamp: res.timeStamp,
-            detail: {
-                src: res.nativeEvent?.url
-            }
-        };
-        bindload?.(result);
-    };
-    const _error = function (res) {
-        setPageLoadErr(true);
-        const result = {
-            type: 'error',
-            timeStamp: res.timeStamp,
-            detail: {
-                src: ''
-            }
-        };
-        binderror && binderror(result);
-    };
     const _reload = function () {
         setPageLoadErr(false);
     };
@@ -159,7 +126,6 @@ const _WebView = forwardRef((props, ref) => {
           return _documentTitle
         }
       });
-      ${hashInjectedJavascript}
     }
     true;
   `;
@@ -218,6 +184,7 @@ const _WebView = forwardRef((props, ref) => {
                 asyncCallback = navObj.navigateTo(...params);
                 break;
             case 'navigateBack':
+                isNavigateBack.current = true;
                 asyncCallback = navObj.navigateBack(...params);
                 break;
             case 'redirectTo':
@@ -264,22 +231,58 @@ const _WebView = forwardRef((props, ref) => {
             }
         });
     };
-    const events = {};
-    if (bindload) {
-        extendObject(events, {
-            onLoad: _load
-        });
-    }
-    extendObject(events, {
-        onError: _error
-    });
+    let isLoadError = false;
+    let fristLoaded = false;
+    let statusCode = '';
+    const onLoadEnd = function (res) {
+        fristLoaded = true;
+        isLoaded.current = true;
+        const src = res.nativeEvent?.url;
+        if (isLoadError) {
+            isLoadError = false;
+            isNavigateBack.current = false;
+            const result = {
+                type: 'error',
+                timeStamp: res.timeStamp,
+                detail: {
+                    src,
+                    statusCode
+                }
+            };
+            binderror && binderror(result);
+        }
+        else {
+            const result = {
+                type: 'load',
+                timeStamp: res.timeStamp,
+                detail: {
+                    src
+                }
+            };
+            bindload?.(result);
+        }
+    };
+    const onHttpError = function (res) {
+        isLoadError = true;
+        statusCode = res.nativeEvent?.statusCode;
+    };
+    const onError = function () {
+        statusCode = '';
+        isLoadError = true;
+        if (!fristLoaded) {
+            setPageLoadErr(true);
+        }
+    };
+    const onLoadStart = function () {
+        isLoaded.current = false;
+    };
     return (<Portal key={pageLoadErr ? 'error' : 'webview'}>
         {pageLoadErr
             ? (<View style={[styles.loadErrorContext, defaultWebViewStyle]}>
               <View style={styles.loadErrorText}><Text style={{ fontSize: 14, color: '#999999' }}>{currentErrorText.text}</Text></View>
               <View style={styles.loadErrorButton} onTouchEnd={_reload}><Text style={{ fontSize: 12, color: '#666666' }}>{currentErrorText.button}</Text></View>
             </View>)
-            : (<WebView style={defaultWebViewStyle} source={source} ref={webViewRef} javaScriptEnabled={true} onNavigationStateChange={_changeUrl} onMessage={_message} injectedJavaScript={injectedJavaScript} onLoadProgress={_onLoadProgress} allowsBackForwardNavigationGestures={true} {...events}></WebView>)}
+            : (<WebView style={defaultWebViewStyle} source={{ uri: src }} pointerEvents={isLoaded ? 'auto' : 'none'} ref={webViewRef} javaScriptEnabled={true} onNavigationStateChange={_changeUrl} onMessage={_message} injectedJavaScript={injectedJavaScript} onLoadProgress={_onLoadProgress} onLoadEnd={onLoadEnd} onHttpError={onHttpError} onError={onError} onLoadStart={onLoadStart} allowsBackForwardNavigationGestures={true}></WebView>)}
       </Portal>);
 });
 _WebView.displayName = 'MpxWebview';

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

@@ -30,9 +30,6 @@ export const createFaces = (itemHeight, visibleCount) => {
             for (let i = 0; i < index; i++) {
                 offset += freeSpaces[i];
             }
-            if (index === 0) {
-                offset *= 0.6;
-            }
             return offset;
         });
         return [screenHeights, offsets];
@@ -41,9 +38,7 @@ export const createFaces = (itemHeight, visibleCount) => {
         const map = {
             0: 0,
             1: 0.8,
-            2: 0.9 // 0.35
-            // 3: 0.45, // 0.45
-            // 4: 0.5 // 0.5
+            2: 0.9
         };
         return map[index] ?? Math.min(1, map[2] + index * 0.05);
     };

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

@@ -139,20 +139,23 @@ export default function useAnimationHooks(props) {
     if (enableAnimationRef.current !== enableStyleAnimation) {
         error('[Mpx runtime error]: animation use should be stable in the component lifecycle, or you can set [enable-animation] with true.');
     }
-    if (!enableStyleAnimation)
-        return { enableStyleAnimation };
+    if (!enableAnimationRef.current)
+        return { enableStyleAnimation: false };
     const originalStyle = formatStyle(style);
     // id 标识
     const id = animation?.id || -1;
     // 有动画样式的 style key
+    // eslint-disable-next-line react-hooks/rules-of-hooks
     const animatedStyleKeys = useSharedValue([]);
     // 记录动画key的style样式值 没有的话设置为false
+    // eslint-disable-next-line react-hooks/rules-of-hooks
     const animatedKeys = useRef({});
     // const animatedKeys = useRef({} as {[propName: keyof ExtendedViewStyle]: boolean|number|string})
     // ** 全量 style prop sharedValue
     // 不能做增量的原因：
     // 1 尝试用 useRef，但 useAnimatedStyle 访问后的 ref 不能在增加新的值，被冻结
     // 2 尝试用 useSharedValue，因为实际触发的 style prop 需要是 sharedValue 才能驱动动画，若外层 shareValMap 也是 sharedValue，动画无法驱动。
+    // eslint-disable-next-line react-hooks/rules-of-hooks
     const shareValMap = useMemo(() => {
         return Object.keys(InitialValue).reduce((valMap, key) => {
             const defaultVal = getInitialVal(key, isTransform(key));
@@ -161,6 +164,7 @@ export default function useAnimationHooks(props) {
         }, {});
     }, []);
     // ** 获取动画样式prop & 驱动动画
+    // eslint-disable-next-line react-hooks/rules-of-hooks
     useEffect(() => {
         if (id === -1)
             return;
@@ -182,6 +186,7 @@ export default function useAnimationHooks(props) {
     //   })
     // }, [style])
     // ** 清空动画
+    // eslint-disable-next-line react-hooks/rules-of-hooks
     useEffect(() => {
         return () => {
             Object.values(shareValMap).forEach((value) => {
@@ -214,14 +219,13 @@ export default function useAnimationHooks(props) {
             }
             // 添加每个key的多次step动画
             animatedKeys.forEach(key => {
+                const ruleV = isTransform(key) ? transform.get(key) : rules.get(key);
                 // key不存在，第一轮取shareValMap[key]value，非第一轮取上一轮的
-                const toVal = rules.get(key) !== undefined
-                    ? rules.get(key)
-                    : transform.get(key) !== undefined
-                        ? transform.get(key)
-                        : index > 0
-                            ? lastValueMap[key]
-                            : shareValMap[key].value;
+                const toVal = ruleV !== undefined
+                    ? ruleV
+                    : index > 0
+                        ? lastValueMap[key]
+                        : shareValMap[key].value;
                 const animation = getAnimation({ key, value: toVal }, { delay, duration, easing }, needSetCallback ? setTransformOrigin : undefined);
                 needSetCallback = false;
                 if (!sequence[key]) {
@@ -315,6 +319,7 @@ export default function useAnimationHooks(props) {
         }, {});
     }
     // ** 生成动画样式
+    // eslint-disable-next-line react-hooks/rules-of-hooks
     const animationStyle = useAnimatedStyle(() => {
         // console.info(`useAnimatedStyle styles=`, originalStyle)
         return animatedStyleKeys.value.reduce((styles, key) => {
@@ -335,7 +340,7 @@ export default function useAnimationHooks(props) {
         }, {});
     });
     return {
-        enableStyleAnimation,
+        enableStyleAnimation: enableAnimationRef.current,
         animationStyle
     };
 }

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

@@ -559,3 +559,60 @@ export function useHoverStyle({ hoverStyle, hoverStartTime, hoverStayTime, disab
         enableHoverStyle
     };
 }
+export function useHover({ enableHover, hoverStartTime, hoverStayTime, disabled }) {
+    const enableHoverRef = useRef(enableHover);
+    if (enableHoverRef.current !== enableHover) {
+        error('[Mpx runtime error]: hover-class use should be stable in the component lifecycle.');
+    }
+    if (!enableHoverRef.current)
+        return { isHover: false };
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    const gestureRef = useContext(ScrollViewContext).gestureRef;
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    const [isHover, setIsHover] = useState(false);
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    const dataRef = useRef({});
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+        return () => {
+            dataRef.current.startTimer && clearTimeout(dataRef.current.startTimer);
+            dataRef.current.stayTimer && clearTimeout(dataRef.current.stayTimer);
+        };
+    }, []);
+    const setStartTimer = () => {
+        if (disabled)
+            return;
+        dataRef.current.startTimer && clearTimeout(dataRef.current.startTimer);
+        dataRef.current.startTimer = setTimeout(() => {
+            setIsHover(true);
+        }, +hoverStartTime);
+    };
+    const setStayTimer = () => {
+        if (disabled)
+            return;
+        dataRef.current.stayTimer && clearTimeout(dataRef.current.stayTimer);
+        dataRef.current.startTimer && clearTimeout(dataRef.current.startTimer);
+        dataRef.current.stayTimer = setTimeout(() => {
+            setIsHover(false);
+        }, +hoverStayTime);
+    };
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    const gesture = useMemo(() => {
+        return Gesture.Pan()
+            .onTouchesDown(() => {
+            'worklet';
+            runOnJS(setStartTimer)();
+        })
+            .onTouchesUp(() => {
+            'worklet';
+            runOnJS(setStayTimer)();
+        });
+    }, []);
+    if (gestureRef) {
+        gesture.simultaneousWithExternalGesture(gestureRef);
+    }
+    return {
+        isHover,
+        gesture
+    };
+}