@mpxjs/core 2.10.4-beta.9 → 2.10.5-beta.1

package/@types/node.d.ts

@@ -1,5 +1,7 @@
 declare let global: Record<string, any> // in web, we use global varible to do some things, here to declare
 
+declare let mpxGlobal: Record<string, any>
+
 type Dict<T> = {
   [k: string]: T | undefined
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.10.4-beta.9",
+  "version": "2.10.5-beta.1",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -19,7 +19,7 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.10.4",
+    "@mpxjs/utils": "^2.10.4 | ^2.10.5-beta.1",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.10.0"
   },

package/src/platform/createApp.ios.js

@@ -4,6 +4,8 @@ import { makeMap, spreadProp, getFocusedNavigation, hasOwn } from '@mpxjs/utils'
 import { mergeLifecycle } from '../convertor/mergeLifecycle'
 import { LIFECYCLE } from '../platform/patch/lifecycle/index'
 import Mpx from '../index'
+import { reactive } from '../observer/reactive'
+import { watch } from '../observer/watch'
 import { createElement, memo, useRef, useEffect } from 'react'
 import * as ReactNative from 'react-native'
 import { initAppProvides } from './export/inject'
@@ -90,36 +92,55 @@ export default function createApp (options) {
       global.__navigationHelper.lastFailCallback = null
     }
   }
