@mpxjs/core 2.10.7-beta.9 → 2.10.8-beta.2

package/@types/index.d.ts

@@ -267,13 +267,8 @@ export interface RnConfig {
    * 外层可能会异常设置此配置，因此加载监听函数内部
    */
   disableAppStateListener?: boolean
-  /** 进入页面是否控制回推按钮的展示以及监听回推按钮的点击 */
-  stackTopConfig?: {
-    /** 是否展示回退按钮 */
-    show?: boolean,
-    /** 监听回退按钮点击 */
-    listener?: Function
-  }
+  /** 进入页面是否控制回退按钮的展示以及监听回退按钮的点击 */
+  onStackTopBack?: () => void
 }
 
 interface MpxConfig {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.10.7-beta.9",
+  "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 | ^2.10.6-beta.1",
+    "@mpxjs/utils": "^2.10.8",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.10.0"
   },

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

@@ -15,8 +15,8 @@ import {
   KeyboardAvoidContext,
   RouteContext
 } from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/context'
-import { PortalHost, useSafeAreaInsets, GestureHandlerRootView } from '../env/navigationHelper'
-import { useInnerHeaderHeight } from '../env/nav'
+import { PortalHost, useSafeAreaInsets } from '../env/navigationHelper'
+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) => {
@@ -447,8 +482,6 @@ function getLayoutData (headerHeight) {
   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才符合预期
@@ -479,11 +512,15 @@ export function PageWrapperHOC (WrappedComponent, pageConfig = {}) {
     }
     const headerHeight = useInnerHeaderHeight(currentPageConfig)
     navigation.layout = getLayoutData(headerHeight)
-    const onLayout = () => {
-      // 当用户处于横屏或者竖屏状态的时候，需要进行layout修正
-      navigation.layout = getLayoutData(headerHeight)
-    }
 
+    useEffect(() => {
+      const dimensionListener = ReactNative.Dimensions.addEventListener('change', ({ screen }) => {
+        navigation.layout = getLayoutData(headerHeight)
+      })
+      return () => dimensionListener?.remove()
+    }, [])
+
+    usePagePreload(route)
     usePageStatus(navigation, currentPageId)
 
     const withKeyboardAvoidingView = (element) => {
@@ -506,50 +543,48 @@ export function PageWrapperHOC (WrappedComponent, pageConfig = {}) {
     }
     // android存在第一次打开insets都返回为0情况，后续会触发第二次渲染后正确
     navigation.insets = useSafeAreaInsets()
-    return createElement(GestureHandlerRootView,
-      {
-        style: {
-          flex: 1
-        }
-      },
-      withKeyboardAvoidingView(
-        createElement(ReactNative.View,
+    return withKeyboardAvoidingView(
+      createElement(ReactNative.View,
+        {
+          style: {
+            flex: 1,
+            backgroundColor: currentPageConfig?.backgroundColor || '#fff',
+            // 解决页面内有元素定位relative left为负值的时候，回退的时候还能看到对应元素问题
+            overflow: 'hidden'
+          },
+          ref: rootRef
+        },
+        createElement(RouteContext.Provider,
           {
-            style: {
-              flex: 1,
-              backgroundColor: currentPageConfig?.backgroundColor || '#fff',
-              // 解决页面内有元素定位relative left为负值的时候，回退的时候还能看到对应元素问题
-              overflow: 'hidden'
-            },
-            ref: rootRef,
-            onLayout
+            value: routeContextValRef.current
           },
-          createElement(RouteContext.Provider,
+          createElement(IntersectionObserverContext.Provider,
             {
-              value: routeContextValRef.current
+              value: intersectionObservers.current
             },
-            createElement(IntersectionObserverContext.Provider,
-              {
-                value: intersectionObservers.current
-              },
-              createElement(PortalHost,
-                null,
-                createElement(WrappedComponent, {
-                  ...props,
-                  navigation,
-                  route,
-                  id: currentPageId
-                })
-              )
+            createElement(PortalHost,
+              null,
+              createElement(WrappedComponent, {
+                ...props,
+                navigation,
+                route,
+                id: currentPageId
+              })
             )
           )
         )
-      ))
+      )
+    )
   }
 }
 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)
@@ -567,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, () => {
@@ -614,7 +649,6 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
     })
 
     usePageEffect(proxy, pageId)
-
     useEffect(() => {
       proxy.mounted()
       return () => {

package/src/platform/env/nav.js

@@ -1,133 +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
-  const stackTopConfig = Mpx.config?.rnConfig?.stackTopConfig || {}
-
-  // 回退按钮与图标
-  const backElement = stackLength > 1 || stackTopConfig.show
-  ? createElement(TouchableOpacity, {
-    style: [styles.backButton],
-    onPress: () => {
-      navigation.goBack()
-      if (stackLength <= 1 && stackTopConfig.show && typeof stackTopConfig.listener === 'function') {
-        stackTopConfig.listener?.()
-      }
-    }
-  }, 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() || ''))
-    )
-}

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

@@ -1,17 +0,0 @@
-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,
-  SafeAreaProvider,
-  useSafeAreaInsets
-}