Fix actionsheet 0106

packages/api-proxy/@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']

packages/api-proxy/src/common/js/promisify.js

@@ -14,24 +14,37 @@ const blackList = [
   'stopBackgroundAudio',
   'showNavigationBarLoading',
   'hideNavigationBarLoading',
-  'createAnimation',
-  'createAnimationVideo',
-  'createSelectorQuery',
-  'createIntersectionObserver',
   'getPerformance',
   'hideKeyboard',
   'stopPullDownRefresh',
-  'createWorker',
   'pageScrollTo',
   'reportAnalytics',
   'getMenuButtonBoundingClientRect',
   'reportMonitor',
-  'createOffscreenCanvas',
   'reportEvent',
   'connectSocket',
   'base64ToArrayBuffer',
+  'arrayBufferToBase64',
   'getDeviceInfo',
-  'getWindowInfo'
+  'getWindowInfo',
+  'getAppBaseInfo',
+  'getAppAuthorizeSetting',
+  'getApiCategory',
+  'postMessageToReferrerPage',
+  'postMessageToReferrerMiniProgram',
+  'reportPerformance',
+  'getPerformance',
+  'preDownloadSubpackage',
+  'router',
+  'nextTick',
+  'checkIsPictureInPictureActive',
+  'worklet',
+  'revokeBufferURL',
+  'reportEvent',
+  'getExptInfoSync',
+  'reserveChannelsLive',
+  'getNFCAdapter',
+  'isVKSupport'
 ]
 
 function getMapFromList (list) {
@@ -55,7 +68,7 @@ function promisify (listObj, whiteList, customBlackList) {
     } else {
       return !(blackListMap[key] || // 特别指定的方法
         /^get\w*Manager$/.test(key) || // 获取manager的api
-        /^create\w*Context$/.test(key) || // 创建上下文相关api
+        /^create(?!BLEConnection|BLEPeripheralServer)\w*$/.test(key) || // 创建上下文相关api
         /^(on|off)/.test(key) || // 以 on* 或 off开头的方法
         /\w+Sync$/.test(key) // 以Sync结尾的方法
       )

packages/api-proxy/src/common/js/utils.js

@@ -1,4 +1,5 @@
 import { hasOwn, noop, getEnvObj, getFocusedNavigation } from '@mpxjs/utils'
+import { getCurrentInstance } from '@mpxjs/core'
 
 /**
  *
@@ -87,6 +88,14 @@ function failHandle (result, fail, complete) {
   typeof complete === 'function' && complete(result)
 }
 
+function getPageId () {
+  const navigation = getFocusedNavigation()
+  const currentInstance = getCurrentInstance()
+  console.log(currentInstance, currentInstance?.getPageId, navigation, navigation?.pageId)
+  const id = currentInstance?.getPageId || navigation?.pageId || null
+  return id
+}
+
 const ENV_OBJ = getEnvObj()
 
 export {
@@ -101,5 +110,6 @@ export {
   defineUnsupportedProps,
   successHandle,
   failHandle,
-  getFocusedNavigation
+  getFocusedNavigation,
+  getPageId
 }

packages/api-proxy/src/platform/api/action-sheet/rnActionSheet.jsx

@@ -1,14 +1,31 @@
-import { View, TouchableHighlight, Text, StyleSheet, TouchableOpacity } from 'react-native'
-import { successHandle, failHandle } from '../../../common/js'
-import { Portal } from '@ant-design/react-native'
+import { View, Text, StyleSheet } from 'react-native'
+import { successHandle, failHandle, getPageId, error } from '../../../common/js'
+import Portal from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/mpx-portal/index'
 import { getWindowInfo } from '../system/rnSystem'
 import Animated, {
   useSharedValue,
   useAnimatedStyle,
   withTiming
 } from 'react-native-reanimated'
+
 function showActionSheet (options = {}) {
+  const id = getPageId()
   const { alertText, itemList = [], itemColor = '#000000', success, fail, complete } = options
+  if (id === null) {
+    error('showActionSheet cannot be invoked outside the mpx life cycle in React Native environments')
+    const result = {
+      errMsg: 'showActionSheet:fail cannot be invoked outside the mpx life cycle in React Native environments'
+    }
+    failHandle(result, fail, complete)
+    return
+  }
+  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
@@ -64,7 +81,8 @@ function showActionSheet (options = {}) {
 
     offset.value = withTiming(0)
 
-    const selectAction = function (index) {
+    const selectAction = function (index, e) {
+      e.stopPropagation()
       const result = {
         errMsg: 'showActionSheet:ok',
         tapIndex: index
@@ -76,36 +94,38 @@ function showActionSheet (options = {}) {
     const remove = function () {
       if (actionSheetKey) {
         slideOut()
+        Portal.remove(actionSheetKey)
+        actionSheetKey = null
         setTimeout(() => {
           Portal.remove(actionSheetKey)
           actionSheetKey = null
         }, 200)
       }
     }
 
-    const cancelAction = function () {
+    const cancelAction = function (e) {
+      e.stopPropagation()
       const result = {
         errMsg: 'showActionSheet:fail cancel'
       }
       failHandle(result, fail, complete)
       remove()
     }
     return (
-      <TouchableHighlight underlayColor="rgba(0,0,0,0.6)" activeOpacity={1} onPress={cancelAction} style={styles.actionActionMask}>
-        <Animated.View style={[styles.actionSheetContent, animatedStyles]} >
+      <View onTouchEnd={cancelAction} style={styles.actionActionMask}>
+        <Animated.View style={[styles.actionSheetContent, animatedStyles]}>
           { alertText ? <View style={ styles.itemStyle }><Text style={[styles.itemTextStyle, { color: '#666666' }]}>{alertText}</Text></View> : null }
-          { itemList.map((item, index) => <TouchableHighlight key={index} underlayColor="#ececec" onPress={() => selectAction(index)} style={ [styles.itemStyle, itemList.length -1 === index ? {
+          { itemList.map((item, index) => <View key={index} onTouchEnd={(e) => selectAction(index, e)} style={ [styles.itemStyle, itemList.length -1 === index ? {
             borderBottomWidth: 6,
             borderBottomStyle: 'solid',
             borderBottomColor: '#f7f7f7'
-          } : {}] }><Text style={[styles.itemTextStyle, { color: itemColor }]}>{item}</Text></TouchableHighlight>) }
-          <View style={styles.buttonStyle}><TouchableOpacity onPress={cancelAction}><Text style={{ color: "#000000", width: "100%", textAlign: "center" }}>取消</Text></TouchableOpacity></View>
+          } : {}] }><Text style={[styles.itemTextStyle, { color: itemColor }]}>{item}</Text></View>) }
+          <View style={styles.buttonStyle} onTouchEnd={cancelAction}><Text style={{ color: "#000000", width: "100%", textAlign: "center" }}>取消</Text></View>
         </Animated.View>
-      </TouchableHighlight>
+      </View>
     )
   }
-
-  actionSheetKey = Portal.add(<ActionSheet/>)
+  actionSheetKey = Portal.add(<ActionSheet />, id)
 }
 
 export {

packages/api-proxy/src/platform/api/modal/rnModal.jsx

@@ -1,8 +1,9 @@
 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 { successHandle, failHandle, getPageId, error } from '../../../common/js'
+import Portal from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/mpx-portal/index'
 const { width, height } = Dimensions.get('window')
 const showModal = function (options = {}) {
+  const id = getPageId()
   const {
     title,
     content,
@@ -17,6 +18,14 @@ const showModal = function (options = {}) {
     fail,
     complete
   } = options
+  if (id === null) {
+    error('showModal cannot be invoked outside the mpx life cycle in React Native environments')
+    const result = {
+      errMsg: 'showModal:fail cannot be invoked outside the mpx life cycle in React Native environments'
+    }
+    failHandle(result, fail, complete)
+    return
+  }
   const modalWidth = width * 0.8
   const styles = StyleSheet.create({
     modalTask: {
@@ -156,7 +165,7 @@ const showModal = function (options = {}) {
     </View>
   </View>
   try {
-    modalKey = Portal.add(ModalView)
+    modalKey = Portal.add(ModalView, id)
   } catch (e) {
     const result = {
       errMsg: `showModal:fail invalid ${e}`