@mpxjs/core 2.10.13-beta.1 → 2.10.14-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.10.13-beta.1",
+  "version": "2.10.14-beta.1",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",

package/src/platform/createApp.ios.js

@@ -10,7 +10,8 @@ import { createElement, memo, useRef, useEffect } from 'react'
 import * as ReactNative from 'react-native'
 import { initAppProvides } from './export/inject'
 import { NavigationContainer, createNativeStackNavigator, SafeAreaProvider, GestureHandlerRootView } from './env/navigationHelper'
-import { innerNav } from './env/nav'
+import createMpxNav from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/nav'
+import { NavSharedProvider } from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/mpx-nav-container'
 
 const appHooksMap = makeMap(mergeLifecycle(LIFECYCLE).app)
 
@@ -33,6 +34,15 @@ function filterOptions (options, appData) {
   return newOptions
 }
 
+let CachedMpxNav = null
+
+function getMpxNav() {
+  // Mpx toplevel 执行时获取不到
+  return (CachedMpxNav ??= createMpxNav({
+    Mpx
+  }))
+}
+
 export default function createApp (options) {
   const appData = {}
   // app选项目前不需要进行转换
@@ -66,7 +76,7 @@ export default function createApp (options) {
               flex: 1
             }
           },
-          createElement(innerNav, {
+          createElement(getMpxNav(), {
             pageConfig: pageConfig,
             navigation
           }),
@@ -108,7 +118,7 @@ export default function createApp (options) {
     }
   }
   const appState = reactive({ state: '' })
-  // TODO reason 目前支持模拟 0/3
+  // TODO hideReason 暂未完全模拟
   // 0用户退出小程序
   // 1进入其他小程序
   // 2打开原生功能页
@@ -136,10 +146,12 @@ export default function createApp (options) {
       global.__mpxAppCbs.show.forEach((cb) => {
         cb(options)
       })
-    } else if (value === 'hide' || value === 'exit') {
-       global.__mpxAppCbs.hide.forEach((cb) => {
+    } else if (value === 'hide') {
+      const reason = appState.hideReason ?? 3
+      delete appState.hideReason
+      global.__mpxAppCbs.hide.forEach((cb) => {
         cb({
-          reason: value === 'exit' ? 0 : 3
+          reason
         })
       })
     }
@@ -152,6 +164,7 @@ export default function createApp (options) {
         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'
@@ -221,7 +234,8 @@ export default function createApp (options) {
         }
       })
       return () => {
-        appState.state = 'exit'
+        appState.hideReason = 0
+        appState.state = 'hide'
         changeSubscription && changeSubscription.remove()
         resizeSubScription && resizeSubScription.remove()
       }
@@ -241,13 +255,13 @@ export default function createApp (options) {
           onStateChange,
           onUnhandledAction
         },
-        createElement(Stack.Navigator,
+        createElement(NavSharedProvider, null, createElement(Stack.Navigator,
           {
             initialRouteName,
             screenOptions: navScreenOpts
           },
           ...getPageScreens(initialRouteName, initialParams)
-        )
+        ))
       )
     )
   })

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

@@ -16,7 +16,7 @@ import {
   RouteContext
 } from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/context'
 import { PortalHost, useSafeAreaInsets } from '../env/navigationHelper'
