@mpxjs/core 2.10.4 → 2.10.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.10.4",
+  "version": "2.10.5",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -109,5 +109,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "c877bcebc894c75fe107f7b997cee5b494932e43"
+  "gitHead": "80a4120733a1ee64e394ae58240497ea6721f435"
 }

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,6 +92,60 @@ export default function createApp (options) {
       global.__navigationHelper.lastFailCallback = null
     }
   }
+  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)
+      })
+    } else if (value === 'hide') {
+      const reason = appState.hideReason ?? 3
+      delete appState.hideReason
+      global.__mpxAppCbs.hide.forEach((cb) => {
+        cb({
+          reason
+        })
+      })
+    }
+  }, { 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'
+      }
+    }
+  }
 
   global.__mpxAppLaunched = false
   global.__mpxOptionsMap[currentInject.moduleId] = memo((props) => {
@@ -127,47 +183,18 @@ 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
       }
     }
 
     useEffect(() => {
-      const changeSubscription = ReactNative.AppState.addEventListener('change', (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: {}
-            }
-          }
-          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') {
-          global.__mpxAppCbs.hide.forEach((cb) => {
-            cb({
-              reason: 3
-            })
-          })
-          const navigation = getFocusedNavigation()
-          if (navigation && hasOwn(global.__mpxPageStatusMap, navigation.pageId)) {
-            global.__mpxPageStatusMap[navigation.pageId] = 'hide'
-          }
-        }
+      const changeSubscription = ReactNative.AppState.addEventListener('change', (state) => {
+        // 外层可能会异常设置此配置，因此加载监听函数内部
+        if (Mpx.config.rnConfig.disableAppStateListener) return
+        onAppStateChange(state)
       })
 
       let count = 0
@@ -182,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()
       }
@@ -256,4 +279,12 @@ export default function createApp (options) {
       global.__mpxPageStatusMap[navigation.pageId] = status
     }
   }
+
+  // 用于外层业务用来设置App的展示情况
+  global.setAppShow = function () {
+    onAppStateChange('active')
+  }
+  global.setAppHide = function () {
+    onAppStateChange('inactive')
+  }
 }

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

@@ -392,7 +392,7 @@ function usePageEffect (mpxProxy, pageId) {
           } else if (/^resize/.test(newVal)) {
             triggerResizeEvent(mpxProxy)
           }
-        })
+        }, { sync: true })
       }
     }
     return () => {
@@ -656,8 +656,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]
+          }
         }
       }
     }, [])