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

package/package.json

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

package/src/common/js/promisify.js

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

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

@@ -1,4 +1,4 @@
-import { useEffect } from 'react'
+import { useEffect, useState } from 'react'
 import { View, Text, StyleSheet } from 'react-native'
 import { successHandle, failHandle, getCurrentPageId } from '../../../common/js'
 import Portal from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/mpx-portal/index'
@@ -7,8 +7,7 @@ import Animated, {
   useSharedValue,
   useAnimatedStyle,
   withTiming,
-  Easing,
-  runOnJS
+  Easing
 } from 'react-native-reanimated'
 const actionSheetMap = new Map()
 
@@ -53,8 +52,7 @@ const styles = StyleSheet.create({
     position: 'absolute',
     bottom: 0,
     left: 0,
-    right: 0,
-    paddingBottom: bottom
+    right: 0
   },
   itemStyle: {
     paddingTop: 15,
@@ -72,15 +70,16 @@ const styles = StyleSheet.create({
   },
   buttonStyle: {
     paddingTop: 10,
-    paddingBottom: 10,
     justifyContent: 'center',
-    alignItems: 'center'
+    alignItems: 'center',
+    paddingBottom: bottom + 10
   }
 })
 
 function ActionSheet ({itemColor, height, success, fail, complete, alertText, itemList}) {
   const slide = useSharedValue(height)
   const fade = useSharedValue(0)
+  const [selectedIndex, setSelectedIndex] = useState(null)
 
   const actionAnimatedStyles = useAnimatedStyle(() => {
     return {
@@ -116,6 +115,7 @@ function ActionSheet ({itemColor, height, success, fail, complete, alertText, it
       tapIndex: index
     }
     successHandle(result, success, complete)
+    setSelectedIndex(null)
   }
   const cancelAction = function () {
     removeActionSheet()
@@ -123,6 +123,10 @@ function ActionSheet ({itemColor, height, success, fail, complete, alertText, it
       errMsg: 'showActionSheet:fail cancel'
     }
     failHandle(result, fail, complete)
+    setSelectedIndex(null)
+  }
+  const startHandle = function (index) {
+    setSelectedIndex(index)
   }
   return (
     <View style={styles.actionAction}>
@@ -131,12 +135,16 @@ function ActionSheet ({itemColor, height, success, fail, complete, alertText, it
       </Animated.View>
       <Animated.View style={[styles.actionSheetContent, actionAnimatedStyles]}>
         { alertText ? <View style={ styles.itemStyle }><Text style={[styles.itemTextStyle, { color: '#666666' }]}>{alertText}</Text></View> : null }
-        { itemList.map((item, index) => <View onTouchEnd={() => selectAction(index)} key={index} style={ [styles.itemStyle, itemList.length -1 === index ? {
+        { itemList.map((item, index) => <View onTouchStart={() => startHandle(index)} onTouchEnd={() => selectAction(index)} key={index} style={ [styles.itemStyle, itemList.length -1 === index ? {
           borderBottomWidth: 6,
           borderBottomStyle: 'solid',
           borderBottomColor: '#f7f7f7'
+        } : {}, selectedIndex === index ? {
+          backgroundColor: '#ececec'
         } : {}] }><Text style={[styles.itemTextStyle, { color: itemColor }]}>{item}</Text></View>) }
-        <View style={styles.buttonStyle} onTouchEnd={cancelAction}><Text style={{ color: "#000000", fontSize: 18, lineHeight: 22, height: 22, width: "100%", textAlign: "center" }}>取消</Text></View>
+        <View style={[styles.buttonStyle, selectedIndex === -1 ? {
+          backgroundColor: '#ececec'
+        } : {}]}  onTouchStart={() => startHandle(-1)} onTouchEnd={cancelAction}><Text style={{ color: "#000000", fontSize: 18, lineHeight: 22, height: 22, width: "100%", textAlign: "center" }}>取消</Text></View>
       </Animated.View>
     </View>
   )
@@ -168,4 +176,4 @@ function showActionSheet (options = {}) {
 
 export {
   showActionSheet
-}
+}

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)
@@ -156,53 +156,10 @@ function switchTab () {
 
 }
 
-function reset (options = {}) {
-  const routes = options.routes || []
-  if (!routes.length) {
-    const res = { errMsg: 'reset:fail routes cannot be an empty array' }
-    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(Object.assign(resetOption, {
-      index: routes.length - 1
-    }))
-    navigationHelper.lastSuccessCallback = () => {
-      const res = { errMsg: 'reset:ok' }
-      successHandle(res, options.success, options.complete)
-    }
-    navigationHelper.lastFailCallback = (msg) => {
-      const res = { errMsg: `reset:fail ${msg}` }
-      failHandle(res, options.fail, options.complete)
-    }
-  }
-}
-
-function getState () {
-  const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
-  if (navigation) {
-    return navigation.getState()
-  }
-  return {}
-}
-
 export {
   redirectTo,
   navigateTo,
   navigateBack,
   reLaunch,
-  switchTab,
-  reset,
-  getState
+  switchTab
 }

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

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

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

@@ -1,4 +1,4 @@
-import { successHandle, failHandle, isTabBarPage, throwSSRWarning, isBrowser, envError } from '../../../common/js'
+import { successHandle, failHandle, isTabBarPage, throwSSRWarning, isBrowser } from '../../../common/js'
 import { EventChannel } from '../event-channel'
 
 let routeCount = 0
@@ -183,16 +183,10 @@ function switchTab (options = {}) {
   }
 }
 
-const reset = envError('reset')
-
-const getState = envError('getState')
-
 export {
   redirectTo,
   navigateTo,
   navigateBack,
   reLaunch,
-  switchTab,
-  reset,
-  getState
+  switchTab
 }

package/src/platform/api/set-navigation-bar/index.ios.js

@@ -7,7 +7,7 @@ function setNavigationBarTitle (options = {}) {
     failHandle({ errMsg: 'setNavigationBarTitle:fail' }, fail, complete)
   } else {
     nextTick(() => {
-      navigation.setOptions({ title })
+      navigation.setOptions({ title: title.trim() })
       successHandle({ errMsg: 'setNavigationBarTitle:ok' }, success, complete)
     })
   }