-
-  const onAppStateChange = (currentState) => {
-    // 业务上配置禁止的话就不响应监听事件
-    if (currentState === 'active') {
-      let options = global.__mpxEnterOptions || {}
-      const navigation = getFocusedNavigation()
-      if (navigation) {
-        const state = navigation.getState()
-        const current = state.routes[state.index]
-        options = {
-          path: current.name,
-          query: current.params,
-          scene: 0,
-          shareTicket: '',
-          referrerInfo: {}
+  const appState = reactive({ state: '' })
+  // TODO hideReason 暂未完全模拟
+  // 0用户退出小程序
+  // 1进入其他小程序
+  // 2打开原生功能页
+  // 3其他
+  watch(() => appState.state, (value) => {
+    if (value === 'show') {
+      let options = appState.showOptions
+      delete appState.showOptions
+      if (!options) {
+        const navigation = getFocusedNavigation()
+        if (navigation) {
+          const state = navigation.getState()
+          const current = state.routes[state.index]
+          options = {
+            path: current.name,
+            query: current.params,
+            scene: 0,
+            shareTicket: '',
+            referrerInfo: {}
+          }
+        } else {
+          options = {}
         }
       }
       global.__mpxAppCbs.show.forEach((cb) => {
         cb(options)
       })
-      if (navigation && hasOwn(global.__mpxPageStatusMap, navigation.pageId)) {
-        global.__mpxPageStatusMap[navigation.pageId] = 'show'
-      }
-    } else if (currentState === 'inactive' || currentState === 'background') {
+    } else if (value === 'hide') {
+      const reason = appState.hideReason ?? 3
+      delete appState.hideReason
       global.__mpxAppCbs.hide.forEach((cb) => {
         cb({
-          reason: 3
+          reason
         })
       })
-      const navigation = getFocusedNavigation()
+    }
+  }, { sync: true })
+  const onAppStateChange = (currentState) => {
+    const navigation = getFocusedNavigation()
+    if (currentState === 'active') {
+      appState.state = 'show'
+      if (navigation && hasOwn(global.__mpxPageStatusMap, navigation.pageId)) {
+        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'
       }
@@ -162,9 +183,8 @@ export default function createApp (options) {
           global.__mpxLaunchOptions = options
           defaultOptions.onLaunch && defaultOptions.onLaunch.call(appInstance, options)
         }
-        global.__mpxAppCbs.show.forEach((cb) => {
-          cb(options)
-        })
+        appState.showOptions = options
+        appState.state = 'show'
         global.__mpxAppLaunched = true
         global.__mpxAppHotLaunched = true
       }
@@ -173,7 +193,7 @@ export default function createApp (options) {
     useEffect(() => {
       const changeSubscription = ReactNative.AppState.addEventListener('change', (state) => {
         // 外层可能会异常设置此配置，因此加载监听函数内部
-        if (Mpx.config.rnConfig.disableReactNativeAppStateChange) return
+        if (Mpx.config.rnConfig.disableAppStateListener) return
         onAppStateChange(state)
       })
 
@@ -189,12 +209,8 @@ export default function createApp (options) {
         }
       })
       return () => {
-        // todo 跳到原生页面或者其他rn bundle可以考虑使用reason 1/2进行模拟抹平
-        global.__mpxAppCbs.hide.forEach((cb) => {
-          cb({
-            reason: 0
-          })
-        })
+        appState.hideReason = 0
+        appState.state = 'hide'
         changeSubscription && changeSubscription.remove()
         resizeSubScription && resizeSubScription.remove()
       }
@@ -235,18 +251,11 @@ export default function createApp (options) {
     return []
   }
 
-  global.setCurrentPageStatus = function (status) {
-    const navigation = getFocusedNavigation()
-    if (navigation && hasOwn(global.__mpxPageStatusMap, navigation.pageId)) {
-      global.__mpxPageStatusMap[navigation.pageId] = status
-    }
-  }
-
   // 用于外层业务用来设置App的展示情况
   global.setAppShow = function () {
     onAppStateChange('active')
   }
   global.setAppHide = function () {
-    onAppStateChange('background')
+    onAppStateChange('inactive')
   }
 }

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

@@ -3,6 +3,8 @@ import { createI18n } from '../builtInMixins/i18nMixin'
 import * as navigationHelper from './navigationHelper'
 
 export function init (Mpx) {
+  // 为避免多个mpx应用运行时互相覆盖global __mpx对象，导致业务异常，例如插件模式下，插件应用和业务应用互相覆盖global.__mpx，因此创建mpxGlobal局部对象
+  mpxGlobal.__mpx = Mpx
   global.__mpx = Mpx
   global.__mpxAppCbs = global.__mpxAppCbs || {
     show: [],

package/src/platform/env/index.js

@@ -1,6 +1,8 @@
 import { createI18n } from '../builtInMixins/i18nMixin'
 
 export function init (Mpx) {
+  // 为避免多个mpx应用运行时互相覆盖global __mpx对象，导致业务异常，例如插件模式下，插件应用和业务应用互相覆盖global.__mpx，因此创建mpxGlobal局部对象
+  mpxGlobal.__mpx = Mpx
   global.__mpx = Mpx
   if (global.i18n) {
     Mpx.i18n = createI18n(global.i18n)

package/src/platform/env/index.web.js

@@ -4,6 +4,8 @@ import { isBrowser, error, warn } from '@mpxjs/utils'
 import { initEvent } from './event'
 
 export function init (Mpx) {
+  // 为避免多个mpx应用运行时互相覆盖global __mpx对象，导致业务异常，例如插件模式下，插件应用和业务应用互相覆盖global.__mpx，因此创建mpxGlobal局部对象
+  mpxGlobal.__mpx = Mpx
   global.__mpx = Mpx
   global.__mpxAppCbs = global.__mpxAppCbs || {
     show: [],

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

@@ -303,15 +303,8 @@ function createInstance ({ propsRef, type, rawOptions, currentInject, validProps
   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])
+    proxy.callHook(ONLOAD, [props.route.params || {}])
   }
 
   Object.assign(proxy, {
@@ -393,7 +386,7 @@ function usePageEffect (mpxProxy, pageId) {
           } else if (/^resize/.test(newVal)) {
             triggerResizeEvent(mpxProxy)
           }
-        })
+        }, { sync: true })
       }
     }
     return () => {
@@ -631,8 +624,13 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
       return () => {
         proxy.unmounted()
         proxy.target.__resetInstance()
+        // 热更新下会销毁旧页面并创建新页面组件，且旧页面组件销毁时机晚于新页面组件创建，此时__mpxPagesMap中存储的为新页面组件，不应该删除
+        // 所以需要判断路由表中存储的页面实例是否为当前页面实例
         if (type === 'page') {
-          delete global.__mpxPagesMap[props.route.key]
+          const routeKey = props.route.key
+          if (global.__mpxPagesMap[routeKey] && global.__mpxPagesMap[routeKey][0] === instance) {
+            delete global.__mpxPagesMap[routeKey]
+          }
         }
       }
     }, [])