feat: 调整pageWrapper 包裹逻辑

Author: Blackgan3

packages/core/src/platform/patch/getDefaultOptions.ios.js

@@ -554,10 +554,12 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
 
   if (type === 'page') {
     const pageConfig = Object.assign({}, global.__mpxPageConfig, currentInject.pageConfig)
-    return createElement(
+    return ({ navigation, route }) => createElement(
       PageWrapper, {
         pageConfig,
-        pageStatusMap
+        pageStatusMap,
+        navigation,
+        route
       },
       defaultOptions
     )

packages/core/src/platform/patch/pageWrapper.js

@@ -36,7 +36,7 @@ const { useSafeAreaInsets } = global.__navigationHelper
 function PageWrapper ({
   children,
   navigation,
-  pageConfig = {},
+  pageConfig,
   route,
   pageStatusMap
 }) {
@@ -47,37 +47,41 @@ function PageWrapper ({
     navigation,
     pageId
   })
-  console.log('route_____ 测试 route', route, navigation)
   const currentPageId = useMemo(() => ++pageId, [])
-  usePageStatus(navigation, currentPageId, pageStatusMap)
-  useLayoutEffect(() => {
-    const isCustom = pageConfig.navigationStyle === 'custom'
-    navigation.setOptions({
-      headerShown: !isCustom,
-      title: pageConfig.navigationBarTitleText?.trim() || '',
-      headerStyle: {
-        backgroundColor: pageConfig.navigationBarBackgroundColor || '#000000'
-      },
-      headerTintColor: pageConfig.navigationBarTextStyle || 'white'
-    })
 
-    if (__mpx_mode__ === 'android') {
-      ReactNative.StatusBar.setBarStyle(pageConfig.barStyle || 'dark-content')
-      ReactNative.StatusBar.setTranslucent(isCustom) // 控制statusbar是否占位
-      const color = isCustom ? 'transparent' : pageConfig.statusBarColor
-      color && ReactNative.StatusBar.setBackgroundColor(color)
+  if (navigation) {
+    usePageStatus(navigation, currentPageId, pageStatusMap)
+    if (pageConfig) {
+      useLayoutEffect(() => {
+        const isCustom = pageConfig.navigationStyle === 'custom'
+        navigation.setOptions({
+          headerShown: !isCustom,
+          title: pageConfig.navigationBarTitleText?.trim() || '',
+          headerStyle: {
+            backgroundColor: pageConfig.navigationBarBackgroundColor || '#000000'
+          },
+          headerTintColor: pageConfig.navigationBarTextStyle || 'white'
+        })
+    
+        if (__mpx_mode__ === 'android') {
+          ReactNative.StatusBar.setBarStyle(pageConfig.barStyle || 'dark-content')
+          ReactNative.StatusBar.setTranslucent(isCustom) // 控制statusbar是否占位
+          const color = isCustom ? 'transparent' : pageConfig.statusBarColor
+          color && ReactNative.StatusBar.setBackgroundColor(color)
+        }
+      }, [])
     }
-  }, [])
-
-  useEffect(() => {
-    setTimeout(() => {
-      rootRef.current?.measureInWindow((x, y, width, height) => {
-        navigation.layout = { x, y, width, height }
-      })
-    }, 100)
-  }, [])
-
-  navigation.insets = useSafeAreaInsets()
+  
+    useEffect(() => {
+      setTimeout(() => {
+        rootRef.current?.measureInWindow((x, y, width, height) => {
+          navigation.layout = { x, y, width, height }
+        })
+      }, 100)
+    }, [])
+    navigation.insets = useSafeAreaInsets()
+  }
+  
 
   const withKeyboardAvoidingView = (element) => {
     return createElement(KeyboardAvoidContext.Provider,
@@ -101,7 +105,7 @@ function PageWrapper ({
   return createElement(GestureHandlerRootView,
     {
       // https://github.com/software-mansion/react-native-reanimated/issues/6639 因存在此问题，iOS在页面上进行定宽来暂时规避
-      style: __mpx_mode__ === 'ios' && pageConfig.navigationStyle !== 'custom'
+      style: __mpx_mode__ === 'ios' && pageConfig?.navigationStyle !== 'custom'
         ? {
           height: ReactNative.Dimensions.get('screen').height - useHeaderHeight()
         }
@@ -114,7 +118,7 @@ function PageWrapper ({
         {
           style: {
             flex: 1,
-            backgroundColor: pageConfig.backgroundColor || '#fff'
+            backgroundColor: pageConfig?.backgroundColor || '#fff'
           },
           ref: rootRef
         },