@mpxjs/core 2.10.4-beta.9 → 2.10.5

package/LICENSE

@@ -0,0 +1,433 @@
+                              Apache License
+
+                        Version 2.0, January 2004
+
+                     http://www.apache.org/licenses/
+
+
+
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+
+
+
+1. Definitions.
+
+
+
+
+   "License" shall mean the terms and conditions for use, reproduction,
+
+   and distribution as defined by Sections 1 through 9 of this document.
+
+
+
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+
+   the copyright owner that is granting the License.
+
+
+
+
+   "Legal Entity" shall mean the union of the acting entity and all
+
+   other entities that control, are controlled by, or are under common
+
+   control with that entity. For the purposes of this definition,
+
+   "control" means (i) the power, direct or indirect, to cause the
+
+   direction or management of such entity, whether by contract or
+
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+
+
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+
+   exercising permissions granted by this License.
+
+
+
+
+   "Source" form shall mean the preferred form for making modifications,
+
+   including but not limited to software source code, documentation
+
+   source, and configuration files.
+
+
+
+
+   "Object" form shall mean any form resulting from mechanical
+
+   transformation or translation of a Source form, including but
+
+   not limited to compiled object code, generated documentation,
+
+   and conversions to other media types.
+
+
+
+
+   "Work" shall mean the work of authorship, whether in Source or
+
+   Object form, made available under the License, as indicated by a
+
+   copyright notice that is included in or attached to the work
+
+   (an example is provided in the Appendix below).
+
+
+
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+
+   form, that is based on (or derived from) the Work and for which the
+
+   editorial revisions, annotations, elaborations, or other modifications
+
+   represent, as a whole, an original work of authorship. For the purposes
+
+   of this License, Derivative Works shall not include works that remain
+
+   separable from, or merely link (or bind by name) to the interfaces of,
+
+   the Work and Derivative Works thereof.
+
+
+
+
+   "Contribution" shall mean any work of authorship, including
+
+   the original version of the Work and any modifications or additions
+
+   to that Work or Derivative Works thereof, that is intentionally
+
+   submitted to Licensor for inclusion in the Work by the copyright owner
+
+   or by an individual or Legal Entity authorized to submit on behalf of
+
+   the copyright owner. For the purposes of this definition, "submitted"
+
+   means any form of electronic, verbal, or written communication sent
+
+   to the Licensor or its representatives, including but not limited to
+
+   communication on electronic mailing lists, source code control systems,
+
+   and issue tracking systems that are managed by, or on behalf of, the
+
+   Licensor for the purpose of discussing and improving the Work, but
+
+   excluding communication that is conspicuously marked or otherwise
+
+   designated in writing by the copyright owner as "Not a Contribution."
+
+
+
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+
+   on behalf of whom a Contribution has been received by Licensor and
+
+   subsequently incorporated within the Work.
+
+
+
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+
+   this License, each Contributor hereby grants to You a perpetual,
+
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+
+   copyright license to reproduce, prepare Derivative Works of,
+
+   publicly display, publicly perform, sublicense, and distribute the
+
+   Work and such Derivative Works in Source or Object form.
+
+
+
+
+3. Grant of Patent License. Subject to the terms and conditions of
+
+   this License, each Contributor hereby grants to You a perpetual,
+
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+
+   (except as stated in this section) patent license to make, have made,
+
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+
+   where such license applies only to those patent claims licensable
+
+   by such Contributor that are necessarily infringed by their
+
+   Contribution(s) alone or by combination of their Contribution(s)
+
+   with the Work to which such Contribution(s) was submitted. If You
+
+   institute patent litigation against any entity (including a
+
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+
+   or a Contribution incorporated within the Work constitutes direct
+
+   or contributory patent infringement, then any patent licenses
+
+   granted to You under this License for that Work shall terminate
+
+   as of the date such litigation is filed.
+
+
+
+
+4. Redistribution. You may reproduce and distribute copies of the
+
+   Work or Derivative Works thereof in any medium, with or without
+
+   modifications, and in Source or Object form, provided that You
+
+   meet the following conditions:
+
+
+
+
+   (a) You must give any other recipients of the Work or
+
+       Derivative Works a copy of this License; and
+
+
+
+
+   (b) You must cause any modified files to carry prominent notices
+
+       stating that You changed the files; and
+
+
+
+
+   (c) You must retain, in the Source form of any Derivative Works
+
+       that You distribute, all copyright, patent, trademark, and
+
+       attribution notices from the Source form of the Work,
+
+       excluding those notices that do not pertain to any part of
+
+       the Derivative Works; and
+
+
+
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+
+       distribution, then any Derivative Works that You distribute must
+
+       include a readable copy of the attribution notices contained
+
+       within such NOTICE file, excluding those notices that do not
+
+       pertain to any part of the Derivative Works, in at least one
+
+       of the following places: within a NOTICE text file distributed
+
+       as part of the Derivative Works; within the Source form or
+
+       documentation, if provided along with the Derivative Works; or,
+
+       within a display generated by the Derivative Works, if and
+
+       wherever such third-party notices normally appear. The contents
+
+       of the NOTICE file are for informational purposes only and
+
+       do not modify the License. You may add Your own attribution
+
+       notices within Derivative Works that You distribute, alongside
+
+       or as an addendum to the NOTICE text from the Work, provided
+
+       that such additional attribution notices cannot be construed
+
+       as modifying the License.
+
+
+
+
+   You may add Your own copyright statement to Your modifications and
+
+   may provide additional or different license terms and conditions
+
+   for use, reproduction, or distribution of Your modifications, or
+
+   for any such Derivative Works as a whole, provided Your use,
+
+   reproduction, and distribution of the Work otherwise complies with
+
+   the conditions stated in this License.
+
+
+
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+
+   any Contribution intentionally submitted for inclusion in the Work
+
+   by You to the Licensor shall be under the terms and conditions of
+
+   this License, without any additional terms or conditions.
+
+   Notwithstanding the above, nothing herein shall supersede or modify
+
+   the terms of any separate license agreement you may have executed
+
+   with Licensor regarding such Contributions.
+
+
+
+
+6. Trademarks. This License does not grant permission to use the trade
+
+   names, trademarks, service marks, or product names of the Licensor,
+
+   except as required for reasonable and customary use in describing the
+
+   origin of the Work and reproducing the content of the NOTICE file.
+
+
+
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+
+   agreed to in writing, Licensor provides the Work (and each
+
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+
+   implied, including, without limitation, any warranties or conditions
+
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+
+   appropriateness of using or redistributing the Work and assume any
+
+   risks associated with Your exercise of permissions under this License.
+
+
+
+
+8. Limitation of Liability. In no event and under no legal theory,
+
+   whether in tort (including negligence), contract, or otherwise,
+
+   unless required by applicable law (such as deliberate and grossly
+
+   negligent acts) or agreed to in writing, shall any Contributor be
+
+   liable to You for damages, including any direct, indirect, special,
+
+   incidental, or consequential damages of any character arising as a
+
+   result of this License or out of the use or inability to use the
+
+   Work (including but not limited to damages for loss of goodwill,
+
+   work stoppage, computer failure or malfunction, or any and all
+
+   other commercial damages or losses), even if such Contributor
+
+   has been advised of the possibility of such damages.
+
+
+
+
+9. Accepting Warranty or Additional Liability. While redistributing
+
+   the Work or Derivative Works thereof, You may choose to offer,
+
+   and charge a fee for, acceptance of support, warranty, indemnity,
+
+   or other liability obligations and/or rights consistent with this
+
+   License. However, in accepting such obligations, You may act only
+
+   on Your own behalf and on Your sole responsibility, not on behalf
+
+   of any other Contributor, and only if You agree to indemnify,
+
+   defend, and hold each Contributor harmless for any liability
+
+   incurred by, or claims asserted against, such Contributor by reason
+
+   of your accepting any such warranty or additional liability.
+
+
+
+
+END OF TERMS AND CONDITIONS
+
+
+
+
+APPENDIX: How to apply the Apache License to your work.
+
+
+
+
+   To apply the Apache License to your work, attach the following
+
+   boilerplate notice, with the fields enclosed by brackets "{}"
+
+   replaced with your own identifying information. (Don't include
+
+   the brackets!)  The text should be enclosed in the appropriate
+
+   comment syntax for the file format. We also recommend that a
+
+   file or class name and description of purpose be included on the
+
+   same "printed page" as the copyright notice for easier
+
+   identification within third-party archives.
+
+
+
+
+Copyright (C) 2017 Beijing Didi Infinity Technology and Development Co.,Ltd. All rights reserved.
+
+
+
+
+Licensed under the Apache License, Version 2.0 (the "License");
+
+you may not use this file except in compliance with the License.
+
+You may obtain a copy of the License at
+
+
+
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+
+
+
+Unless required by applicable law or agreed to in writing, software
+
+distributed under the License is distributed on an "AS IS" BASIS,
+
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+See the License for the specific language governing permissions and
+
+limitations under the License.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.10.4-beta.9",
+  "version": "2.10.5",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -109,5 +109,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "2d37697869b9bdda3efab92dda8c910b68fd05c0"
+  "gitHead": "80a4120733a1ee64e394ae58240497ea6721f435"
 }

package/src/platform/createApp.ios.js

@@ -4,10 +4,12 @@ import { makeMap, spreadProp, getFocusedNavigation, hasOwn } from '@mpxjs/utils'
 import { mergeLifecycle } from '../convertor/mergeLifecycle'
 import { LIFECYCLE } from '../platform/patch/lifecycle/index'
 import Mpx from '../index'
+import { reactive } from '../observer/reactive'
+import { watch } from '../observer/watch'
 import { createElement, memo, useRef, useEffect } from 'react'
 import * as ReactNative from 'react-native'
 import { initAppProvides } from './export/inject'
-import { NavigationContainer, createNativeStackNavigator, SafeAreaProvider } from './env/navigationHelper'
+import { NavigationContainer, createStackNavigator, SafeAreaProvider } from './env/navigationHelper'
 
 const appHooksMap = makeMap(mergeLifecycle(LIFECYCLE).app)
 
@@ -52,25 +54,25 @@ export default function createApp (options) {
 
   const pages = currentInject.getPages() || {}
   const firstPage = currentInject.firstPage
-  const Stack = createNativeStackNavigator()
+  const Stack = createStackNavigator()
   const getPageScreens = (initialRouteName, initialParams) => {
     return Object.entries(pages).map(([key, item]) => {
-      // const options = {
-      //   // __mpxPageStatusMap 为编译注入的全局变量
-      //   headerShown: !(Object.assign({}, global.__mpxPageConfig, global.__mpxPageConfigsMap[key]).navigationStyle === 'custom')
-      // }
+      const options = {
+        // __mpxPageStatusMap 为编译注入的全局变量
+        headerShown: !(Object.assign({}, global.__mpxPageConfig, global.__mpxPageConfigsMap[key]).navigationStyle === 'custom')
+      }
       if (key === initialRouteName) {
         return createElement(Stack.Screen, {
           name: key,
           component: item,
-          initialParams
-          // options
+          initialParams,
+          options
         })
       }
       return createElement(Stack.Screen, {
         name: key,
-        component: item
-        // options
+        component: item,
+        options
       })
     })
   }
@@ -90,36 +92,55 @@ export default function createApp (options) {
       global.__navigationHelper.lastFailCallback = null
     }
   }
-
-  const onAppStateChange = (currentState) => {
-    // 业务上配置禁止的话就不响应监听事件
-    if (currentState === 'active') {
-      let options = global.__mpxEnterOptions || {}
-      const navigation = getFocusedNavigation()
-      if (navigation) {
-        const state = navigation.getState()
-        const current = state.routes[state.index]
-        options = {
-          path: current.name,
-          query: current.params,
-          scene: 0,
-          shareTicket: '',
-          referrerInfo: {}
+  const appState = reactive({ state: '' })
+  // TODO hideReason 暂未完全模拟
+  // 0用户退出小程序
+  // 1进入其他小程序
+  // 2打开原生功能页
+  // 3其他
+  watch(() => appState.state, (value) => {
+    if (value === 'show') {
+      let options = appState.showOptions
+      delete appState.showOptions
+      if (!options) {
+        const navigation = getFocusedNavigation()
+        if (navigation) {
+          const state = navigation.getState()
+          const current = state.routes[state.index]
+          options = {
+            path: current.name,
+            query: current.params,
+            scene: 0,
+            shareTicket: '',
+            referrerInfo: {}
+          }
+        } else {
+          options = {}
         }
       }
       global.__mpxAppCbs.show.forEach((cb) => {
         cb(options)
       })
-      if (navigation && hasOwn(global.__mpxPageStatusMap, navigation.pageId)) {
-        global.__mpxPageStatusMap[navigation.pageId] = 'show'
-      }
-    } else if (currentState === 'inactive' || currentState === 'background') {
+    } else if (value === 'hide') {
+      const reason = appState.hideReason ?? 3
+      delete appState.hideReason
       global.__mpxAppCbs.hide.forEach((cb) => {
         cb({
-          reason: 3
+          reason
         })
       })
-      const navigation = getFocusedNavigation()
+    }
+  }, { sync: true })
+  const onAppStateChange = (currentState) => {
+    const navigation = getFocusedNavigation()
+    if (currentState === 'active') {
+      appState.state = 'show'
+      if (navigation && hasOwn(global.__mpxPageStatusMap, navigation.pageId)) {
+        global.__mpxPageStatusMap[navigation.pageId] = 'show'
+      }
+    } else if (currentState === 'inactive' || currentState === 'background') {
+      appState.hideReason = 3
+      appState.state = 'hide'
       if (navigation && hasOwn(global.__mpxPageStatusMap, navigation.pageId)) {
         global.__mpxPageStatusMap[navigation.pageId] = 'hide'
       }
@@ -162,9 +183,8 @@ export default function createApp (options) {
           global.__mpxLaunchOptions = options
           defaultOptions.onLaunch && defaultOptions.onLaunch.call(appInstance, options)
         }
-        global.__mpxAppCbs.show.forEach((cb) => {
-          cb(options)
-        })
+        appState.showOptions = options
+        appState.state = 'show'
         global.__mpxAppLaunched = true
         global.__mpxAppHotLaunched = true
       }
@@ -173,7 +193,7 @@ export default function createApp (options) {
     useEffect(() => {
       const changeSubscription = ReactNative.AppState.addEventListener('change', (state) => {
         // 外层可能会异常设置此配置，因此加载监听函数内部
-        if (Mpx.config.rnConfig.disableReactNativeAppStateChange) return
+        if (Mpx.config.rnConfig.disableAppStateListener) return
         onAppStateChange(state)
       })
 
@@ -189,12 +209,8 @@ export default function createApp (options) {
         }
       })
       return () => {
-        // todo 跳到原生页面或者其他rn bundle可以考虑使用reason 1/2进行模拟抹平
-        global.__mpxAppCbs.hide.forEach((cb) => {
-          cb({
-            reason: 0
-          })
-        })
+        appState.hideReason = 0
+        appState.state = 'hide'
         changeSubscription && changeSubscription.remove()
         resizeSubScription && resizeSubScription.remove()
       }
@@ -202,10 +218,32 @@ export default function createApp (options) {
 
     const { initialRouteName, initialParams } = initialRouteRef.current
     const navScreenOpts = {
-      headerShown: false,
-      statusBarTranslucent: true,
-      statusBarBackgroundColor: 'transparent'
-   }
+      // 7.x替换headerBackTitleVisible
+      // headerBackButtonDisplayMode: 'minimal',
+      headerBackTitleVisible: false,
+      headerShadowVisible: false
+      // 整体切换native-stack时进行修改如下
+      // statusBarTranslucent: true,
+      // statusBarBackgroundColor: 'transparent'
+    }
+    if (__mpx_mode__ === 'ios') {
+      // ios使用native-stack
+      const headerBackImageSource = Mpx.config.rnConfig.headerBackImageSource || null
+      if (headerBackImageSource) {
+        navScreenOpts.headerBackImageSource = headerBackImageSource
+      }
+    } else {
+      // 安卓上会出现导航条闪现的问题所以默认加headerShown false（stack版本， native-stack版本可以干掉）
+      // iOS加上默认headerShown false的话会因为iOS根高度是screenHeight - useHeaderHeight()会导致出现渲染两次情况，因此iOS不加此默认值
+      navScreenOpts.headerShown = false
+      // 安卓和鸿蒙先用stack
+      const headerBackImageProps = Mpx.config.rnConfig.headerBackImageProps || null
+      if (headerBackImageProps) {
+        navScreenOpts.headerBackImage = () => {
+          return createElement(ReactNative.Image, headerBackImageProps)
+        }
+      }
+    }
 
     return createElement(SafeAreaProvider,
       null,
@@ -247,6 +285,6 @@ export default function createApp (options) {
     onAppStateChange('active')
   }
   global.setAppHide = function () {
-    onAppStateChange('background')
+    onAppStateChange('inactive')
   }
 }

package/src/platform/env/navigationHelper.android.js

@@ -1,4 +1,4 @@
-import { createNativeStackNavigator } from '@react-navigation/native-stack'
+import { createStackNavigator } from '@react-navigation/stack'
 import { NavigationContainer, StackActions } from '@react-navigation/native'
 import PortalHost from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/mpx-portal/portal-host'
 import { useHeaderHeight } from '@react-navigation/elements'
@@ -6,7 +6,7 @@ import { SafeAreaProvider, useSafeAreaInsets } from 'react-native-safe-area-cont
 import { GestureHandlerRootView } from 'react-native-gesture-handler'
 
 export {
-  createNativeStackNavigator,
+  createStackNavigator,
   NavigationContainer,
   useHeaderHeight,
   StackActions,

package/src/platform/env/navigationHelper.ios.js

@@ -1,4 +1,4 @@
-import { createNativeStackNavigator } from '@react-navigation/native-stack'
+import { createNativeStackNavigator as createStackNavigator } from '@react-navigation/native-stack'
 import { NavigationContainer, StackActions } from '@react-navigation/native'
 import PortalHost from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/mpx-portal/portal-host'
 import { useHeaderHeight } from '@react-navigation/elements'
@@ -6,7 +6,7 @@ import { SafeAreaProvider, useSafeAreaInsets } from 'react-native-safe-area-cont
 import { GestureHandlerRootView } from 'react-native-gesture-handler'
 
 export {
-  createNativeStackNavigator,
+  createStackNavigator,
   NavigationContainer,
   useHeaderHeight,
   StackActions,

package/src/platform/patch/getDefaultOptions.ios.js

@@ -1,4 +1,4 @@
-import { useEffect, useSyncExternalStore, useRef, useMemo, createElement, memo, forwardRef, useImperativeHandle, useContext, Fragment, cloneElement, createContext } from 'react'
+import { useEffect, useLayoutEffect, useSyncExternalStore, useRef, useMemo, createElement, memo, forwardRef, useImperativeHandle, useContext, Fragment, cloneElement, createContext } from 'react'
 import * as ReactNative from 'react-native'
 import { ReactiveEffect } from '../../observer/effect'
 import { watch } from '../../observer/watch'
@@ -15,8 +15,7 @@ import {
   KeyboardAvoidContext,
   RouteContext
 } from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/context'
-import { PortalHost, useSafeAreaInsets, GestureHandlerRootView } from '../env/navigationHelper'
-import { innerNav, useInnerHeaderHeight } from '../env/nav'
+import { PortalHost, useSafeAreaInsets, GestureHandlerRootView, useHeaderHeight } from '../env/navigationHelper'
 
 const ProviderContext = createContext(null)
 function getSystemInfo () {
@@ -52,7 +51,7 @@ function createEffect (proxy, components) {
     if (tagName === 'block') return Fragment
     const appComponents = global.__getAppComponents?.() || {}
     const generichash = proxy.target.generichash || ''
-    const genericComponents = global.__mpxGenericsMap?.[generichash] || noop
+    const genericComponents = global.__mpxGenericsMap[generichash] || noop
     return components[tagName] || genericComponents(tagName) || appComponents[tagName] || getByPath(ReactNative, tagName)
   }
   const innerCreateElement = (type, ...rest) => {
@@ -393,7 +392,7 @@ function usePageEffect (mpxProxy, pageId) {
           } else if (/^resize/.test(newVal)) {
             triggerResizeEvent(mpxProxy)
           }
-        })
+        }, { sync: true })
       }
     }
     return () => {
@@ -446,28 +445,9 @@ const checkRelation = (options) => {
     hasAncestorRelation
   }
 }
-function getLayoutData (headerHeight) {
-  const screenDimensions = ReactNative.Dimensions.get('screen')
-  const windowDimensions = ReactNative.Dimensions.get('window')
-  // 在横屏状态下 screen.height = window.height + bottomVirtualHeight
-  // 在正常状态   screen.height =  window.height + bottomVirtualHeight + statusBarHeight
-  const isLandscape = screenDimensions.height < screenDimensions.width
-  const bottomVirtualHeight = isLandscape ? screenDimensions.height - windowDimensions.height : ((screenDimensions.height - windowDimensions.height - ReactNative.StatusBar.currentHeight) || 0)
-  return {
-    x: 0,
-    y: headerHeight,
-    left: 0,
-    top: headerHeight,
-    // 此处必须为windowDimensions.width，在横屏状态下windowDimensions.width才符合预期
-    width: windowDimensions.width,
-    height: screenDimensions.height - headerHeight - bottomVirtualHeight,
-    // ios为0 android为实际statusbar高度
-    statusBarHeight: ReactNative.StatusBar.currentHeight || 0,
-    bottomVirtualHeight: bottomVirtualHeight,
-    isLandscape: isLandscape
-  }
-}
 
+// 临时用来存储安卓底部（iOS没有这个）的高度（虚拟按键等高度）根据第一次进入推算
+let bottomVirtualHeight = null
 export function PageWrapperHOC (WrappedComponent) {
   return function PageWrapperCom ({ navigation, route, pageConfig = {}, ...props }) {
     const rootRef = useRef(null)
@@ -484,15 +464,59 @@ export function PageWrapperHOC (WrappedComponent) {
       error('Using pageWrapper requires passing navigation and route')
       return null
     }
-    const headerHeight = useInnerHeaderHeight(currentPageConfig)
-    navigation.layout = getLayoutData(headerHeight)
-    const onLayout = () => {
-      // 当用户处于横屏或者竖屏状态的时候，需要进行layout修正
-      navigation.layout = getLayoutData(headerHeight)
-    }
-
     usePageStatus(navigation, currentPageId)
+    useLayoutEffect(() => {
+      navigation.setOptions({
+        title: pageConfig.navigationBarTitleText?.trim() || '',
+        headerStyle: {
+          backgroundColor: pageConfig.navigationBarBackgroundColor || '#000000'
+        },
+        headerTintColor: pageConfig.navigationBarTextStyle || 'white'
+      })
 
+      // TODO 此部分内容在native-stack可删除，用setOptions设置
+      if (__mpx_mode__ !== 'ios') {
+        ReactNative.StatusBar.setBarStyle(pageConfig.barStyle || 'dark-content')
+        ReactNative.StatusBar.setTranslucent(true) // 控制statusbar是否占位
+        ReactNative.StatusBar.setBackgroundColor('transparent')
+      }
+    }, [])
+
+    const headerHeight = useHeaderHeight()
+    const onLayout = () => {
+      const screenDimensions = ReactNative.Dimensions.get('screen')
+      if (__mpx_mode__ === 'ios') {
+        navigation.layout = {
+          x: 0,
+          y: headerHeight,
+          width: screenDimensions.width,
+          height: screenDimensions.height - headerHeight
+        }
+      } else {
+        if (bottomVirtualHeight === null) {
+          rootRef.current?.measureInWindow((x, y, width, height) => {
+            // 沉浸模式的计算方式
+            bottomVirtualHeight = screenDimensions.height - height - headerHeight
+            // 非沉浸模式（translucent=true）计算方式, 现在默认是全用沉浸模式，所以先不算这个
+            // bottomVirtualHeight = windowDimensions.height - height - headerHeight
+            navigation.layout = {
+              x: 0,
+              y: headerHeight,
+              width: screenDimensions.width,
+              height: height
+            }
+          })
+        } else {
+          navigation.layout = {
+            x: 0,
+            y: headerHeight, // 这个y值
+            width: screenDimensions.width,
+            // 后续页面的layout是通过第一次路由进入时候推算出来的底部区域来推算出来的
+            height: screenDimensions.height - bottomVirtualHeight - headerHeight
+          }
+        }
+      }
+    }
     const withKeyboardAvoidingView = (element) => {
       return createElement(KeyboardAvoidContext.Provider,
         {
@@ -511,26 +535,26 @@ export function PageWrapperHOC (WrappedComponent) {
         )
       )
     }
-    // android存在第一次打开insets都返回为0情况，后续会触发第二次渲染后正确
+
     navigation.insets = useSafeAreaInsets()
+
     return createElement(GestureHandlerRootView,
       {
-        style: {
-          flex: 1
-        }
+        // https://github.com/software-mansion/react-native-reanimated/issues/6639 因存在此问题，iOS在页面上进行定宽来暂时规避
+        style: __mpx_mode__ === 'ios' && currentPageConfig?.navigationStyle !== 'custom'
+          ? {
+            height: ReactNative.Dimensions.get('screen').height - useHeaderHeight()
+          }
+          : {
+            flex: 1
+          }
       },
-      createElement(innerNav, {
-        props: { pageConfig: currentPageConfig },
-        navigation
-      }),
       withKeyboardAvoidingView(
         createElement(ReactNative.View,
           {
             style: {
               flex: 1,
-              backgroundColor: currentPageConfig?.backgroundColor || '#fff',
-              // 解决页面内有元素定位relative left为负值的时候，回退的时候还能看到对应元素问题
-              overflow: 'hidden'
+              backgroundColor: currentPageConfig?.backgroundColor || '#fff'
             },
             ref: rootRef,
             onLayout
@@ -558,6 +582,7 @@ export function PageWrapperHOC (WrappedComponent) {
       ))
   }
 }
+
 export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
   rawOptions = mergeOptions(rawOptions, type, false)
   const components = Object.assign({}, rawOptions.components, currentInject.getComponents())
@@ -631,8 +656,13 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
       return () => {
         proxy.unmounted()
         proxy.target.__resetInstance()
+        // 热更新下会销毁旧页面并创建新页面组件，且旧页面组件销毁时机晚于新页面组件创建，此时__mpxPagesMap中存储的为新页面组件，不应该删除
+        // 所以需要判断路由表中存储的页面实例是否为当前页面实例
         if (type === 'page') {
-          delete global.__mpxPagesMap[props.route.key]
+          const routeKey = props.route.key
+          if (global.__mpxPagesMap[routeKey] && global.__mpxPagesMap[routeKey][0] === instance) {
+            delete global.__mpxPagesMap[routeKey]
+          }
         }
       }
     }, [])

package/src/platform/env/nav.js

@@ -1,108 +0,0 @@
-import { createElement, useState, useMemo } from 'react'
-import { useSafeAreaInsets } from 'react-native-safe-area-context'
-import * as ReactNative from 'react-native'
-import Mpx from '../../index'
-
-export function useInnerHeaderHeight (pageconfig) {
-  if (pageconfig.navigationStyle === 'custom') {
-    return 0
-  } else {
-    const safeAreaTop = useSafeAreaInsets()?.top || 0
-    const headerHeight = safeAreaTop + getTitleHeight()
-    return headerHeight
-  }
-}
-
-// 固定写死高度
-function getTitleHeight () {
-  return 44
-}
-
-// 计算颜色亮度
-const getColorBrightness = (color) => {
-  const processedColor = ReactNative.processColor(color)
-  if (typeof processedColor === 'number') {
-      const r = (processedColor >> 16) & 255
-      const g = (processedColor >> 8) & 255
-      const b = processedColor & 255
-      return (r * 299 + g * 587 + b * 114) / 1000
-  }
-  return 0
-}
-
-const styles = ReactNative.StyleSheet.create({
-  header: {
-    elevation: 3
-  },
-  headerContent: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    justifyContent: 'center'
-  },
-  backButton: {
-    position: 'absolute',
-    height: '100%',
-    width: 40,
-    left: 0,
-    top: 0,
-    alignItems: 'center',
-    justifyContent: 'center'
-  },
-  backButtonImage: {
-    width: 22,
-    height: 22
-  },
-  title: {
-    fontSize: 17,
-    fontWeight: 600
-  }
-})
-
-export function innerNav ({ props, navigation }) {
-  const { pageConfig } = props
-  const [innerPageConfig, setPageConfig] = useState(pageConfig || {})
-  navigation.setPageConfig = (config) => {
-    const newConfig = Object.assign({}, innerPageConfig, config)
-    setPageConfig(newConfig)
-  }
-
-  const isCustom = innerPageConfig.navigationStyle === 'custom'
-  if (isCustom) return null
-  const safeAreaTop = useSafeAreaInsets()?.top || 0
-
-  // 回退按钮的颜色，根据背景色的亮度来进行调节
-  const backButtonColor = useMemo(() => {
-    return getColorBrightness(innerPageConfig.navigationBarBackgroundColor) > 128 ? '#000000' : '#ffffff'
-  }, [innerPageConfig.navigationBarBackgroundColor])
-
-  // 假设是栈导航，获取栈的长度
-  const stackLength = navigation.getState()?.routes?.length
-  // 用于外部注册打开RN容器之前的栈长度
-  const beforeStackLength = Mpx.config?.rnConfig?.beforeStackLength || 0
-
-  // 回退按钮与图标
-  const backElement = stackLength + beforeStackLength > 1
-  ? createElement(ReactNative.TouchableOpacity, {
-    style: [styles.backButton],
-    onPress: () => { navigation.goBack() }
-  }, createElement(ReactNative.Image, {
-    source: { uri: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAABICAYAAACqT5alAAAA2UlEQVR4nO3bMQrCUBRE0Yla6AYEN2nnBrTL+izcitW3MRDkEUWSvPzJvfCqgMwhZbAppWhNbbIHzB1g9wATERFRVyvpkj1irlpJ5X326D7WHh1hbdFD2CLpLmmftm7kfsEe09aNHFiBrT+wAlt/YAW2/sAKbP2BFdj6Ayuwy+ufz6XPL893krZ//O6iu2n4LT8kndLWTRTo4EC7BDo40C6BDg60S6CDA+0S6OBAuwQ6uNWiD2nrJmoIfU7cNWkR2hbb1UfbY7uuWhGWiIg+a/iHuHmA3QPs3gu4JW9Gan+OJAAAAABJRU5ErkJggg==' },
-    style: [styles.backButtonImage, { tintColor: backButtonColor }]
-  }))
-  : null
-
-  return createElement(ReactNative.View, {
-      style: [styles.header, {
-          paddingTop: safeAreaTop,
-          backgroundColor: innerPageConfig.navigationBarBackgroundColor || '#000000'
-        }]
-      },
-      createElement(ReactNative.View, {
-        style: styles.headerContent,
-        height: getTitleHeight()
-      }, backElement,
-      createElement(ReactNative.Text, {
-        style: [styles.title, { color: innerPageConfig.navigationBarTextStyle || 'white' }]
-      }, innerPageConfig.navigationBarTitleText?.trim() || ''))
-    )
-}