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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.9.69-beta.1",
+  "version": "2.9.69-beta.2",
   "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,12 +1,13 @@
 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
   const windowInfo = getWindowInfo()
@@ -77,6 +78,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

@@ -34,7 +34,12 @@ function resolvePath (relative, base) {
   return stack.join('/')
 }
 
+let toPending = false
 function navigateTo (options = {}) {
+  if (toPending) {
+    return
+  }
+  toPending = true
   const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
   const navigationHelper = global.__navigationHelper
   if (navigation && navigationHelper) {
@@ -50,10 +55,17 @@ 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 (navigation && navigationHelper) {
@@ -69,10 +81,17 @@ 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 (navigation && navigationHelper) {
@@ -80,6 +99,7 @@ function navigateBack (options = {}) {
     const routeLength = navigation.getState().routes.length
     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)
       })
@@ -94,10 +114,17 @@ function navigateBack (options = {}) {
         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 (navigation && navigationHelper) {
@@ -121,6 +148,9 @@ function reLaunch (options = {}) {
       const res = { errMsg: `redirectTo:fail ${msg}` }
       failHandle(res, options.fail, options.complete)
     }
+    navigationHelper.transitionEndCallback = () => {
+      reLaunchPending = false
+    }
   }
 }
 

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 || {}

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

@@ -1,6 +1,6 @@
 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