@mpxjs/core 2.10.7 → 2.10.9

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.9",
   "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": "be35dbe5958da40bf149768171798b4776e63937"
 }

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

@@ -53,44 +53,41 @@ 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(innerNav, {
+            pageConfig: pageConfig,
+            navigation
+          }),
+          children
+        )
+      }
+      const getComponent = () => {
+        return item.displayName ? item : item()
+      }
       if (key === initialRouteName) {
         return createElement(Stack.Screen, {
           name: key,
-          component: withHeader(item, { pageConfig }),
-          initialParams
-          // options
+          getComponent,
+          initialParams,
+          layout: headerLayout
         })
       }
       return createElement(Stack.Screen, {
         name: key,
-        component: withHeader(item, { pageConfig })
-        // options
+        getComponent,
+        layout: headerLayout
       })
     })
   }
@@ -239,7 +236,7 @@ export default function createApp (options) {
       headerShown: false,
       statusBarTranslucent: true,
       statusBarBackgroundColor: 'transparent'
-   }
+    }
 
     return createElement(SafeAreaProvider,
       null,

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/nav.js

@@ -1,6 +1,6 @@
-import { createElement, useState, useMemo } from 'react'
+import { createElement, useState, useMemo, memo } from 'react'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
-import { StatusBar, processColor, TouchableOpacity, Image, View, StyleSheet, Text } from 'react-native'
+import { StatusBar, processColor, TouchableWithoutFeedback, Image, View, StyleSheet, Text } from 'react-native'
 import Mpx from '../../index'
 
 function convertToHex (color) {
@@ -76,7 +76,7 @@ const validBarTextStyle = (textStyle) => {
     return NavColor.White
   }
 }
-export function innerNav ({ pageConfig, navigation }) {
+export const innerNav = memo(({ pageConfig, navigation }) => {
   const [innerPageConfig, setPageConfig] = useState(pageConfig || {})
   navigation.setPageConfig = (config) => {
     const newConfig = Object.assign({}, innerPageConfig, config)
@@ -95,35 +95,43 @@ export function innerNav ({ pageConfig, navigation }) {
   const safeAreaTop = useSafeAreaInsets()?.top || 0
   // 假设是栈导航，获取栈的长度
   const stackLength = navigation.getState()?.routes?.length
-  // 用于外部注册打开RN容器之前的栈长度
-  const beforeStackLength = Mpx.config?.rnConfig?.beforeStackLength || 0
+  const onStackTopBack = Mpx.config?.rnConfig?.onStackTopBack
+  const isHandleStackTopBack = typeof onStackTopBack === 'function'
 
   // 回退按钮与图标
-  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
+  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,
+    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() || ''))
-    )
-}
+  )
+})

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

@@ -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 component = componentsMap[tagName] || genericComponentsMap[tagName] || appComponentsMap[tagName]
+    return component ? component.displayName ? component : component() : 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) {