@mpxjs/core 2.10.4-beta.10 → 2.10.4-beta.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.10.4-beta.10",
+  "version": "2.10.4-beta.12",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -25,7 +25,7 @@
   },
   "peerDependencies": {
     "@d11/react-native-fast-image": "*",
-    "@mpxjs/api-proxy": "^2.9.0",
+    "@mpxjs/api-proxy": "^2.10.4-beta.0",
     "@mpxjs/store": "^2.9.0",
     "@react-navigation/native": "*",
     "@react-navigation/native-stack": "*",

package/src/platform/createApp.ios.js

@@ -4,7 +4,7 @@ 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 { ref } from '../observer/ref'
+import { reactive } from '../observer/reactive'
 import { watch } from '../observer/watch'
 import { createElement, memo, useRef, useEffect } from 'react'
 import * as ReactNative from 'react-native'
@@ -92,77 +92,52 @@ export default function createApp (options) {
       global.__navigationHelper.lastFailCallback = null
     }
   }
-  const appState = ref('')
-  watch(() => appState.value, (value) => {
+  const appState = reactive({ state: '' })
+  // TODO hideReason 暂未完全模拟
+  // 0用户退出小程序
+  // 1进入其他小程序
+  // 2打开原生功能页
+  // 3其他
+  watch(() => appState.state, (value) => {
     if (value === 'show') {
-      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: {}
+      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: {}
+          }
         }
       }
       global.__mpxAppCbs.show.forEach((cb) => {
-        cb(options)
+        cb(options || {})
       })
     } else if (value === 'hide') {
       global.__mpxAppCbs.hide.forEach((cb) => {
         cb({
-          reason: 3
+          reason: appState.hideReason ?? 3
         })
+        delete appState.hideReason
       })
     }
-  })
+  }, { sync: true })
   const onAppStateChange = (currentState) => {
     const navigation = getFocusedNavigation()
     if (currentState === 'active') {
-      appState.value = 'show'
+      appState.state = 'show'
       if (navigation && hasOwn(global.__mpxPageStatusMap, navigation.pageId)) {
         global.__mpxPageStatusMap[navigation.pageId] = 'show'
       }
     } else if (currentState === 'inactive' || currentState === 'background') {
-      appState.value = 'hide'
-      if (navigation && hasOwn(global.__mpxPageStatusMap, navigation.pageId)) {
-        global.__mpxPageStatusMap[navigation.pageId] = 'hide'
-      }
-    }
-  }
-
-  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: {}
-        }
-      }
-      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()
+      appState.hideReason = 3
+      appState.state = 'hide'
       if (navigation && hasOwn(global.__mpxPageStatusMap, navigation.pageId)) {
         global.__mpxPageStatusMap[navigation.pageId] = 'hide'
       }
@@ -205,7 +180,8 @@ export default function createApp (options) {
           global.__mpxLaunchOptions = options
           defaultOptions.onLaunch && defaultOptions.onLaunch.call(appInstance, options)
         }
-        appState.value = 'show'
+        appState.showOptions = options
+        appState.state = 'show'
         global.__mpxAppLaunched = true
         global.__mpxAppHotLaunched = true
       }
@@ -214,7 +190,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)
       })
 
@@ -230,12 +206,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()
       }

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

@@ -393,7 +393,7 @@ function usePageEffect (mpxProxy, pageId) {
           } else if (/^resize/.test(newVal)) {
             triggerResizeEvent(mpxProxy)
           }
-        })
+        }, { sync: true })
       }
     }
     return () => {