@mpxjs/api-proxy 2.10.3 → 2.10.4-beta.10

package/@types/index.d.ts

@@ -83,6 +83,9 @@ export const switchTab: WechatMiniprogram.Wx['switchTab']
 export const scanCode: WechatMiniprogram.Wx['scanCode']
 export const setScreenBrightness: WechatMiniprogram.Wx['setScreenBrightness']
 export const getScreenBrightness: WechatMiniprogram.Wx['getScreenBrightness']
+export const setVisualEffectOnCapture: WechatMiniprogram.Wx['setVisualEffectOnCapture']
+export const onUserCaptureScreen: WechatMiniprogram.Wx['onUserCaptureScreen']
+export const offUserCaptureScreen: WechatMiniprogram.Wx['offUserCaptureScreen']
 export const setNavigationBarTitle: WechatMiniprogram.Wx['setNavigationBarTitle']
 export const setNavigationBarColor: WechatMiniprogram.Wx['setNavigationBarColor']
 export const connectSocket: WechatMiniprogram.Wx['connectSocket']
@@ -118,12 +121,17 @@ export const enableAlertBeforeUnload: WechatMiniprogram.Wx['enableAlertBeforeUnl
 export const disableAlertBeforeUnload: WechatMiniprogram.Wx['disableAlertBeforeUnload']
 export const getMenuButtonBoundingClientRect: WechatMiniprogram.Wx['getMenuButtonBoundingClientRect']
 export const getImageInfo: WechatMiniprogram.Wx['getImageInfo']
+export const chooseMedia: WechatMiniprogram.Wx['chooseMedia']
 export const vibrateShort: WechatMiniprogram.Wx['vibrateShort']
 export const vibrateLong: WechatMiniprogram.Wx['vibrateLong']
 export const getExtConfig: WechatMiniprogram.Wx['getExtConfig']
 export const getExtConfigSync: WechatMiniprogram.Wx['getExtConfigSync']
 export const openLocation: WechatMiniprogram.Wx['openLocation']
 export const chooseLocation: WechatMiniprogram.Wx['chooseLocation']
+export const onLocationChange: WechatMiniprogram.Wx['onLocationChange']
+export const offLocationChange: WechatMiniprogram.Wx['offLocationChange']
+export const startLocationUpdate: WechatMiniprogram.Wx['startLocationUpdate']
+export const stopLocationUpdate: WechatMiniprogram.Wx['stopLocationUpdate']
 
 declare const install: (...args: any) => any
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.10.3",
+  "version": "2.10.4-beta.10",
   "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": {
@@ -67,6 +67,5 @@
     "react-native-haptic-feedback": {
       "optional": true
     }
-  },
-  "gitHead": "043c9bc770ce9cc11f865bab67f46849ff573728"
+  }
 }

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/animation/index.ios.js

