@mpxjs/api-proxy 2.10.0-beta.1 → 2.10.1-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.10.0-beta.1",
+  "version": "2.10.1-beta.1",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -41,12 +41,12 @@
     "axios": "^1.7.3"
   },
   "peerDependencies": {
-    "@react-native-async-storage/async-storage": "^1.23.1",
-    "@react-native-community/netinfo": "^11.2.1",
-    "react-native-device-info": "^10.13.2",
-    "react-native-get-location": "^4.0.1",
-    "react-native-haptic-feedback": "^2.3.3",
-    "react-native-safe-area-context": "^4.10.1"
+    "@react-native-async-storage/async-storage": "*",
+    "@react-native-community/netinfo": "*",
+    "react-native-device-info": "*",
+    "react-native-get-location": "*",
+    "react-native-haptic-feedback": "*",
+    "react-native-safe-area-context": "*"
   },
   "peerDependenciesMeta": {
     "@react-native-async-storage/async-storage": {

package/src/common/js/promisify.js

@@ -44,7 +44,8 @@ const blackList = [
   'getExptInfoSync',
   'reserveChannelsLive',
   'getNFCAdapter',
-  'isVKSupport'
+  'isVKSupport',
+  'getState'
 ]
 
 function getMapFromList (list) {

package/src/platform/api/next-tick/index.web.js

@@ -16,7 +16,7 @@ function nextTick (cb) {
     channel.port1.onmessage = cb
     port.postMessage(1)
   } else {
-    setTimeout(cb, 0)
+    setTimeout(cb)
   }
 }
 

package/src/platform/api/route/index.ios.js

@@ -34,7 +34,7 @@ function resolvePath (relative, base) {
   return stack.join('/')
 }
 let timerId = null
-function isLock (navigationHelper, type, options) {
+function isLock (navigationHelper = {}, type, options) {
   if (navigationHelper.lastSuccessCallback && navigationHelper.lastFailCallback) {
     const res = { errMsg: `${type}:fail the previous routing event didn't complete` }
     failHandle(res, options.fail, options.complete)
@@ -163,16 +163,21 @@ function reset (options = {}) {
     failHandle(res, options.fail, options.complete)
     return
   }
+  const resetOption = Object.getOwnPropertyNames(options).reduce((resOpt, key) => {
+    if (key !== 'fail' && key !== 'complete' && key !== 'success') {
+      resOpt[key] = options[key]
+    }
+    return resOpt
+  }, {})
   const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
   const navigationHelper = global.__navigationHelper
   if (isLock(navigationHelper, 'reset', options)) {
     return
   }
   if (navigation && navigationHelper) {
-    navigation.reset({
-      index: routes.length - 1,
-      routes
-    })
+    navigation.reset(Object.assign(resetOption, {
+      index: routes.length - 1
+    }))
     navigationHelper.lastSuccessCallback = () => {
       const res = { errMsg: 'reset:ok' }
       successHandle(res, options.success, options.complete)
@@ -184,11 +189,20 @@ function reset (options = {}) {
   }
 }
 
+function getState () {
+  const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
+  if (navigation) {
+    return navigation.getState()
+  }
+  return {}
+}
+
 export {
   redirectTo,
   navigateTo,
   navigateBack,
   reLaunch,
   switchTab,
-  reset
+  reset,
+  getState
 }

package/src/platform/api/route/index.js

@@ -12,11 +12,14 @@ const switchTab = ENV_OBJ.switchTab || envError('switchTab')
 
 const reset = envError('reset')
 
+const getState = envError('getState')
+
 export {
   redirectTo,
   navigateTo,
   navigateBack,
   reLaunch,
   switchTab,
-  reset
+  reset,
+  getState
 }

package/src/platform/api/route/index.web.js

@@ -185,11 +185,14 @@ function switchTab (options = {}) {
 
 const reset = envError('reset')
 
+const getState = envError('getState')
+
 export {
   redirectTo,
   navigateTo,
   navigateBack,
   reLaunch,
   switchTab,
-  reset
+  reset,
+  getState
 }