@mpxjs/core 2.10.7 → 2.10.8-beta.2

package/@types/index.d.ts

@@ -7,7 +7,7 @@
 /// <reference path="./global.d.ts" />
 /// <reference path="./node.d.ts" />
 
-import { GetComputedType } from '@mpxjs/store'
+import type { GetComputedType } from '@mpxjs/store'
 
 export * from '@mpxjs/store'
 
@@ -255,11 +255,22 @@ interface AnyConstructor {
   prototype: any
 }
 
-interface WebviewConfig {
+export interface WebviewConfig {
   hostWhitelists?: Array<string>
   apiImplementations?: object
 }
 
+export interface RnConfig {
+  onStateChange?: (state: any) => void
+  parseAppProps?: (props: any) => ({ initialRouteName?: string, initialParams?: any } | undefined | null | void)
+  /**
+   * 外层可能会异常设置此配置，因此加载监听函数内部
+   */
+  disableAppStateListener?: boolean
+  /** 进入页面是否控制回退按钮的展示以及监听回退按钮的点击 */
+  onStackTopBack?: () => void
+}
+
 interface MpxConfig {
   useStrictDiff: boolean
   ignoreWarning: boolean | string | RegExp | ((msg: string, location: string, e: Error) => boolean)
@@ -272,8 +283,14 @@ interface MpxConfig {
   forceFlushSync: boolean,
   webRouteConfig: object,
   webConfig: object,
+  /*
+   * 支持两个属性
+   * hostWhitelists Array 类型 支持h5域名白名单安全校验
+   * apiImplementations webview JSSDK接口 例如getlocation
+  */
   webviewConfig: WebviewConfig,
-  rnConfig: object,
+  /** react-native 相关配置，用于挂载事件等，如 onShareAppMessage */
+  rnConfig?: RnConfig,
 }
 
 type SupportedMode = 'wx' | 'ali' | 'qq' | 'swan' | 'tt' | 'web' | 'qa'
@@ -664,9 +681,15 @@ export const SERVERPREFETCH: string
 export const REACTHOOKSEXEC: string
 
 declare global {
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-expect-error
   const defineProps: (<T extends Properties = {}>(props: T) => Readonly<GetPropsType<T>>) & (<T>() => Readonly<T>)
   const defineOptions: <D extends Data = {}, P extends Properties = {}, C = {}, M extends Methods = {}, Mi extends Array<any> = [], S extends AnyObject = {}, O extends AnyObject = {}> (opt: ThisTypedComponentOpt<D, P, C, M, Mi, S, O>) => void
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-expect-error
   const defineExpose: <E extends AnyObject = AnyObject>(exposed?: E) => void
   const useContext: () => Context
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-expect-error
   const withDefaults: <Props, Defaults extends InferDefaults<Props>>(props: Props, defaults: Defaults) => PropsWithDefaults<Props, Defaults>
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.10.7",
+  "version": "2.10.8-beta.2",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -19,7 +19,7 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.10.6",
+    "@mpxjs/utils": "^2.10.8",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.10.0"
   },
@@ -109,5 +109,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "3c56726c27464abac9cea343167d1b40933fff0d"
+  "gitHead": "2d37697869b9bdda3efab92dda8c910b68fd05c0"
 }

package/src/index.js

@@ -115,6 +115,9 @@ function use (plugin, options = {}) {
 
 APIs.use = use
 
+/**
+ * @returns {import('@mpxjs/core').Mpx}
+ */
 function factory () {
   // 作为原型挂载属性的中间层
   function Mpx () {
@@ -125,6 +128,9 @@ function factory () {
   return Mpx
 }
 
+/**
+ * @type {import('@mpxjs/core').Mpx}
+ */
 const Mpx = factory()
 
 Mpx.config = {

package/src/platform/builtInMixins/pageRouteMixin.ios.js

@@ -4,7 +4,7 @@ export default function pageRouteMixin (mixinType) {
   if (mixinType === 'page') {
     return {
       [BEFORECREATE] () {
-        const mpxEventChannel = global.__mpxEventChannel
+        const mpxEventChannel = global.__mpxEventChannel || {}
         if (mpxEventChannel.route === this.route) {
           this._eventChannel = mpxEventChannel.eventChannel
         } else {

package/src/platform/builtInMixins/styleHelperMixin.ios.js

@@ -2,6 +2,9 @@ import { isObject, isArray, dash2hump, cached, isEmptyObject } from '@mpxjs/util
 import { Dimensions, StyleSheet } from 'react-native'
 
 let { width, height } = Dimensions.get('screen')
+// TODO 临时适配折叠屏场景适配
+const isLargeFoldableLike = (__mpx_mode__ === 'android') && (height / width < 1.5) && (width > 600)
+if (isLargeFoldableLike) width = width / 2
 
 Dimensions.addEventListener('change', ({ screen }) => {
   width = screen.width

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选项目前不需要进行转换
@@ -53,44 +63,38 @@ export default function createApp (options) {
   defaultOptions.onUnhandledRejection && global.__mpxAppCbs.rejection.push(defaultOptions.onUnhandledRejection.bind(appInstance))
   defaultOptions.onAppInit && defaultOptions.onAppInit()
 
-  const pages = currentInject.getPages() || {}
+  const pagesMap = currentInject.pagesMap || {}
   const firstPage = currentInject.firstPage
   const Stack = createNativeStackNavigator()
-  const withHeader = (wrappedComponent, { pageConfig = {} }) => {
-      return ({ navigation, ...props }) => {
-        return createElement(GestureHandlerRootView,
-        {
-          style: {
-            flex: 1
-          }
-        },
-        createElement(innerNav, {
-          pageConfig: pageConfig,
-          navigation
-        }),
-        createElement(wrappedComponent, { navigation, ...props })
-      )
-    }
-  }
   const getPageScreens = (initialRouteName, initialParams) => {
-    return Object.entries(pages).map(([key, item]) => {
-      // const options = {
-      //   // __mpxPageStatusMap 为编译注入的全局变量
-      //   headerShown: !(Object.assign({}, global.__mpxPageConfig, global.__mpxPageConfigsMap[key]).navigationStyle === 'custom')
-      // }
+    return Object.entries(pagesMap).map(([key, item]) => {
       const pageConfig = Object.assign({}, global.__mpxPageConfig, global.__mpxPageConfigsMap[key])
+      const headerLayout = ({ navigation, children }) => {
+        return createElement(GestureHandlerRootView,
+          {
+            style: {
+              flex: 1
+            }
+          },
+          createElement(getMpxNav(), {
+            pageConfig: pageConfig,
+            navigation
+          }),
+          children
+        )
+      }
       if (key === initialRouteName) {
         return createElement(Stack.Screen, {
           name: key,
-          component: withHeader(item, { pageConfig }),
-          initialParams
-          // options
+          getComponent: () => item(),
+          initialParams,
+          layout: headerLayout
         })
       }
       return createElement(Stack.Screen, {
         name: key,
-        component: withHeader(item, { pageConfig })
-        // options
+        getComponent: () => item(),
+        layout: headerLayout
       })
     })
   }
@@ -239,7 +243,7 @@ export default function createApp (options) {
       headerShown: false,
       statusBarTranslucent: true,
       statusBarBackgroundColor: 'transparent'
-   }
+    }
 
     return createElement(SafeAreaProvider,
       null,
@@ -248,13 +252,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/env/index.ios.js

@@ -10,13 +10,15 @@ export function init (Mpx) {
     show: [],
     hide: [],
     error: [],
-    rejection: []
+    rejection: [],
+    lazyLoad: []
   }
   global.__navigationHelper = navigationHelper
   if (global.i18n) {
     Mpx.i18n = createI18n(global.i18n)
   }
   initGlobalErrorHandling()
+  initGlobalLazyLoadHandling()
 }
 
 function initGlobalErrorHandling () {
@@ -63,3 +65,13 @@ function initGlobalErrorHandling () {
     require('promise/setimmediate/rejection-tracking').enable(rejectionTrackingOptions)
   }
 }
+
+function initGlobalLazyLoadHandling () {
+  global.onLazyLoadError = function (error) {
+    if (global.__mpxAppCbs?.lazyLoad?.length) {
+      global.__mpxAppCbs.lazyLoad.forEach((cb) => {
+        cb(error)
+      })
+    }
+  }
+}

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

@@ -1,14 +1,12 @@
 import { createNativeStackNavigator } 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'
 import { SafeAreaProvider, useSafeAreaInsets } from 'react-native-safe-area-context'
 import { GestureHandlerRootView } from 'react-native-gesture-handler'
 
 export {
   createNativeStackNavigator,
   NavigationContainer,
-  useHeaderHeight,
   StackActions,
   GestureHandlerRootView,
   PortalHost,

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 () {
@@ -33,7 +33,7 @@ function getSystemInfo () {
   }
 }
 
-function createEffect (proxy, components) {
+function createEffect (proxy, componentsMap) {
   const update = proxy.update = () => {
     // react update props in child render(async), do not need exec pre render
     // if (proxy.propsUpdatedFlag) {
@@ -50,10 +50,11 @@ function createEffect (proxy, components) {
   const getComponent = (tagName) => {
     if (!tagName) return null
     if (tagName === 'block') return Fragment
-    const appComponents = global.__getAppComponents?.() || {}
+    const appComponentsMap = global.__appComponentsMap || {}
     const generichash = proxy.target.generichash || ''
-    const genericComponents = global.__mpxGenericsMap?.[generichash] || noop
-    return components[tagName] || genericComponents(tagName) || appComponents[tagName] || getByPath(ReactNative, tagName)
+    const genericComponentsMap = global.__mpxGenericsMap?.[generichash] || {}
+    const componentGetter = componentsMap[tagName] || genericComponentsMap[tagName] || appComponentsMap[tagName]
+    return componentGetter ? componentGetter() : getByPath(ReactNative, tagName)
   }
   const innerCreateElement = (type, ...rest) => {
     if (!type) return null
@@ -123,6 +124,13 @@ const instanceProto = {
   createIntersectionObserver (opt) {
     return createIntersectionObserver(this, opt, this.__intersectionCtx)
   },
+  // 触发页面范围内的所有observer的计算
+  __triggerIntersectionObserver () {
+    const intersectionObservers = this.__intersectionCtx
+    for (const key in this.__intersectionCtx) {
+      intersectionObservers[key].throttleMeasure()
+    }
+  },
   __resetInstance () {
     this.__dispatchedSlotSet = new WeakSet()
   },
@@ -203,7 +211,7 @@ const instanceProto = {
   }
 }
 
-function createInstance ({ propsRef, type, rawOptions, currentInject, validProps, components, pageId, intersectionCtx, relation, parentProvides }) {
+function createInstance ({ propsRef, type, rawOptions, currentInject, validProps, componentsMap, pageId, intersectionCtx, relation, parentProvides }) {
   const instance = Object.create(instanceProto, {
     dataset: {
       get () {
@@ -304,7 +312,14 @@ function createInstance ({ propsRef, type, rawOptions, currentInject, validProps
 
   if (type === 'page') {
     const props = propsRef.current
-    proxy.callHook(ONLOAD, [props.route.params || {}])
+    const loadParams = {}
+    // 此处拿到的props.route.params内属性的value被进行过了一次decode, 不符合预期，此处额外进行一次encode来与微信对齐
+    if (isObject(props.route.params)) {
+      for (const key in props.route.params) {
+        loadParams[key] = encodeURIComponent(props.route.params[key])
+      }
+    }
+    proxy.callHook(ONLOAD, [loadParams])
   }
 
   Object.assign(proxy, {
@@ -312,7 +327,7 @@ function createInstance ({ propsRef, type, rawOptions, currentInject, validProps
     stateVersion: Symbol(),
     subscribe: (onStoreChange) => {
       if (!proxy.effect) {
-        createEffect(proxy, components)
+        createEffect(proxy, componentsMap)
         proxy.stateVersion = Symbol()
       }
       proxy.onStoreChange = onStoreChange
@@ -328,7 +343,7 @@ function createInstance ({ propsRef, type, rawOptions, currentInject, validProps
   })
   // react数据响应组件更新管理器
   if (!proxy.effect) {
-    createEffect(proxy, components)
+    createEffect(proxy, componentsMap)
   }
 
   return instance
@@ -419,6 +434,26 @@ function usePageStatus (navigation, pageId) {
   }, [navigation])
 }
 
+function usePagePreload (route) {
+  const name = route.name
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      const preloadRule = global.__preloadRule || {}
+      const { packages } = preloadRule[name] || {}
+      if (packages?.length > 0) {
+        const downloadChunkAsync = mpxGlobal.__mpx.config?.rnConfig?.downloadChunkAsync
+        if (typeof downloadChunkAsync === 'function') {
+          callWithErrorHandling(() => downloadChunkAsync(packages))
+        }
+      }
+    }, 800)
+
+    return () => {
+      clearTimeout(timer)
+    }
+  }, [])
+}
+
 const RelationsContext = createContext(null)
 
 const checkRelation = (options) => {
@@ -485,6 +520,7 @@ export function PageWrapperHOC (WrappedComponent, pageConfig = {}) {
       return () => dimensionListener?.remove()
     }, [])
 
+    usePagePreload(route)
     usePageStatus(navigation, currentPageId)
 
     const withKeyboardAvoidingView = (element) => {
@@ -543,7 +579,12 @@ export function PageWrapperHOC (WrappedComponent, pageConfig = {}) {
 }
 export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
   rawOptions = mergeOptions(rawOptions, type, false)
-  const components = Object.assign({}, rawOptions.components, currentInject.getComponents())
+  const componentsMap = currentInject.componentsMap
+  if (rawOptions.components) {
+    Object.entries(rawOptions.components).forEach(([key, item]) => {
+      componentsMap[key] = () => item
+    })
+  }
   const validProps = Object.assign({}, rawOptions.props, rawOptions.properties)
   const { hasDescendantRelation, hasAncestorRelation } = checkRelation(rawOptions)
   if (rawOptions.methods) rawOptions.methods = wrapMethodsWithErrorHandling(rawOptions.methods)
@@ -561,7 +602,7 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
     let isFirst = false
     if (!instanceRef.current) {
       isFirst = true
-      instanceRef.current = createInstance({ propsRef, type, rawOptions, currentInject, validProps, components, pageId, intersectionCtx, relation, parentProvides })
+      instanceRef.current = createInstance({ propsRef, type, rawOptions, currentInject, validProps, componentsMap, pageId, intersectionCtx, relation, parentProvides })
     }
     const instance = instanceRef.current
     useImperativeHandle(ref, () => {
@@ -608,7 +649,6 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
     })
 
     usePageEffect(proxy, pageId)
-
     useEffect(() => {
       proxy.mounted()
       return () => {

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

@@ -89,8 +89,8 @@ export function getDefaultOptions ({ type, rawOptions = {} }) {
     },
     destroyed () {
       if (this.__mpxProxy) {
-        this.__mpxProxy.state = UNMOUNTED
         this.__mpxProxy.callHook(UNMOUNTED)
+        this.__mpxProxy.state = UNMOUNTED
       }
     },
     serverPrefetch (...args) {

package/LICENSE

@@ -1,433 +0,0 @@
-                              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/src/platform/env/nav.js

@@ -1,129 +0,0 @@
-import { createElement, useState, useMemo } from 'react'
-import { useSafeAreaInsets } from 'react-native-safe-area-context'
-import { StatusBar, processColor, TouchableOpacity, 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 function innerNav ({ 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
-  // 用于外部注册打开RN容器之前的栈长度
-  const beforeStackLength = Mpx.config?.rnConfig?.beforeStackLength || 0
-
-  // 回退按钮与图标
-  const backElement = stackLength + beforeStackLength > 1
-  ? createElement(TouchableOpacity, {
-    style: [styles.backButton],
-    onPress: () => { navigation.goBack() }
-  }, 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() || ''))
-    )
-}