@mpxjs/core 2.10.1 → 2.10.2

package/@types/index.d.ts

@@ -119,7 +119,8 @@ interface Context {
   selectComponent: ReplaceWxComponentIns['selectComponent']
   selectAllComponents: ReplaceWxComponentIns['selectAllComponents']
   createSelectorQuery: WechatMiniprogram.Component.InstanceMethods<Record<string, any>>['createSelectorQuery']
-  createIntersectionObserver: WechatMiniprogram.Component.InstanceMethods<Record<string, any>>['createIntersectionObserver']
+  createIntersectionObserver: WechatMiniprogram.Component.InstanceMethods<Record<string, any>>['createIntersectionObserver'],
+  getPageId: WechatMiniprogram.Component.InstanceMethods<Record<string, any>>['getPageId']
 }
 
 interface ComponentOpt<D extends Data, P extends Properties, C, M extends Methods, Mi extends Array<any>, S extends Record<any, any>> extends Partial<WechatMiniprogram.Component.Lifetimes & WechatMiniprogram.Component.OtherOption> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.10.1",
+  "version": "2.10.2",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -19,7 +19,7 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.10.0",
+    "@mpxjs/utils": "^2.10.2",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.10.0"
   },
@@ -109,5 +109,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "7e4f9ab5528f1ab0ae08fdfad1bfbbb445088848"
+  "gitHead": "4445de7c3ce29fb0166d3bb77a1a0460e41a32d3"
 }

package/src/core/mergeOptions.js