-import { useInnerHeaderHeight } from '../env/nav'
+import { useInnerHeaderHeight } from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/nav'
 
 const ProviderContext = createContext(null)
 function getSystemInfo () {

package/src/platform/env/nav.js

@@ -1,137 +0,0 @@
-import { createElement, useState, useMemo, memo } from 'react'
-import { useSafeAreaInsets } from 'react-native-safe-area-context'
-import { StatusBar, processColor, TouchableWithoutFeedback, Image, View, StyleSheet, Text } from 'react-native'
-import Mpx from '../../index'
-
-function convertToHex (color) {
-  try {
-    const intColor = processColor(color)
-    if (intColor === null || intColor === undefined) {
-      return null
-    }
-    // 将32位整数颜色值转换为RGBA
-    const r = (intColor >> 16) & 255
-    const g = (intColor >> 8) & 255
-    const b = intColor & 255
-    // 转换为十六进制
-    const hexR = r.toString(16).padStart(2, '0')
-    const hexG = g.toString(16).padStart(2, '0')
-    const hexB = b.toString(16).padStart(2, '0')
-    return `#${hexR}${hexG}${hexB}`
-  } catch (error) {
-    return null
-  }
-}
-
-const titleHeight = 44
-export function useInnerHeaderHeight (pageconfig) {
-  if (pageconfig.navigationStyle === 'custom') {
-    return 0
-  } else {
-    const safeAreaTop = useSafeAreaInsets()?.top || 0
-    const headerHeight = safeAreaTop + titleHeight
-    return headerHeight
-  }
-}
-
-const styles = 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,
-    width: '60%',
-    textAlign: 'center'
-  }
-})
-const NavColor = {
-  White: '#ffffff',
-  Black: '#000000'
-}
-// navigationBarTextStyle只支持黑白'white'/'black
-const validBarTextStyle = (textStyle) => {
-  const textStyleColor = convertToHex(textStyle)
-  if (textStyle && [NavColor.White, NavColor.Black].includes(textStyleColor)) {
-    return textStyleColor
-  } else {
-    return NavColor.White
-  }
-}
-export const innerNav = memo(({ pageConfig, navigation }) => {
-  const [innerPageConfig, setPageConfig] = useState(pageConfig || {})
-  navigation.setPageConfig = (config) => {
-    const newConfig = Object.assign({}, innerPageConfig, config)
-    setPageConfig(newConfig)
-  }
-  const isCustom = innerPageConfig.navigationStyle === 'custom'
-  const navigationBarTextStyle = useMemo(() => validBarTextStyle(innerPageConfig.navigationBarTextStyle), [innerPageConfig.navigationBarTextStyle])
-  // 状态栏的颜色
-  const statusBarElement = createElement(StatusBar, {
-    translucent: true,
-    backgroundColor: 'transparent',
-    barStyle: (navigationBarTextStyle === NavColor.White) ? 'light-content' : 'dark-content' // 'default'/'light-content'/'dark-content'
-  })
-
-  if (isCustom) return statusBarElement
-  const safeAreaTop = useSafeAreaInsets()?.top || 0
-  // 假设是栈导航，获取栈的长度
-  const stackLength = navigation.getState()?.routes?.length
-  const onStackTopBack = Mpx.config?.rnConfig?.onStackTopBack
-  const isHandleStackTopBack = typeof onStackTopBack === 'function'
-
-  // 回退按钮与图标
-  const backElement = stackLength > 1 || isHandleStackTopBack
-    ? createElement(TouchableWithoutFeedback, {
-      onPress: () => {
-        if (stackLength <= 1 && isHandleStackTopBack) {
-          onStackTopBack()
-          return
-        }
-        navigation.goBack()
-      }
-    }, createElement(View, {
-      style: [styles.backButton]
-    }, createElement(Image, {
-      source: { uri: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAABICAYAAACqT5alAAAA2UlEQVR4nO3bMQrCUBRE0Yla6AYEN2nnBrTL+izcitW3MRDkEUWSvPzJvfCqgMwhZbAppWhNbbIHzB1g9wATERFRVyvpkj1irlpJ5X326D7WHh1hbdFD2CLpLmmftm7kfsEe09aNHFiBrT+wAlt/YAW2/sAKbP2BFdj6Ayuwy+ufz6XPL893krZ//O6iu2n4LT8kndLWTRTo4EC7BDo40C6BDg60S6CDA+0S6OBAuwQ6uNWiD2nrJmoIfU7cNWkR2hbb1UfbY7uuWhGWiIg+a/iHuHmA3QPs3gu4JW9Gan+OJAAAAABJRU5ErkJggg==' },
-      // 回退按钮的颜色与设置的title文案颜色一致
-      style: [styles.backButtonImage, { tintColor: navigationBarTextStyle }]
-    })
-    ))
-    : null
-
-  return createElement(View, {
-    style: [styles.header, {
-      paddingTop: safeAreaTop,
-      backgroundColor: innerPageConfig.navigationBarBackgroundColor || '#000000'
-    }]
-  },
-    statusBarElement,
-    createElement(View, {
-      style: styles.headerContent,
-      height: titleHeight
-    }, backElement,
-      createElement(Text, {
-        style: [styles.title, { color: navigationBarTextStyle }],
-        numberOfLines: 1
-      }, innerPageConfig.navigationBarTitleText?.trim() || ''))
-  )
-})