@@ -1,4 +1,4 @@
-import Animation from './animation.react'
+import Animation from './animation'
 
 export const createAnimation = (option) => {
   return new Animation(option)

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

@@ -95,22 +95,25 @@ class RNIntersectionObserver {
     const navigationLayout = navigation.layout || {
       x: 0,
       y: 0,
+      top: 0,
+      left: 0,
       width: screen.width,
       height: screen.height
     }
 
     const windowRect = {
-      top: navigationLayout.y - this.margins.top,
+      top: navigationLayout.top - this.margins.top,
       left: 0 - this.margins.left,
       right: navigationLayout.width + this.margins.right,
-      bottom: navigationLayout.y + navigationLayout.height + this.margins.bottom
+      bottom: navigationLayout.top + navigationLayout.height + this.margins.bottom
     }
-
     this.windowRect = windowRect
     return this.windowRect
   }
 
   _getReferenceRect (targetRef) {
+    const navigation = getFocusedNavigation() || {}
+    const layout = navigation.layout || {}
     const targetRefs = isArray(targetRef) ? targetRef : [targetRef]
     const targetPromiseQueue = []
     targetRefs.forEach((targetRefItem) => {
@@ -128,11 +131,12 @@ class RNIntersectionObserver {
       targetPromiseQueue.push(new Promise((resolve) => {
         target.measureInWindow(
           (x, y, width, height) => {
+            // 安卓measureInWindow的参考值在android下为statubar的左下角，因此top需要调整一下
             const boundingClientRect = {
               left: x,
-              top: y,
+              top: y + layout.statusBarHeight || 0,
               right: x + width,
-              bottom: y + height,
+              bottom: y + height + layout.statusBarHeight || 0,
               width: width,
               height: height
             }
@@ -153,19 +157,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 +181,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 +216,6 @@ class RNIntersectionObserver {
           relativeRect,
           isInit
         })
-        // 初次调用的
         if (isInsected) {
           this.callback({
             // index: index,

package/src/platform/api/image/index.ali.js

@@ -1,4 +1,4 @@
-import { ENV_OBJ, changeOpts, handleSuccess } from '../../../common/js'
+import { ENV_OBJ, changeOpts, handleSuccess, envError } from '../../../common/js'
 
 function previewImage (options = {}) {
   const opts = changeOpts(options)
@@ -30,10 +30,13 @@ function compressImage (options = {}) {
   return ENV_OBJ.compressImage(opts)
 }
 
-const getImageInfo = ENV_OBJ.getImageInfo
+const getImageInfo = ENV_OBJ.getImageInfo || envError('getImageInfo')
+
+const chooseMedia = envError('chooseMedia')
 
 export {
   previewImage,
   compressImage,
-  getImageInfo
+  getImageInfo,
+  chooseMedia
 }

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

@@ -38,8 +38,11 @@ const getImageInfo = function (options = {}) {
   })
 }
 
+const chooseMedia = envError('chooseMedia')
+
 export {
   previewImage,
   compressImage,
-  getImageInfo
+  getImageInfo,
+  chooseMedia
 }

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

@@ -6,8 +6,11 @@ const compressImage = ENV_OBJ.compressImage || envError('compressImage')
 
 const getImageInfo = ENV_OBJ.getImageInfo || envError('getImageInfo')
 
+const chooseMedia = ENV_OBJ.chooseMedia || envError('chooseMedia')
+
 export {
   previewImage,
   compressImage,
-  getImageInfo
+  getImageInfo,
+  chooseMedia
 }

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

@@ -60,8 +60,11 @@ const getImageInfo = function (options = {}) {
   }
 }
 
+const chooseMedia = envError('chooseMedia')
+
 export {
   previewImage,
   compressImage,
-  getImageInfo
+  getImageInfo,
+  chooseMedia
 }

package/src/platform/api/location/index.ali.js

@@ -1,4 +1,4 @@
-import { ENV_OBJ, changeOpts, handleSuccess, defineUnsupportedProps } from '../../../common/js'
+import { ENV_OBJ, changeOpts, handleSuccess, defineUnsupportedProps, envError } from '../../../common/js'
 
 function getLocation (options = {}) {
   const opts = Object.assign(options, {
@@ -22,10 +22,22 @@ function openLocation (options = {}) {
   return ENV_OBJ.openLocation(opts)
 }
 
-const chooseLocation = ENV_OBJ.chooseLocation
+const chooseLocation = ENV_OBJ.chooseLocation || envError('chooseLocation')
+
+const onLocationChange = envError('onLocationChange')
+
+const offLocationChange = envError('offLocationChange')
+
+const startLocationUpdate = envError('startLocationUpdate')
+
+const stopLocationUpdate = envError('stopLocationUpdate')
 
 export {
   getLocation,
   openLocation,
-  chooseLocation
+  chooseLocation,
+  onLocationChange,
+  offLocationChange,
+  startLocationUpdate,
+  stopLocationUpdate
 }

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

@@ -24,8 +24,20 @@ const openLocation = envError('openLocation')
 
 const chooseLocation = envError('chooseLocation')
 
+const onLocationChange = envError('onLocationChange')
+
+const offLocationChange = envError('offLocationChange')
+
+const startLocationUpdate = envError('startLocationUpdate')
+
+const stopLocationUpdate = envError('stopLocationUpdate')
+
 export {
   getLocation,
   openLocation,
-  chooseLocation
+  chooseLocation,
+  onLocationChange,
+  offLocationChange,
+  startLocationUpdate,
+  stopLocationUpdate
 }

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

@@ -6,8 +6,20 @@ const openLocation = ENV_OBJ.openLocation || envError('openLocation')
 
 const chooseLocation = ENV_OBJ.chooseLocation || envError('chooseLocation')
 
+const onLocationChange = ENV_OBJ.onLocationChange || envError('onLocationChange')
+
+const offLocationChange = ENV_OBJ.offLocationChange || envError('offLocationChange')
+
+const startLocationUpdate = ENV_OBJ.startLocationUpdate || envError('startLocationUpdate')
+
+const stopLocationUpdate = ENV_OBJ.stopLocationUpdate || envError('stopLocationUpdate')
+
 export {
   getLocation,
   openLocation,
-  chooseLocation
+  chooseLocation,
+  onLocationChange,
+  offLocationChange,
+  startLocationUpdate,
+  stopLocationUpdate
 }

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

@@ -29,8 +29,20 @@ const openLocation = envError('openLocation')
 
 const chooseLocation = envError('chooseLocation')
 
+const onLocationChange = envError('onLocationChange')
+
+const offLocationChange = envError('offLocationChange')
+
+const startLocationUpdate = envError('startLocationUpdate')
+
+const stopLocationUpdate = envError('stopLocationUpdate')
+
 export {
   getLocation,
   openLocation,
-  chooseLocation
+  chooseLocation,
+  onLocationChange,
+  offLocationChange,
+  startLocationUpdate,
+  stopLocationUpdate
 }

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

@@ -1,4 +1,4 @@
-import { ENV_OBJ, changeOpts, handleSuccess } from '../../../common/js'
+import { ENV_OBJ, changeOpts, handleSuccess, envError } from '../../../common/js'
 
 function setScreenBrightness (options = {}) {
   const opts = changeOpts(options, {
@@ -16,11 +16,19 @@ function getScreenBrightness (options = {}) {
   handleSuccess(opts, res => {
     return changeOpts(res, { brightness: 'value' }, { errMsg: 'getScreenBrightness:ok' })
   })
-
   return ENV_OBJ.getScreenBrightness(opts)
 }
 
+const setVisualEffectOnCapture = ENV_OBJ.setVisualEffectOnCapture || envError('setVisualEffectOnCapture')
+
+const onUserCaptureScreen = ENV_OBJ.onUserCaptureScreen || envError('onUserCaptureScreen')
+
+const offUserCaptureScreen = ENV_OBJ.offUserCaptureScreen || envError('offUserCaptureScreen')
+
 export {
   setScreenBrightness,
-  getScreenBrightness
+  getScreenBrightness,
+  setVisualEffectOnCapture,
+  onUserCaptureScreen,
+  offUserCaptureScreen
 }

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

@@ -4,7 +4,16 @@ const setScreenBrightness = ENV_OBJ.setScreenBrightness || envError('setScreenBr
 
 const getScreenBrightness = ENV_OBJ.getScreenBrightness || envError('getScreenBrightness')
 
+const setVisualEffectOnCapture = ENV_OBJ.setVisualEffectOnCapture || envError('setVisualEffectOnCapture')
+
+const onUserCaptureScreen = ENV_OBJ.onUserCaptureScreen || envError('onUserCaptureScreen')
+
+const offUserCaptureScreen = ENV_OBJ.offUserCaptureScreen || envError('offUserCaptureScreen')
+
 export {
   setScreenBrightness,
-  getScreenBrightness
+  getScreenBrightness,
+  setVisualEffectOnCapture,
+  onUserCaptureScreen,
+  offUserCaptureScreen
 }