@mpxjs/api-proxy 2.9.69-beta.1 → 2.9.69-beta.5

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.1",
+  "version": "2.9.69-beta.5",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",

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

@@ -1,14 +1,22 @@
 import { View, Text, StyleSheet } from 'react-native'
 import { successHandle, failHandle } from '../../../common/js'
-import { Portal } from '@ant-design/react-native'
+import Portal from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/mpx-portal'
 import { getWindowInfo } from '../system/rnSystem'
 import Animated, {
   useSharedValue,
   useAnimatedStyle,
   withTiming
 } from 'react-native-reanimated'
+
 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
@@ -77,6 +85,8 @@ function showActionSheet (options = {}) {
     const remove = function () {
       if (actionSheetKey) {
         slideOut()
+        Portal.remove(actionSheetKey)
+        actionSheetKey = null
         setTimeout(() => {
           Portal.remove(actionSheetKey)
           actionSheetKey = null

package/src/platform/api/create-intersection-observer/rnIntersectionObserver.js

@@ -2,7 +2,6 @@ import { isArray, isObject, isString, noop } from '@mpxjs/utils'
 import throttle from 'lodash/throttle'
 import { Dimensions } from 'react-native'
 import { getFocusedNavigation } from '../../../common/js'
-
 const WindowRefStr = 'window'
 const IgnoreTarget = 'ignore'
 const DefaultMargin = { top: 0, bottom: 0, left: 0, right: 0 }
@@ -99,10 +98,10 @@ class RNIntersectionObserver {
     }
 
     const windowRect = {
-      top: navigationLayout.y + this.margins.top,
-      left: this.margins.left,
-      right: navigationLayout.width - this.margins.right,
-      bottom: navigationLayout.y + navigationLayout.height - this.margins.bottom
+      top: navigationLayout.y - this.margins.top,
+      left: 0 - this.margins.left,
+      right: navigationLayout.width + this.margins.right,
+      bottom: navigationLayout.y + navigationLayout.height + this.margins.bottom
     }
 
     this.windowRect = windowRect

package/src/platform/api/modal/rnModal.jsx

@@ -1,6 +1,6 @@
 import { View, Dimensions, Text, StyleSheet, TouchableOpacity, ScrollView, TextInput } from 'react-native'
 import { successHandle, failHandle } from '../../../common/js'
-import { Portal } from '@ant-design/react-native'
+import Portal from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/mpx-portal'
 const { width, height } = Dimensions.get('window')
 const showModal = function (options = {}) {
   const {

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

@@ -33,10 +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.lastFailCallback) {
+      navigationHelper.lastFailCallback('timeout')
+      navigationHelper.lastFailCallback = null
+    }
+  }, 350)
+  return false
+}
 
-function navigateTo (options = {}) {
-  const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
+function navigateTo (options = {}) {  
   const navigationHelper = global.__navigationHelper
+  if (isLock(navigationHelper, 'navigateTo', options)) {
+    return
+  }
+  const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
   if (navigation && navigationHelper) {
     const { path, queryObj } = parseUrl(options.url)
     const basePath = getBasePath(navigation)
@@ -56,6 +73,9 @@ function navigateTo (options = {}) {
 function redirectTo (options = {}) {
   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)
@@ -75,9 +95,20 @@ function redirectTo (options = {}) {
 function navigateBack (options = {}) {
   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(() => {
         const res = { errMsg: 'navigateBack:ok' }
@@ -85,14 +116,6 @@ function navigateBack (options = {}) {
       })
     } 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)
-      }
     }
   }
 }
@@ -100,6 +123,9 @@ function navigateBack (options = {}) {
 function reLaunch (options = {}) {
   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)

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

@@ -10,6 +10,7 @@ const getWindowInfo = function () {
   const insets = Object.assign(initialWindowMetricsInset, navigationInsets)
   let safeArea = {}
   const { top = 0, bottom = 0, left = 0, right = 0 } = insets
+
   const screenHeight = __mpx_mode__ === 'ios' ? dimensionsScreen.height : dimensionsScreen.height - bottom // 解决安卓开启屏幕内三建导航安卓把安全区计算进去后产生的影响
   const screenWidth = __mpx_mode__ === 'ios' ? dimensionsScreen.width : dimensionsScreen.width - right
   const layout = navigation.layout || {}
@@ -41,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

@@ -1,12 +1,12 @@
 import { View, Text, Image, StyleSheet, ActivityIndicator, Dimensions } from 'react-native'
 import { successHandle, failHandle } from '../../../common/js'
-import { Portal } from '@ant-design/react-native'
+import Portal from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/mpx-portal'
 
 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: {