@mpxjs/api-proxy 2.9.69-beta.2 → 2.9.69-beta.6

package/@types/index.d.ts

@@ -98,6 +98,7 @@ export const clearStorage: WechatMiniprogram.Wx['clearStorage']
 export const clearStorageSync: WechatMiniprogram.Wx['clearStorageSync']
 export const getSystemInfo: WechatMiniprogram.Wx['getSystemInfo']
 export const getSystemInfoSync: WechatMiniprogram.Wx['getSystemInfoSync']
+export const getWindowInfo: WechatMiniprogram.Wx['getWindowInfo']
 export const setTabBarItem: WechatMiniprogram.Wx['setTabBarItem']
 export const setTabBarStyle: WechatMiniprogram.Wx['setTabBarStyle']
 export const showTabBar: WechatMiniprogram.Wx['showTabBar']

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.9.69-beta.2",
+  "version": "2.9.69-beta.6",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",

package/src/platform/api/action-sheet/rnActionSheet.jsx

@@ -10,6 +10,13 @@ import Animated, {
 
 function showActionSheet (options = {}) {
   const { alertText, itemList = [], itemColor = '#000000', success, fail, complete } = options
+  if (itemList.length > 6) {
+    const result = {
+      errMsg: 'showActionSheet:fail parameter error: itemList should not be large than 6'
+    }
+    failHandle(result, fail, complete)
+    return
+  }
   const windowInfo = getWindowInfo()
   const bottom = windowInfo.screenHeight - windowInfo.safeArea.bottom
   let actionSheetKey = null

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

@@ -33,15 +33,27 @@ function resolvePath (relative, base) {
   }
   return stack.join('/')
 }
+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)
+    return true
+  }
+  setTimeout(() => {
+    if (navigationHelper.lastSuccessCallback && navigationHelper.lastFailCallback) {
+      navigationHelper.lastFailCallback('timeout')
+      navigationHelper.lastFailCallback = null
+    }
+  }, 350)
+  return false
+}
 
-let toPending = false
-function navigateTo (options = {}) {
-  if (toPending) {
+function navigateTo (options = {}) {  
+  const navigationHelper = global.__navigationHelper
+  if (isLock(navigationHelper, 'navigateTo', options)) {
     return
   }
-  toPending = true
   const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
-  const navigationHelper = global.__navigationHelper
   if (navigation && navigationHelper) {
     const { path, queryObj } = parseUrl(options.url)
     const basePath = getBasePath(navigation)
@@ -55,19 +67,15 @@ function navigateTo (options = {}) {
       const res = { errMsg: `navigateTo:fail ${msg}` }
       failHandle(res, options.fail, options.complete)
     }
-    navigationHelper.transitionEndCallback = () => {
-      toPending = false
-    }
   }
 }
-let redirectPending = false
+
 function redirectTo (options = {}) {
-  if (redirectPending) {
-    return
-  }
-  redirectPending = true
   const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
   const navigationHelper = global.__navigationHelper
+  if (isLock(navigationHelper, 'redirectTo', options)) {
+    return
+  }
   if (navigation && navigationHelper) {
     const { path, queryObj } = parseUrl(options.url)
     const basePath = getBasePath(navigation)
@@ -81,52 +89,43 @@ function redirectTo (options = {}) {
       const res = { errMsg: `redirectTo:fail ${msg}` }
       failHandle(res, options.fail, options.complete)
     }
-    navigationHelper.transitionEndCallback = () => {
-      redirectPending = false
-    }
   }
 }
-let backPending = false
+
 function navigateBack (options = {}) {
-  if (backPending) {
-    return
-  }
-  backPending = true
   const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
   const navigationHelper = global.__navigationHelper
+  if (isLock(navigationHelper, 'navigateBack', options)) {
+    return
+  }
   if (navigation && navigationHelper) {
     const delta = options.delta || 1
     const routeLength = navigation.getState().routes.length
+    navigationHelper.lastSuccessCallback = () => {
+      const res = { errMsg: 'navigateBack:ok' }
+      successHandle(res, options.success, options.complete)
+    }
+    navigationHelper.lastFailCallback = (msg) => {
+      const res = { errMsg: `navigateBack:fail ${msg}` }
+      failHandle(res, options.fail, options.complete)
+    }
     if (delta >= routeLength && global.__mpx?.config.rnConfig.onAppBack?.(delta - routeLength + 1)) {
       nextTick(() => {
-        backPending = false
         const res = { errMsg: 'navigateBack:ok' }
         successHandle(res, options.success, options.complete)
       })
     } else {
       navigation.pop(delta)
-      navigationHelper.lastSuccessCallback = () => {
-        const res = { errMsg: 'navigateBack:ok' }
-        successHandle(res, options.success, options.complete)
-      }
-      navigationHelper.lastFailCallback = (msg) => {
-        const res = { errMsg: `navigateBack:fail ${msg}` }
-        failHandle(res, options.fail, options.complete)
-      }
-    }
-    navigationHelper.transitionEndCallback = () => {
-      backPending = false
     }
   }
 }
-let reLaunchPending = false
+
 function reLaunch (options = {}) {
-  if (reLaunchPending) {
-    return
-  }
-  reLaunchPending = true
   const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
   const navigationHelper = global.__navigationHelper
+  if (isLock(navigationHelper, 'reLaunch', options)) {
+    return
+  }
   if (navigation && navigationHelper) {
     const { path, queryObj } = parseUrl(options.url)
     const basePath = getBasePath(navigation)
@@ -148,9 +147,6 @@ function reLaunch (options = {}) {
       const res = { errMsg: `redirectTo:fail ${msg}` }
       failHandle(res, options.fail, options.complete)
     }
-    navigationHelper.transitionEndCallback = () => {
-      reLaunchPending = false
-    }
   }
 }
 

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

@@ -139,7 +139,7 @@ const getLaunchOptionsSync = function () {
     throwSSRWarning('getLaunchOptionsSync API is running in non browser environments')
     return
   }
-  return global.__mpxEnterOptions || {}
+  return global.__mpxLaunchOptions || {}
 }
 
 export {

package/src/platform/api/system/rnSystem.js

@@ -42,18 +42,11 @@ const getWindowInfo = function () {
 }
 
 const getLaunchOptionsSync = function () {
-  const options = global.__mpxEnterOptions || {}
-  const { path, scene, query } = options
-  return {
-    path,
-    scene,
-    query
-  }
+  return global.__mpxLaunchOptions || {}
 }
 
 const getEnterOptionsSync = function () {
-  const result = getLaunchOptionsSync()
-  return result
+  return global.__mpxEnterOptions || {}
 }
 
 export {

package/src/platform/api/toast/rnToast.jsx

@@ -6,7 +6,7 @@ let toastKey
 let isLoadingShow
 const dimensionsScreen = Dimensions.get('screen')
 const screenHeight = dimensionsScreen.height
-const contentTop = parseInt(screenHeight * 0.35)
+const contentTop = parseInt(screenHeight * 0.4)
 let tId // show duration 计时id
 const styles = StyleSheet.create({
   toastContent: {