@mpxjs/api-proxy 2.10.3-beta.4 → 2.10.4-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.10.3-beta.4",
+  "version": "2.10.4-beta.1",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -37,7 +37,7 @@
   },
   "homepage": "https://github.com/didi/mpx#readme",
   "dependencies": {
-    "@mpxjs/utils": "^2.10.2",
+    "@mpxjs/utils": "^2.10.4",
     "axios": "^1.7.3"
   },
   "peerDependencies": {

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

@@ -76,7 +76,7 @@ const styles = StyleSheet.create({
   }
 })
 
-function ActionSheet ({itemColor, height, success, fail, complete, alertText, itemList}) {
+function ActionSheet ({ itemColor, height, success, fail, complete, alertText, itemList }) {
   const slide = useSharedValue(height)
   const fade = useSharedValue(0)
   const [selectedIndex, setSelectedIndex] = useState(null)
@@ -131,20 +131,79 @@ function ActionSheet ({itemColor, height, success, fail, complete, alertText, it
   return (
     <View style={styles.actionAction}>
       <Animated.View style={[styles.maskWrap, maskAnimatedStyles]}>
-        <View activeOpacity={1} style={styles.actionActionMask} onTouchEnd={cancelAction}></View>
+        <View
+          activeOpacity={1}
+          style={styles.actionActionMask}
+          onTouchEnd={cancelAction}
+        ></View>
       </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 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, 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
+        style={[styles.actionSheetContent, actionAnimatedStyles]}
+      >
+        {alertText
+          ? (
+            <View style={styles.itemStyle}>
+              <Text
+                style={[styles.itemTextStyle, { color: '#666666' }]}
+              >
+                {alertText}
+              </Text>
+            </View>
+            )
+          : null}
+        {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,
+            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>
   )
@@ -169,11 +228,20 @@ function showActionSheet (options = {}) {
     return
   }
   const height = len * 53 + 46 + bottom + (alertText ? 52 : 0)
-  
-  const actionSheetKey = Portal.add(<ActionSheet itemColor={itemColor} height={height} success={success} fail={fail} complete={complete} alertText={alertText} itemList={itemList} />, id)
+
+  const actionSheetKey = Portal.add(
+    <ActionSheet
+      itemColor={itemColor}
+      height={height}
+      success={success}
+      fail={fail}
+      complete={complete}
+      alertText={alertText}
+      itemList={itemList}
+    />,
+    id
+  )
   actionSheetMap.set(id, actionSheetKey)
 }
 
-export {
-  showActionSheet
-}
+export { showActionSheet }

package/src/platform/api/clipboard-data/rnClipboard.js

@@ -1,48 +1,48 @@
-import { successHandle, failHandle } from '../../../common/js'
-import { type } from '@mpxjs/utils'
-import { getStringAsync, setStringAsync } from 'expo-clipboard'
+// import { successHandle, failHandle } from '../../../common/js'
+// import { type } from '@mpxjs/utils'
+// import { getStringAsync, setStringAsync } from 'expo-clipboard'
 
-const setClipboardData = function (options = {}) {
-  const { data, success, fail, complete } = options
-  if (!data || type(data) !== 'String') {
-    const errStr = !data ? 'parameter.data should be String instead of Undefined;' : `parameter.data should be String instead of ${type(data)};`
-    const result = {
-      errno: 1001,
-      errMsg: errStr
-    }
-    failHandle(result, fail, complete)
-    return
-  }
-  setStringAsync(data).then(() => {
-    const result = {
-      errMsg: 'setClipboardData:ok'
-    }
-    successHandle(result, success, complete)
-  }).catch((e) => {
-    const result = {
-      errMsg: `setClipboardData:fail ${e}`
-    }
-    failHandle(result, fail, complete)
-  })
-}
+// const setClipboardData = function (options = {}) {
+//   const { data, success, fail, complete } = options
+//   if (!data || type(data) !== 'String') {
+//     const errStr = !data ? 'parameter.data should be String instead of Undefined;' : `parameter.data should be String instead of ${type(data)};`
+//     const result = {
+//       errno: 1001,
+//       errMsg: errStr
+//     }
+//     failHandle(result, fail, complete)
+//     return
+//   }
+//   setStringAsync(data).then(() => {
+//     const result = {
+//       errMsg: 'setClipboardData:ok'
+//     }
+//     successHandle(result, success, complete)
+//   }).catch((e) => {
+//     const result = {
+//       errMsg: `setClipboardData:fail ${e}`
+//     }
+//     failHandle(result, fail, complete)
+//   })
+// }
 
-const getClipboardData = function (options = {}) {
-  const { success, fail, complete } = options
-  getStringAsync().then((data) => {
-    const result = {
-      data,
-      errMsg: 'getClipboardData:ok'
-    }
-    successHandle(result, success, complete)
-  }).catch((e) => {
-    const result = {
-      errMsg: `getClipboardData:fail ${e}`
-    }
-    failHandle(result, fail, complete)
-  })
-}
+// const getClipboardData = function (options = {}) {
+//   const { success, fail, complete } = options
+//   getStringAsync().then((data) => {
+//     const result = {
+//       data,
+//       errMsg: 'getClipboardData:ok'
+//     }
+//     successHandle(result, success, complete)
+//   }).catch((e) => {
+//     const result = {
+//       errMsg: `getClipboardData:fail ${e}`
+//     }
+//     failHandle(result, fail, complete)
+//   })
+// }
 
-export {
-  setClipboardData,
-  getClipboardData
-}
+// export {
+//   setClipboardData,
+//   getClipboardData
+// }

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

@@ -105,7 +105,6 @@ class RNIntersectionObserver {
       right: navigationLayout.width + this.margins.right,
       bottom: navigationLayout.y + navigationLayout.height + this.margins.bottom
     }
-
     this.windowRect = windowRect
     return this.windowRect
   }
@@ -153,19 +152,16 @@ class RNIntersectionObserver {
     return Math.min(Math.max(start, value), end)
   }
 
-  _isInsectedFn (intersectionRatio, previousIntersectionRatio, thresholds) {
-  // console.log('nowintersectionRatio, previousIntersectionRatio', [intersectionRatio, previousIntersectionRatio])
-    let nowIndex = -1
-    let previousIndex = -1
+  _getRatioIndex (ratio, thresholds = []) {
+    if (ratio === 0 && thresholds.includes(0)) return -1
+    if (ratio === 1 && thresholds.includes(1)) return thresholds.length
+    let returnIndex = -1
     thresholds.forEach((item, index) => {
-      if (intersectionRatio >= item) {
-        nowIndex = index
-      }
-      if (previousIntersectionRatio >= item) {
-        previousIndex = index
+      if (ratio >= item) {
+       returnIndex = index
       }
     })
-    return !(nowIndex === previousIndex)
+    return returnIndex
   }
 
   // 计算相交区域
@@ -180,10 +176,8 @@ class RNIntersectionObserver {
     const targetArea = (observeRect.bottom - observeRect.top) * (observeRect.right - observeRect.left)
     const visibleArea = (visibleRect.bottom - visibleRect.top) * (visibleRect.right - visibleRect.left)
     const intersectionRatio = targetArea ? visibleArea / targetArea : 0
-
-    const isInsected = isInit ? intersectionRatio > this.initialRatio : this._isInsectedFn(intersectionRatio, this.previousIntersectionRatio[observeIndex], this.thresholds)
+    const isInsected = isInit ? intersectionRatio > this.initialRatio : !(this._getRatioIndex(intersectionRatio, this.thresholds) === this._getRatioIndex(this.previousIntersectionRatio[observeIndex], this.thresholds))
     this.previousIntersectionRatio[observeIndex] = intersectionRatio
-
     return {
       intersectionRatio,
       intersectionRect: {
@@ -217,7 +211,6 @@ class RNIntersectionObserver {
           relativeRect,
           isInit
         })
-        // 初次调用的
         if (isInsected) {
           this.callback({
             // index: index,

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

@@ -88,7 +88,7 @@ const showModal = function (options = {}) {
       flex: 1,
       textAlign: 'center',
       paddingTop: width * 0.04,
-      paddingBottom: width * 0.04,
+      paddingBottom: width * 0.04
     },
     modalButton: {
       width: '100%',
@@ -98,14 +98,13 @@ const showModal = function (options = {}) {
     cancelStyle: {
       borderRightWidth: StyleSheet.hairlineWidth,
       borderRightColor: 'rgba(0,0,0,0.2)',
-      borderStyle: 'solid',
+      borderStyle: 'solid'
     }
   })
-  let ModalView
-  let modalTitle = []
-  let modalContent = []
-  let editableContent = []
-  let modalButton = [{
+  const modalTitle = []
+  const modalContent = []
+  const editableContent = []
+  const modalButton = [{
     text: confirmText,
     type: 'confirm',
     color: confirmColor
@@ -116,7 +115,7 @@ const showModal = function (options = {}) {
   }
   const closeModal = function (buttonInfo) {
     const modalKey = getCurrentModalKey()
-    if(modalKey) {
+    if (modalKey) {
       Portal.remove(modalKey)
     }
     const result = {
@@ -153,7 +152,7 @@ const showModal = function (options = {}) {
       color: cancelColor
     })
   }
-  ModalView = <View style={styles.modalTask}>
+  const ModalView = <View style={styles.modalTask}>
     <View style={styles.modalContent}>
       {modalTitle.map((item, index) => <View key={index}><Text style={styles.modalTitleText}>{item}</Text></View>)}
       {modalContent.map((item, index) => <ScrollView key={index} style={styles.contentBox}><Text style={styles.modalContentText}>{item}</Text></ScrollView>)}
@@ -171,7 +170,7 @@ const showModal = function (options = {}) {
         paddingRight: 10
       }} onChangeText={text => onChangeText(text)} defaultValue={content}></TextInput></View>)}
       <View style={styles.modalBtnBox}>
-        {modalButton.map((item, index) => <TouchableOpacity key={index} style={[ styles.modalBtn, item.style ]} onPress={() => closeModal(item)}><Text style={[styles.modalButton, { color: item.color }]}>{item.text}</Text></TouchableOpacity>)}
+        {modalButton.map((item, index) => <TouchableOpacity key={index} style={[styles.modalBtn, item.style]} onPress={() => closeModal(item)}><Text style={[styles.modalButton, { color: item.color }]}>{item.text}</Text></TouchableOpacity>)}
       </View>
     </View>
   </View>

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.keys(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/screen-brightness/index.ali.js

@@ -16,7 +16,6 @@ function getScreenBrightness (options = {}) {
   handleSuccess(opts, res => {
     return changeOpts(res, { brightness: 'value' }, { errMsg: 'getScreenBrightness:ok' })
   })
-
   return ENV_OBJ.getScreenBrightness(opts)
 }
 

package/src/platform/api/screen-brightness/rnScreenBrightness.js

@@ -1,47 +1,47 @@
-import * as Brightness from 'expo-brightness'
-import { successHandle, failHandle, envError } from '../../../common/js'
+// import * as Brightness from 'expo-brightness'
+// import { successHandle, failHandle, envError } from '../../../common/js'
 
-function getScreenBrightness (options = {}) {
-  const { success, fail, complete } = options
-  Brightness.getBrightnessAsync().then(value => {
-    const result = {
-      errMsg: 'getScreenBrightness:ok',
-      value
-    }
-    successHandle(result, success, complete)
-  }).catch(() => {
-    const result = {
-      errMsg: 'getScreenBrightness:fail'
-    }
-    failHandle(result, fail, complete)
-  })
-}
+// function getScreenBrightness (options = {}) {
+//   const { success, fail, complete } = options
+//   Brightness.getBrightnessAsync().then(value => {
+//     const result = {
+//       errMsg: 'getScreenBrightness:ok',
+//       value
+//     }
+//     successHandle(result, success, complete)
+//   }).catch(() => {
+//     const result = {
+//       errMsg: 'getScreenBrightness:fail'
+//     }
+//     failHandle(result, fail, complete)
+//   })
+// }
 
-function setScreenBrightness (options = {}) {
-  const { value, success, fail, complete } = options
-  Brightness.setBrightnessAsync(value).then(() => {
-    const result = {
-      errMsg: 'setScreenBrightness:ok'
-    }
-    successHandle(result, success, complete)
-  }).catch(() => {
-    const result = {
-      errMsg: 'setScreenBrightness:fail'
-    }
-    failHandle(result, fail, complete)
-  })
-}
+// function setScreenBrightness (options = {}) {
+//   const { value, success, fail, complete } = options
+//   Brightness.setBrightnessAsync(value).then(() => {
+//     const result = {
+//       errMsg: 'setScreenBrightness:ok'
+//     }
+//     successHandle(result, success, complete)
+//   }).catch(() => {
+//     const result = {
+//       errMsg: 'setScreenBrightness:fail'
+//     }
+//     failHandle(result, fail, complete)
+//   })
+// }
 
-const setVisualEffectOnCapture = envError('setVisualEffectOnCapture')
+// const setVisualEffectOnCapture = envError('setVisualEffectOnCapture')
 
-const onUserCaptureScreen = envError('onUserCaptureScreen')
+// const onUserCaptureScreen = envError('onUserCaptureScreen')
 
-const offUserCaptureScreen = envError('offUserCaptureScreen')
+// const offUserCaptureScreen = envError('offUserCaptureScreen')
 
-export {
-  getScreenBrightness,
-  setScreenBrightness,
-  setVisualEffectOnCapture,
-  onUserCaptureScreen,
-  offUserCaptureScreen
-}
+// export {
+//   getScreenBrightness,
+//   setScreenBrightness,
+//   setVisualEffectOnCapture,
+//   onUserCaptureScreen,
+//   offUserCaptureScreen
+// }

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

@@ -59,7 +59,7 @@ const getSystemInfo = function (options = {}) {
 
 const getDeviceInfo = function () {
   const deviceInfo = {}
-  if (__mpx_mode__ === 'android' || __mpx_mode__ === 'harmony') {
+  if (__mpx_mode__ !== 'ios') {
     const deviceAbi = DeviceInfo.supported64BitAbisSync() || []
     deviceInfo.deviceAbi = deviceAbi[0] || null
   }

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

@@ -27,7 +27,7 @@ const styles = StyleSheet.create({
     top: 0,
     bottom: 0,
     zIndex: 10000,
-    position: "absolute",
+    position: 'absolute',
     display: 'flex',
     alignItems: 'center'
   },
@@ -77,14 +77,14 @@ function showToast (options = {}) {
   const pointerEvents = mask ? 'auto' : 'none'
   isLoadingShow = isLoading
   if (image || icon === 'success' || icon === 'error') {
-    ToastView = <View style={[styles.toastWrap, {pointerEvents}]}>
+    ToastView = <View style={[styles.toastWrap, { pointerEvents }]}>
       <View style={[styles.toastContent, styles.toastHasIcon]}>
-        <Image style={ styles.toastImg } source={{uri: image || iconImg[icon]}}></Image>
+        <Image style={ styles.toastImg } source={{ uri: image || iconImg[icon] }}></Image>
         { title ? <Text style={styles.toastText}>{title}</Text> : null }
       </View>
     </View>
   } else if (icon === 'loading') {
-    ToastView = <View  style={[styles.toastWrap, {pointerEvents}]}>
+    ToastView = <View style={[styles.toastWrap, { pointerEvents }]}>
       <View style={[styles.toastContent, styles.toastHasIcon]}>
         <ActivityIndicator
           animating
@@ -94,13 +94,20 @@ function showToast (options = {}) {
         { title ? <Text style={styles.toastText}>{title}</Text> : null }
       </View>
     </View>
-  }  else  {
-    ToastView = <View style={[styles.toastWrap, {pointerEvents}]}>
+  } else {
+    ToastView = <View style={[styles.toastWrap, { pointerEvents }]}>
       <View style={styles.toastContent}>
-        { title ? <Text numberOfLines={2} style={{ ...styles.toastText, ...(icon === 'none' ? {
-            height: 'auto',
-            marginTop: 0
-          } : {}) }}>{title}</Text> : null }
+        { title
+          ? <Text numberOfLines={2} style={{
+            ...styles.toastText,
+            ...(icon === 'none'
+              ? {
+                  height: 'auto',
+                  marginTop: 0
+                }
+              : {})
+          }}>{title}</Text>
+          : null }
       </View>
     </View>
   }
@@ -130,7 +137,7 @@ function showToast (options = {}) {
   }
 }
 
-function hideToast(options = {}) {
+function hideToast (options = {}) {
   const id = getCurrentPageId()
   const { noConflict = false, success, fail, complete } = options
 

package/src/platform/index.js

@@ -26,7 +26,7 @@ export * from './api/canvas'
 export * from './api/check-session'
 
 // setClipboardData, getClipboardData
-// export * from './api/clipboard-data'
+export * from './api/clipboard-data'
 
 // createIntersectionObserver
 export * from './api/create-intersection-observer'
@@ -77,7 +77,7 @@ export * from './api/route'
 export * from './api/scan-code'
 
 // setScreenBrightness, getScreenBrightness
-// export * from './api/screen-brightness'
+export * from './api/screen-brightness'
 
 // setNavigationBarTitle, setNavigationBarColor
 export * from './api/set-navigation-bar'

package/src/platform/api/clipboard-data/index.ios.js

@@ -1 +0,0 @@
-export * from './rnClipboard'

package/src/platform/api/screen-brightness/index.ios.js

@@ -1 +0,0 @@
-export * from './rnScreenBrightness'