@mpxjs/webpack-plugin 2.10.1-beta.1 → 2.10.1-beta.10

package/lib/react/processScript.js

@@ -27,7 +27,7 @@ module.exports = function (script, {
     output += `
 import { getComponent } from ${stringifyRequest(loaderContext, optionProcessorPath)}
 import { NavigationContainer, StackActions } from '@react-navigation/native'
-${mode === 'ios' ? "import { createNativeStackNavigator } from '@react-navigation/native-stack'" : "import { createStackNavigator } from '@react-navigation/stack'"}
+${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'
@@ -35,7 +35,7 @@ import { GestureHandlerRootView } from 'react-native-gesture-handler'
 
 global.__navigationHelper = {
   NavigationContainer: NavigationContainer,
-  createStackNavigator: ${mode === 'ios' ? 'createNativeStackNavigator' : 'createStackNavigator'},
+  createStackNavigator: createStackNavigator,
   useHeaderHeight: useHeaderHeight,
   StackActions: StackActions,
   GestureHandlerRootView: GestureHandlerRootView,

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

@@ -155,8 +155,8 @@ const _WebView = forwardRef((props, ref) => {
         switch (type) {
             case 'setTitle':
                 { // case下不允许直接声明，包个块解决该问题
-                    const title = postData._documentTitle;
-                    if (title) {
+                    const title = postData._documentTitle?.trim();
+                    if (title !== undefined) {
                         navigation && navigation.setOptions({ title });
                     }
                 }
@@ -252,6 +252,7 @@ const _WebView = forwardRef((props, ref) => {
     };
     const onLoadEnd = function (res) {
         if (__mpx_mode__ === 'android') {
+            res.persist();
             setTimeout(() => {
                 onLoadEndHandle(res);
             }, 0);
@@ -282,7 +283,7 @@ const _WebView = forwardRef((props, ref) => {
               <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} pointerEvents={isLoaded ? 'auto' : 'none'} source={{ uri: src }} ref={webViewRef} javaScriptEnabled={true} onNavigationStateChange={_changeUrl} onMessage={_message} injectedJavaScript={injectedJavaScript} onLoadProgress={_onLoadProgress} onLoadEnd={onLoadEnd} onHttpError={onHttpError} onError={onError} onLoadStart={onLoadStart} allowsBackForwardNavigationGestures={true}></WebView>)}
+            : (<WebView style={defaultWebViewStyle} source={{ uri: src }} ref={webViewRef} javaScriptEnabled={true} onNavigationStateChange={_changeUrl} onMessage={_message} injectedJavaScript={injectedJavaScript} onLoadProgress={_onLoadProgress} onLoadEnd={onLoadEnd} onHttpError={onHttpError} onError={onError} onLoadStart={onLoadStart} allowsBackForwardNavigationGestures={isLoaded}></WebView>)}
       </Portal>);
 });
 _WebView.displayName = 'MpxWebview';

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

@@ -207,8 +207,8 @@ const _WebView = forwardRef<HandlerRef<WebView, WebViewProps>, WebViewProps>((pr
     switch (type) {
       case 'setTitle':
         { // case下不允许直接声明，包个块解决该问题
-          const title = postData._documentTitle
-          if (title) {
+          const title = postData._documentTitle?.trim()
+          if (title !== undefined) {
             navigation && navigation.setOptions({ title })
           }
         }
@@ -303,6 +303,7 @@ const _WebView = forwardRef<HandlerRef<WebView, WebViewProps>, WebViewProps>((pr
   }
   const onLoadEnd = function (res: WebViewEvent) {
     if (__mpx_mode__ === 'android') {
+      res.persist()
       setTimeout(() => {
         onLoadEndHandle(res)
       }, 0)
@@ -338,7 +339,6 @@ const _WebView = forwardRef<HandlerRef<WebView, WebViewProps>, WebViewProps>((pr
             )
           : (<WebView
             style={ defaultWebViewStyle }
-            pointerEvents={ isLoaded ? 'auto' : 'none' }
             source={{ uri: src }}
             ref={webViewRef}
             javaScriptEnabled={true}
@@ -350,7 +350,7 @@ const _WebView = forwardRef<HandlerRef<WebView, WebViewProps>, WebViewProps>((pr
             onHttpError={onHttpError}
             onError={onError}
             onLoadStart={onLoadStart}
-            allowsBackForwardNavigationGestures={true}
+            allowsBackForwardNavigationGestures={isLoaded}
       ></WebView>)}
       </Portal>
   )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.10.1-beta.1",
+  "version": "2.10.1-beta.10",
   "description": "mpx compile core",
   "keywords": [
     "mpx"