@mpxjs/api-proxy 2.10.15-2 → 2.10.15-prelease.1

package/package.json

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

package/src/common/js/promisify.js

@@ -1,28 +1,14 @@
-import { ENV_OBJ } from './utils'
+import { ENV_OBJ, warn } from './utils'
 
 // 特别指定的不进行Promise封装的方法
 const blackList = [
-  'clearStorage',
-  'hideToast',
-  'hideLoading',
   'drawCanvas',
   'canIUse',
-  'stopRecord',
-  'pauseVoice',
-  'stopVoice',
-  'pauseBackgroundAudio',
-  'stopBackgroundAudio',
-  'showNavigationBarLoading',
-  'hideNavigationBarLoading',
   'getPerformance',
-  'hideKeyboard',
-  'stopPullDownRefresh',
-  'pageScrollTo',
   'reportAnalytics',
   'getMenuButtonBoundingClientRect',
   'reportMonitor',
   'reportEvent',
-  'connectSocket',
   'base64ToArrayBuffer',
   'arrayBufferToBase64',
   'getDeviceInfo',
@@ -33,16 +19,12 @@ const blackList = [
   'postMessageToReferrerPage',
   'postMessageToReferrerMiniProgram',
   'reportPerformance',
-  'getPerformance',
-  'preDownloadSubpackage',
   'router',
   'nextTick',
   'checkIsPictureInPictureActive',
   'worklet',
   'revokeBufferURL',
-  'reportEvent',
   'getExptInfoSync',
-  'reserveChannelsLive',
   'getNFCAdapter',
   'isVKSupport'
 ]
@@ -79,18 +61,22 @@ function promisify (listObj, whiteList, customBlackList) {
     if (typeof listObj[key] !== 'function') {
       return
     }
-
-    result[key] = function (...args) {
-      const obj = args[0] || {}
-      // 不需要转换 or 用户已定义回调，则不处理
-      if (!promisifyFilter(key)) {
-        return listObj[key].apply(ENV_OBJ, args)
-      } else { // 其他情况进行转换
+    if (!promisifyFilter(key)) {
+      result[key] = listObj[key].bind(ENV_OBJ)
+    } else {
+      result[key] = function (...args) {
+        const obj = args[0] || {}
+        if (obj.usePromise === false) {
+          return listObj[key].apply(ENV_OBJ, args)
+        }
         if (!args[0]) args.unshift(obj)
         let returned
         const promise = new Promise((resolve, reject) => {
           const originSuccess = obj.success
           const originFail = obj.fail
+          if (originSuccess || originFail) {
+            warn(`The [${key}] method has been promisified, please use .then or .catch to handle the result, if you need to handle the result with options.success/fail, please set options.usePromise to false to close the promisify in this call temporarily. `)
+          }
           obj.success = function (res) {
             originSuccess && originSuccess.call(this, res)
             resolve(res)

package/src/common/js/utils.js

@@ -1,5 +1,4 @@
 import { hasOwn, noop, getEnvObj, getFocusedNavigation, error as errorHandler, warn as warnHandler } from '@mpxjs/utils'
-import { getCurrentInstance } from '@mpxjs/core'
 
 /**
  *
@@ -90,8 +89,7 @@ function failHandle (result, fail, complete) {
 }
 
 function getCurrentPageId () {
-  const currentInstance = getCurrentInstance()
-  const id = currentInstance?.proxy?.getPageId() || getFocusedNavigation()?.pageId || null
+  const id = getFocusedNavigation()?.pageId || null
   return id
 }
 

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

@@ -28,7 +28,7 @@ const styles = StyleSheet.create({
     bottom: 0,
     right: 0,
     position: 'absolute',
-    zIndex: 1000
+    zIndex: 10000
   },
   maskWrap: {
     left: 0,

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

@@ -41,7 +41,6 @@ export default class Preview {
     })
     // click to close
     bindTap(this.preview, () => {
-      this.currentIndex = 0
       this.preview.style.display = 'none'
       this.preview.querySelector('.__mpx_preview_images__').remove()
       this.preview.remove()
@@ -54,10 +53,11 @@ export default class Preview {
    * @param {string[]} options.urls - 图片地址数组
    */
   show (options) {
-    const supported = ['urls', 'success', 'fail', 'complete']
+    const supported = ['urls', 'success', 'fail', 'complete', 'current']
     Object.keys(options).forEach(key => !supported.includes(key) && warn(`previewImage: 暂不支持选项 ${key} ！`))
-    const { urls, success, fail, complete } = options
+    const { urls, current, success, fail, complete } = options
     try {
+      this.currentIndex = urls.indexOf(current) > -1 ? urls.indexOf(current) : 0
       getRootElement().appendChild(this.preview)
       this.preview.style.display = 'block'
       // create images with urls
@@ -65,6 +65,7 @@ export default class Preview {
       this.preview.appendChild(createDom('div', { class: '__mpx_preview_images__' }, urls.map(url => createDom('div', {
         style: `background-image: url(${url})`
       }))))
+      this.preview.querySelector('.__mpx_preview_images__').style.transform = `translateX(-${this.currentIndex * 100}%)`
       this.maxIndex = urls.length
       this.updateTextTip()
       successHandle({ errMsg: 'previewImage:ok' }, success, complete)

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

@@ -47,7 +47,8 @@ const showModal = function (options = {}) {
       alignItems: 'center',
       display: 'flex',
       backgroundColor: 'rgba(0,0,0,0.6)',
-      position: 'absolute'
+      position: 'absolute',
+      zIndex: 10000
     },
     modalContent: {
       paddingTop: 20,

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

@@ -9,23 +9,18 @@ const getWindowInfo = function () {
   const navigationInsets = navigation.insets || {}
   const insets = Object.assign({}, initialWindowMetricsInset, navigationInsets)
   let safeArea = {}
-  const { top = 0, left = 0 } = insets
-  let { bottom = 0, right = 0 } = initialWindowMetricsInset
-  const screenHeight = __mpx_mode__ === 'ios' ? dimensionsScreen.height : dimensionsScreen.height - bottom // 解决安卓开启屏幕内三建导航安卓把安全区计算进去后产生的影响
-  const screenWidth = __mpx_mode__ === 'ios' ? dimensionsScreen.width : dimensionsScreen.width - right
+  const { top = 0, left = 0, bottom = 0, right = 0 } = insets
   const layout = navigation.layout || {}
+  const screenHeight = __mpx_mode__ === 'ios' ? dimensionsScreen.height : dimensionsScreen.height - layout.bottomVirtualHeight // 解决安卓开启屏幕内三建导航安卓把安全区计算进去后产生的影响
+  const screenWidth = __mpx_mode__ === 'ios' ? dimensionsScreen.width : dimensionsScreen.width - right
   const layoutHeight = layout.height || 0
   const layoutWidth = layout.width || 0
   const windowHeight = layoutHeight || screenHeight
-  if (__mpx_mode__ !== 'ios') {
-    bottom = 0
-    right = 0
-  }
   try {
     safeArea = {
       left,
       right: screenWidth - right,
-      top: top,
+      top,
       bottom: screenHeight - bottom,
       height: screenHeight - top - bottom,
       width: screenWidth - left - right