@@ -2,6 +2,8 @@ import { getConvertRule } from '../convertor/convertor'
 import builtInKeysMap from '../platform/patch/builtInKeysMap'
 import { implemented } from './implement'
 import {
+  isArray,
+  isFunction,
   isObject,
   aliasReplace,
   makeMap,
@@ -221,6 +223,10 @@ function mergeMixins (parent, child) {
       mergeToArray(parent, child, key)
     } else if (/^behaviors|externalClasses$/.test(key)) {
       mergeArray(parent, child, key)
+    } else if (key === 'inject') {
+      mergeInject(parent, child, key)
+    } else if (key === 'provide') {
+      mergeProvide(parent, child, key)
     } else if (key !== 'mixins' && key !== 'mpxCustomKeysForBlend') {
       // 收集非函数的自定义属性，在Component创建的页面中挂载到this上，模拟Page创建页面的表现，swan当中component构造器也能自动挂载自定义数据，不需要框架模拟挂载
       if (curType === 'blend' && typeof child[key] !== 'function' && !builtInKeysMap[key] && __mpx_mode__ !== 'swan') {
@@ -277,6 +283,37 @@ function mergeDataFn (parent, child, key) {
   }
 }
 
+function normalizeInject (options) {
+  const injectOpt = options.inject
+  if (isArray(injectOpt)) {
+    const normalized = (options.inject = {})
+    for (let i = 0; i < injectOpt.length; i++) {
+      normalized[injectOpt[i]] = injectOpt[i]
+    }
+  }
+}
+
+function mergeInject (parent, child, key) {
+  normalizeInject(child)
+  mergeShallowObj(parent, child, key)
+}
+
+function mergeProvide (parent, child, key) {
+  const parentVal = parent[key]
+  const childVal = child[key]
+  if (!parentVal) {
+    parent[key] = childVal
+  } else if (!childVal) {
+    parent[key] = parentVal
+  } else {
+    parent[key] = function mergedProvide () {
+      const to = isFunction(parentVal) ? parentVal.call(this) : parentVal
+      const from = isFunction(childVal) ? childVal.call(this) : childVal
+      return Object.assign(to, from)
+    }
+  }
+}
+
 export function mergeArray (parent, child, key) {
   const childVal = child[key]
   if (!parent[key]) {

package/src/core/proxy.js

@@ -101,7 +101,6 @@ function preProcessRenderData (renderData) {
   })
   return processedRenderData
 }
-
 export default class MpxProxy {
   constructor (options, target, reCreated) {
     this.target = target
@@ -317,7 +316,8 @@ export default class MpxProxy {
           selectComponent: this.target.selectComponent.bind(this.target),
           selectAllComponents: this.target.selectAllComponents.bind(this.target),
           createSelectorQuery: this.target.createSelectorQuery ? this.target.createSelectorQuery.bind(this.target) : envObj.createSelectorQuery.bind(envObj),
-          createIntersectionObserver: this.target.createIntersectionObserver ? this.target.createIntersectionObserver.bind(this.target) : envObj.createIntersectionObserver.bind(envObj)
+          createIntersectionObserver: this.target.createIntersectionObserver ? this.target.createIntersectionObserver.bind(this.target) : envObj.createIntersectionObserver.bind(envObj),
+          getPageId: this.target.getPageId.bind(this.target)
         }
       ])
       if (!isObject(setupResult)) {

package/src/platform/builtInMixins/index.js

@@ -13,6 +13,7 @@ import pageRouteMixin from './pageRouteMixin'
 import { dynamicRefsMixin, dynamicRenderHelperMixin, dynamicSlotMixin } from '../../dynamic/dynamicRenderMixin.empty'
 import styleHelperMixin from './styleHelperMixin'
 import directiveHelperMixin from './directiveHelperMixin'
+import pageIdMixin from './pageIdMixin'
 
 export default function getBuiltInMixins ({ type, rawOptions = {} }) {
   let bulitInMixins
@@ -36,7 +37,8 @@ export default function getBuiltInMixins ({ type, rawOptions = {} }) {
       getTabBarMixin(type),
       pageRouteMixin(type),
       // 由于relation可能是通过mixin注入的，不能通过当前的用户options中是否存在relations来简单判断是否注入该项mixin
-      relationsMixin(type)
+      relationsMixin(type),
+      pageIdMixin(type)
     ]
   } else {
     // 此为差异抹平类mixins，原生模式下也需要注入也抹平平台差异
@@ -46,6 +48,11 @@ export default function getBuiltInMixins ({ type, rawOptions = {} }) {
       refsMixin(),
       relationsMixin(type)
     ]
+    if (__mpx_mode__ === 'ali') {
+      bulitInMixins = bulitInMixins.concat([
+        pageIdMixin(type)
+      ])
+    }
     // 此为纯增强类mixins，原生模式下不需要注入
     if (!rawOptions.__nativeRender__) {
       bulitInMixins = bulitInMixins.concat([

package/src/platform/builtInMixins/pageIdMixin.js

@@ -0,0 +1,13 @@
+export default function pageIdMixin (mixinType) {
+  return {
+    methods: {
+      getPageId () {
+        if (mixinType === 'component') {
+          return this.$page.$id
+        } else {
+          return this.$id
+        }
+      }
+    }
+  }
+}

package/src/platform/builtInMixins/pageIdMixin.web.js

@@ -0,0 +1,25 @@
+let pageId = 0
+
+export default function pageIdMixin (mixinType) {
+  const mixin = {}
+
+  if (mixinType === 'page') {
+    Object.assign(mixin, {
+      beforeCreate () {
+        this.__pageId = ++pageId
+      },
+      provide () {
+        return {
+          __pageId: this.__pageId
+        }
+      }
+    })
+  }
+  if (mixinType === 'component') {
+    Object.assign(mixin, {
+      inject: ['__pageId']
+    })
+  }
+
+  return mixin
+}

package/src/platform/createApp.ios.js

@@ -181,18 +181,29 @@ export default function createApp (options) {
     }, [])
 
     const { initialRouteName, initialParams } = initialRouteRef.current
-    const headerBackImageSource = Mpx.config.rnConfig.headerBackImageSource || null
     const navScreenOpts = {
       // 7.x替换headerBackTitleVisible
       // headerBackButtonDisplayMode: 'minimal',
       headerBackTitleVisible: false,
-      // 安卓上会出现初始化时闪现导航条的问题
-      headerShown: false,
-      // 隐藏导航下的那条线
       headerShadowVisible: false
     }
-    if (headerBackImageSource) {
-      navScreenOpts.headerBackImageSource = headerBackImageSource
+    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,

package/src/platform/env/vuePlugin.js

@@ -126,5 +126,9 @@ export default function install (Vue) {
   Vue.prototype.createIntersectionObserver = function (options) {
     return createIntersectionObserver(this, options)
   }
+
+  Vue.prototype.getPageId = function () {
+    return this.__pageId
+  }
   hackEffectScope()
 }

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

@@ -1,4 +1,4 @@
-import { useEffect, useLayoutEffect, useSyncExternalStore, useRef, useMemo, useCallback, 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'
@@ -286,11 +286,27 @@ function createInstance ({ propsRef, type, rawOptions, currentInject, validProps
     instance.route = props.route.name
     global.__mpxPagesMap = global.__mpxPagesMap || {}
     global.__mpxPagesMap[props.route.key] = [instance, props.navigation]
+    // App onLaunch 在 Page created 之前执行
+    if (!global.__mpxAppHotLaunched && global.__mpxAppOnLaunch) {
+      global.__mpxAppOnLaunch(props.navigation)
+    }
   }
 
   const proxy = instance.__mpxProxy = new MpxProxy(rawOptions, instance)
   proxy.created()
 
+  if (type === 'page') {
+    const loadParams = {}
+    const props = propsRef.current
+    // 此处拿到的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, {
     onStoreChange: null,
     stateVersion: Symbol(),
@@ -384,7 +400,9 @@ const pageStatusMap = global.__mpxPageStatusMap = reactive({})
 
 function usePageStatus (navigation, pageId) {
   navigation.pageId = pageId
-  set(pageStatusMap, pageId, '')
+  if (!hasOwn(pageStatusMap, pageId)) {
+    set(pageStatusMap, pageId, '')
+  }
   useEffect(() => {
     const focusSubscription = navigation.addListener('focus', () => {
       pageStatusMap[pageId] = 'show'
@@ -422,17 +440,6 @@ const checkRelation = (options) => {
   }
 }
 
-const provideRelation = (instance, relation) => {
-  const componentPath = instance.__componentPath
-  if (relation) {
-    return Object.assign({}, relation, { [componentPath]: instance })
-  } else {
-    return {
-      [componentPath]: instance
-    }
-  }
-}
-
 export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
   rawOptions = mergeOptions(rawOptions, type, false)
   const components = Object.assign({}, rawOptions.components, currentInject.getComponents())
@@ -502,19 +509,6 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
     usePageEffect(proxy, pageId)
 
     useEffect(() => {
-      if (type === 'page') {
-        if (!global.__mpxAppHotLaunched && global.__mpxAppOnLaunch) {
-          global.__mpxAppOnLaunch(props.navigation)
-        }
-        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])
-      }
       proxy.mounted()
       return () => {
         proxy.unmounted()
@@ -552,14 +546,28 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
       root = createElement(ProviderContext.Provider, { value: provides }, root)
     }
 
-    return hasDescendantRelation
-      ? createElement(RelationsContext.Provider,
-          {
-            value: provideRelation(instance, relation)
-          },
-          root
-        )
-      : root
+    if (hasDescendantRelation) {
+      const relationProvide = useMemo(() => {
+        const componentPath = instance.__componentPath
+        if (relation) {
+          return Object.assign({}, relation, { [componentPath]: instance })
+        } else {
+          return {
+            [componentPath]: instance
+          }
+        }
+      }, [relation])
+
+      return createElement(
+        RelationsContext.Provider,
+        {
+          value: relationProvide
+        },
+        root
+      )
+    } else {
+      return root
+    }
   }))
 
   if (rawOptions.options?.isCustomText) {
@@ -572,28 +580,39 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
     const Page = ({ navigation, route }) => {
       const currentPageId = useMemo(() => ++pageId, [])
       const intersectionObservers = useRef({})
+      const routeContextValRef = useRef({
+        pageId: currentPageId,
+        navigation
+      })
       usePageStatus(navigation, currentPageId)
       useLayoutEffect(() => {
         const isCustom = pageConfig.navigationStyle === 'custom'
-        navigation.setOptions(Object.assign({
+        navigation.setOptions({
           headerShown: !isCustom,
-          title: pageConfig.navigationBarTitleText || '',
+          title: pageConfig.navigationBarTitleText?.trim() || '',
           headerStyle: {
             backgroundColor: pageConfig.navigationBarBackgroundColor || '#000000'
           },
-          headerTintColor: pageConfig.navigationBarTextStyle || 'white',
-          statusBarTranslucent: true
-        }, __mpx_mode__ === 'android' ? { statusBarStyle: pageConfig.statusBarStyle || 'light' } : {}))
+          headerTintColor: pageConfig.navigationBarTextStyle || 'white'
+        })
+
+        if (__mpx_mode__ === 'android') {
+          ReactNative.StatusBar.setBarStyle(pageConfig.barStyle || 'dark-content')
+          ReactNative.StatusBar.setTranslucent(isCustom) // 控制statusbar是否占位
+          const color = isCustom ? 'transparent' : pageConfig.statusBarColor
+          color && ReactNative.StatusBar.setBackgroundColor(color)
+        }
       }, [])
 
       const rootRef = useRef(null)
-      const keyboardAvoidRef = useRef({ cursorSpacing: 0, ref: null })
-      const onLayout = useCallback(() => {
-        rootRef.current?.measureInWindow((x, y, width, height) => {
-          navigation.layout = { x, y, width, height }
-        })
+      const keyboardAvoidRef = useRef(null)
+      useEffect(() => {
+        setTimeout(() => {
+          rootRef.current?.measureInWindow((x, y, width, height) => {
+            navigation.layout = { x, y, width, height }
+          })
+        }, 100)
       }, [])
-
       const withKeyboardAvoidingView = (element) => {
         return createElement(KeyboardAvoidContext.Provider,
           {
@@ -619,12 +638,12 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
         {
           // https://github.com/software-mansion/react-native-reanimated/issues/6639 因存在此问题，iOS在页面上进行定宽来暂时规避
           style: __mpx_mode__ === 'ios' && pageConfig.navigationStyle !== 'custom'
-          ? {
-            height: ReactNative.Dimensions.get('screen').height - useHeaderHeight()
-          }
-          : {
-            flex: 1
-          }
+            ? {
+              height: ReactNative.Dimensions.get('screen').height - useHeaderHeight()
+            }
+            : {
+              flex: 1
+            }
         },
         withKeyboardAvoidingView(
           createElement(ReactNative.View,
@@ -633,15 +652,11 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
                 flex: 1,
                 backgroundColor: pageConfig.backgroundColor || '#ffffff'
               },
-              ref: rootRef,
-              onLayout
+              ref: rootRef
             },
             createElement(RouteContext.Provider,
               {
-                value: {
-                  pageId: currentPageId,
-                  navigation
-                }
+                value: routeContextValRef.current
               },
               createElement(IntersectionObserverContext.Provider,
                 {

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

@@ -60,7 +60,8 @@ export function getDefaultOptions ({ type, rawOptions = {} }) {
         selectComponent: instance.selectComponent.bind(instance),
         selectAllComponents: instance.selectAllComponents.bind(instance),
         createSelectorQuery: instance.createSelectorQuery.bind(instance),
-        createIntersectionObserver: instance.createIntersectionObserver.bind(instance)
+        createIntersectionObserver: instance.createIntersectionObserver.bind(instance),
+        getPageId: instance.getPageId.bind(instance)
       }
       const setupRes = rawSetup(props, newContext)
       unsetCurrentInstance(instance.__mpxProxy)