@mpxjs/api-proxy 2.10.4-beta.1 → 2.10.4-beta.11

package/@types/index.d.ts

@@ -121,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.4-beta.1",
+  "version": "2.10.4-beta.11",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",

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/create-intersection-observer/rnIntersectionObserver.js

@@ -95,21 +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) => {
@@ -127,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
             }

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/set-navigation-bar/index.ios.js

@@ -7,7 +7,9 @@ function setNavigationBarTitle (options = {}) {
     failHandle({ errMsg: 'setNavigationBarTitle:fail' }, fail, complete)
   } else {
     nextTick(() => {
-      navigation.setOptions({ title: title.trim() })
+      navigation.setPageConfig({
+        navigationBarTitleText: title.trim()
+      })
       successHandle({ errMsg: 'setNavigationBarTitle:ok' }, success, complete)
     })
   }
@@ -20,11 +22,9 @@ function setNavigationBarColor (options = {}) {
     failHandle({ errMsg: 'setNavigationBarColor:fail' }, fail, complete)
   } else {
     nextTick(() => {
-      navigation.setOptions({
-        headerStyle: {
-          backgroundColor: backgroundColor
-        },
-        headerTintColor: frontColor
+      navigation.setPageConfig({
+        navigationBarBackgroundColor: backgroundColor,
+        navigationBarTextStyle: frontColor
       })
       successHandle({ errMsg: 'setNavigationBarColor:ok' }, success, complete)
     })

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

@@ -33,12 +33,46 @@ function getSystemInfoSync () {
 }
 
 const getDeviceInfo = function () {
-  const res = ENV_OBJ.getDeviceBaseInfo
+  let res
+  if (ENV_OBJ.canIUse('getDeviceBaseInfo')) {
+    res = ENV_OBJ.getDeviceBaseInfo()
+  } else {
+    const systemInfo = getSystemInfoSync()
+    res = {
+      abi: systemInfo.abi || null,
+      benchmarkLevel: systemInfo.benchmarkLevel || null,
+      brand: systemInfo.brand,
+      model: systemInfo.model,
+      system: systemInfo.system,
+      platform: systemInfo.platform,
+      memorySize: systemInfo.memorySize || null
+    }
+  }
   defineUnsupportedProps(res, ['deviceAbi', 'benchmarkLevel', 'cpuType'])
   return res
 }
 
-const getWindowInfo = ENV_OBJ.getWindowInfo || envError('getWindowInfo')
+const getWindowInfo = function () {
+  let res
+  if (ENV_OBJ.canIUse('getWindowInfo')) {
+    res = ENV_OBJ.getWindowInfo()
+  } else {
+    const systemInfo = getSystemInfoSync()
+    res = {
+      pixelRatio: systemInfo.pixelRatio,
+      screenWidth: systemInfo.screenWidth,
+      screenHeight: systemInfo.screenHeight,
+      windowWidth: systemInfo.windowWidth,
+      windowHeight: systemInfo.windowHeight,
+      statusBarHeight: systemInfo.statusBarHeight,
+      safeArea: systemInfo.safeArea || null,
+      screenTop: systemInfo.screenTop || null
+    }
+  }
+  return res
+}
+
+// const getWindowInfo = ENV_OBJ.getWindowInfo || envError('getWindowInfo')
 
 const getLaunchOptionsSync = ENV_OBJ.getLaunchOptionsSync || envError('getLaunchOptionsSync')
 

package/src/platform/api/system/rnSystem.js

@@ -7,10 +7,9 @@ const getWindowInfo = function () {
   const navigation = getFocusedNavigation() || {}
   const initialWindowMetricsInset = initialWindowMetrics?.insets || {}
   const navigationInsets = navigation.insets || {}
-  const insets = Object.assign(initialWindowMetricsInset, navigationInsets)
+  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

@@ -32,8 +32,7 @@ const styles = StyleSheet.create({
     alignItems: 'center'
   },
   toastHasIcon: {
-    height: 110,
-    width: 120
+    width: 140
   },
   toastImg: {
     width: 40,
@@ -46,8 +45,6 @@ const styles = StyleSheet.create({
     color: '#ffffff',
     fontSize: 12,
     lineHeight: 18,
-    height: 18,
-    overflow: 'hidden',
     marginTop: 10
   }
 })
@@ -80,7 +77,7 @@ function showToast (options = {}) {
     ToastView = <View style={[styles.toastWrap, { pointerEvents }]}>
       <View style={[styles.toastContent, styles.toastHasIcon]}>
         <Image style={ styles.toastImg } source={{ uri: image || iconImg[icon] }}></Image>
-        { title ? <Text style={styles.toastText}>{title}</Text> : null }
+        { title ? <Text numberOfLines={2} style={styles.toastText}>{title}</Text> : null }
       </View>
     </View>
   } else if (icon === 'loading') {
@@ -91,7 +88,7 @@ function showToast (options = {}) {
           size='small'
           color='#eee'
         />
-        { title ? <Text style={styles.toastText}>{title}</Text> : null }
+        { title ? <Text numberOfLines={2} style={styles.toastText}>{title}</Text> : null }
       </View>
     </View>
   } else {
@@ -102,7 +99,6 @@ function showToast (options = {}) {
             ...styles.toastText,
             ...(icon === 'none'
               ? {
-                  height: 'auto',
                   marginTop: 0
                 }
               : {})

package/src/platform/index.js

@@ -43,7 +43,7 @@ export * from './api/file'
 // getUserInfo
 export * from './api/get-user-info'
 
-// previewImage, compressImage, getImageInfo
+// previewImage, compressImage, getImageInfo, chooseMedia
 export * from './api/image'
 
 // login
@@ -105,7 +105,7 @@ export * from './api/video'
 // onWindowResize, offWindowResize
 export * from './api/window'
 
-// getLocation, openLocation, chooseLocation
+// getLocation, openLocation, chooseLocation, onLocationChange, offLocationChange, startLocationUpdate, stopLocationUpdate
 export * from './api/location'
 
 // getExtConfig, getExtConfigSync