@mpxjs/api-proxy 2.10.5 → 2.10.6

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.5",
+  "version": "2.10.6",
   "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.4",
+    "@mpxjs/utils": "^2.10.6",
     "axios": "^1.7.3"
   },
   "peerDependencies": {
@@ -68,5 +68,5 @@
       "optional": true
     }
   },
-  "gitHead": "80a4120733a1ee64e394ae58240497ea6721f435"
+  "gitHead": "e28605bc2d8ab33f4dccf13ea98d9ca996f43ed6"
 }

package/src/common/js/utils.js

@@ -1,4 +1,4 @@
-import { hasOwn, noop, getEnvObj, getFocusedNavigation } from '@mpxjs/utils'
+import { hasOwn, noop, getEnvObj, getFocusedNavigation, error as errorHandler, warn as warnHandler } from '@mpxjs/utils'
 import { getCurrentInstance } from '@mpxjs/core'
 
 /**
@@ -47,15 +47,16 @@ const handleSuccess = (opts, getOptions = noop, thisObj) => {
 }
 
 function warn (msg) {
-  console.warn && console.warn(`[@mpxjs/api-proxy warn]:\n ${msg}`)
+  warnHandler(msg, '@mpxjs/api-proxy')
 }
 
 function error (msg) {
-  console.error && console.error(`[@mpxjs/api-proxy error]:\n ${msg}`)
+  errorHandler(msg, '@mpxjs/api-proxy')
 }
+
 function envError (method) {
   return () => {
-    throw Error(`[@mpxjs/api-proxy error]:\n ${__mpx_mode__}环境不支持${method}方法`)
+    errorHandler(`\n ${__mpx_mode__}环境不支持${method}方法`, '@mpxjs/api-proxy')
   }
 }
 
@@ -90,7 +91,7 @@ function failHandle (result, fail, complete) {
 
 function getCurrentPageId () {
   const currentInstance = getCurrentInstance()
-  const id = currentInstance?.getPageId() || getFocusedNavigation()?.pageId || null
+  const id = currentInstance?.proxy?.getPageId() || getFocusedNavigation()?.pageId || null
   return id
 }
 

package/src/platform/api/animation/animation.ios.js

@@ -1,3 +1,4 @@
+import { error } from '../../../common/js'
 class Animation {
   constructor (
     {
@@ -47,7 +48,7 @@ class Animation {
   steps = []
 
   matrix (a, b, c, d, tx, ty) { // Todo
-    console.error('React Native 不支持 matrix 动画')
+    error('React Native 不支持 matrix 动画')
     // this.transform.set('matrix', [a, b, c, d, tx, ty])
     return this
   }
@@ -57,7 +58,7 @@ class Animation {
             a3, b3, c3, d3,
             a4, b4, c4, d4
   ) {
-    console.error('React Native 不支持 matrix3d 动画')
+    error('React Native 不支持 matrix3d 动画')
     // this.transform.set('matrix3d', [ // Todo
     //   a1, b1, c1, d1,
     //   a2, b2, c2, d2,
@@ -78,7 +79,7 @@ class Animation {
     // this.rotateY(y)
     // this.rotateZ(z)
     // this.rotate(angle)
-    console.error('React Native 不支持 transform rotate3d')
+    error('React Native 不支持 transform rotate3d')
     return this
   }
 
@@ -116,13 +117,13 @@ class Animation {
   }
 
   scaleZ (scale) { // Todo Invariant Violation: Invalid transform scaleZ: {"scaleZ":0}
-    console.error('React Native 不支持 transform scaleZ')
+    error('React Native 不支持 transform scaleZ')
     // this.transform.set('scaleZ', scale)
     return this
   }
 
   scale3d (x, y, z) { // Todo Invariant Violation: Invalid transform scaleZ: {"scaleZ":0}
-    console.error('React Native 不支持 transform scaleZ，故不支持 scale3d')
+    error('React Native 不支持 transform scaleZ，故不支持 scale3d')
     // this.scaleX(x)
     // this.scaleY(y)
     // this.scaleZ(z)
@@ -167,14 +168,14 @@ class Animation {
   }
 
   translateZ (translate) { // Todo Invariant Violation: Invalid transform translateZ: {"translateZ":0}
-    console.error('React Native 不支持 transform translateZ')
+    error('React Native 不支持 transform translateZ')
     // [translate] = this._transformUnit(translate)
     // this.transform.set('translateZ', translate)
     return this
   }
 
   translate3d (x, y, z) { // Todo Invariant Violation: Invalid transform translateZ: {"translateZ":0}
-    console.error('React Native 不支持 transform translateZ，故无法支持 translate3d')
+    error('React Native 不支持 transform translateZ，故无法支持 translate3d')
     // [x, y, z] = this._transformUnit(x, y, z)
     // // this.transform.set('translate3d', [x, y, z])
     // this.translateX(x)
@@ -239,7 +240,7 @@ class Animation {
       transformOrigin = DEFAULT.transformOrigin
     } = arg
     if (typeof transformOrigin !== 'string') {
-      console.error('Value of transformOrigin only support string type, please check again')
+      error('Value of transformOrigin only support string type, please check again')
       transformOrigin = DEFAULT.transformOrigin
     }
     this.steps.push({

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

@@ -1,5 +1,5 @@
 import { nextTick } from '../next-tick'
-import { parseDataset } from '@mpxjs/utils'
+import { parseDataset, warn } from '@mpxjs/utils'
 
 let isInit = true
 
@@ -68,7 +68,7 @@ class WebIntersectionObserver {
   observe (targetSelector, callback) {
     nextTick(() => {
       if (!document.querySelector(targetSelector)) {
-        console.warn(`[mpx runtime warn]: Node ${JSON.stringify(targetSelector)} is not found. Intersection observer will not trigger.`)
+        warn(`Node ${JSON.stringify(targetSelector)} is not found. Intersection observer will not trigger.`)
         return
       }
       this._observer = this.initObserver()

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/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/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/api/video/index.web.js

@@ -1,4 +1,4 @@
-import { isBrowser, throwSSRWarning } from '../../../common/js'
+import { isBrowser, throwSSRWarning, warn } from '../../../common/js'
 
 const allowPlaybackRate = [0.5, 0.8, 1.0, 1.25, 1.5, 2.0]
 export const createVideoContext = (id, context) => {
@@ -22,22 +22,22 @@ export const createVideoContext = (id, context) => {
 
   // todo 进入后台音频播放模式
   __videoContext.requestBackgroundPlayback = () => {
-    console.warn('暂不支持requestBackgroundPlayback API')
+    warn('暂不支持requestBackgroundPlayback API')
   }
 
   // todo 退出后台音频播放
   __videoContext.exitBackgroundPlayback = () => {
-    console.warn('暂不支持exitBackgroundPlayback API')
+    warn('暂不支持exitBackgroundPlayback API')
   }
 
   // todo 退出小窗，该方法可在任意页面调用
   __videoContext.exitPictureInPicture = ({ success, fail, complete }) => {
-    console.warn('暂不支持exitPictureInPicture API')
+    warn('暂不支持exitPictureInPicture API')
   }
 
   // todo 发送弹幕
   __videoContext.sendDanmu = ({ text, color }) => {
-    console.warn('暂不支持发送弹幕')
+    warn('暂不支持发送弹幕')
   }
 
   // 进入全屏
@@ -90,7 +90,7 @@ export const createVideoContext = (id, context) => {
   // 设置倍速播放
   __videoContext.playbackRate = (number) => {
     if (allowPlaybackRate.indexOf(number) === -1) {
-      console.warn(`不支持${number}倍速播放`)
+      warn(`不支持${number}倍速播放`)
       return
     }
     __videoNode.playbackRate = number

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