@mpxjs/api-proxy 2.9.52 → 2.9.58

package/@types/index.d.ts

@@ -2,16 +2,16 @@
 
 type AddPromise<W> = {
   [K in keyof W]: W[K] extends (...args: any) => any
-    ? Parameters<W[K]> extends [{ success?: (res: infer R) => any }?, ...any[]]
-      ? (...args: Parameters<W[K]>) => ReturnType<W[K]> & Promise<R>
+      ? Parameters<W[K]> extends [{ success?: (res: infer R) => any }?, ...any[]]
+          ? (...args: Parameters<W[K]>) => ReturnType<W[K]> & Promise<R>
+          : W[K]
       : W[K]
-    : W[K]
 }
 
 type AddParam<O, V extends (...args: any) => any> =
-  Parameters<V> extends [{ success?: (res: infer R) => any }, ...any[]]
-    ? (options: O) => ReturnType<V> & Promise<R>
-    : (options: O) => ReturnType<V>
+    Parameters<V> extends [{ success?: (res: infer R) => any }, ...any[]]
+        ? (options: O) => ReturnType<V> & Promise<R>
+        : (options: O) => ReturnType<V>
 // @ts-ignore
 type PickApiValue<T extends keyof WechatMiniprogram.Wx> = Pick<WechatMiniprogram.Wx, T>[T]
 // @ts-ignore
@@ -33,7 +33,7 @@ declare module '@mpxjs/core' {
 
 export const getProxy: (...args: any) => void
 
-export const promisify: (listObj: object, whiteList: string[], customBlackList: string[]) => object
+export const promisify: (listObj: object, whiteList?: string[], customBlackList?: string[]) => Record<string, any>
 
 export const showActionSheet: WechatMiniprogram.Wx['showActionSheet']
 export const addPhoneContact: WechatMiniprogram.Wx['addPhoneContact']

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.9.52",
+  "version": "2.9.58",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -37,15 +37,19 @@
   },
   "homepage": "https://github.com/didi/mpx#readme",
   "dependencies": {
-    "@mpxjs/utils": "^2.9.50",
-    "axios": "^1.6.7"
+    "@mpxjs/utils": "^2.9.58",
+    "axios": "^1.7.3"
   },
   "peerDependencies": {
+    "@ant-design/react-native": "^5.1.3",
     "@react-native-async-storage/async-storage": "^1.23.1",
     "@react-native-clipboard/clipboard": "^1.14.0",
     "@react-native-community/netinfo": "^11.2.1",
+    "expo-brightness": "~11.8.0",
     "react-native-device-info": "^10.13.2",
-    "react-native-safe-area-context": "^4.10.1"
+    "react-native-get-location": "^4.0.1",
+    "react-native-safe-area-context": "^4.10.1",
+    "react-native-webview": "^13.10.5"
   },
   "peerDependenciesMeta": {
     "@react-native-async-storage/async-storage": {
@@ -62,7 +66,19 @@
     },
     "react-native-safe-area-context": {
       "optional": true
+    },
+    "react-native-get-location": {
+      "optional": true
+    },
+    "@ant-design/react-native": {
+      "optional": true
+    },
+    "expo-brightness": {
+      "optional": true
+    },
+    "react-native-webview": {
+      "optional": true
     }
   },
-  "gitHead": "d8b89e0ba1f29a16244b247f6c7a8d8197e0d732"
+  "gitHead": "49fe4c4bc46ff4bf87cd8adde37981d4b4134aa7"
 }

package/src/common/js/promisify.js

@@ -1,6 +1,4 @@
-import { getEnvObj } from './utils'
-
-const envObj = getEnvObj()
+import { ENV_OBJ } from './utils'
 
 // 特别指定的不进行Promise封装的方法
 const blackList = [
@@ -31,7 +29,9 @@ const blackList = [
   'createOffscreenCanvas',
   'reportEvent',
   'connectSocket',
-  'base64ToArrayBuffer'
+  'base64ToArrayBuffer',
+  'getDeviceInfo',
+  'getWindowInfo'
 ]
 
 function getMapFromList (list) {
@@ -71,14 +71,14 @@ function promisify (listObj, whiteList, customBlackList) {
       const obj = args[0] || {}
       // 不需要转换 or 用户已定义回调，则不处理
       if (!promisifyFilter(key) || obj.success || obj.fail) {
-        return listObj[key].apply(envObj, args)
+        return listObj[key].apply(ENV_OBJ, args)
       } else { // 其他情况进行转换
         if (!args[0]) args.unshift(obj)
         let returned
         const promise = new Promise((resolve, reject) => {
           obj.success = resolve
           obj.fail = reject
-          returned = listObj[key].apply(envObj, args)
+          returned = listObj[key].apply(ENV_OBJ, args)
         })
         promise.__returned = returned
         return promise

package/src/common/js/utils.js

@@ -1,3 +1,5 @@
+import { hasOwn, noop, getEnvObj } from '@mpxjs/utils'
+
 /**
  *
  * @param {Object} options 原参数
@@ -12,16 +14,6 @@
  *  d: 4 // 增加 d
  * })
  */
-const hasOwnProperty = Object.prototype.hasOwnProperty
-
-function type (n) {
-  return Object.prototype.toString.call(n).slice(8, -1)
-}
-
-function hasOwn (obj, key) {
-  return hasOwnProperty.call(obj, key)
-}
-
 function changeOpts (options, updateOrRemoveOpt = {}, extraOpt = {}) {
   let opts = {}
 
@@ -53,31 +45,6 @@ const handleSuccess = (opts, getOptions = noop, thisObj) => {
   }
 }
 
-function getEnvObj () {
-  switch (__mpx_mode__) {
-    case 'wx':
-      return wx
-    case 'ali':
-      return my
-    case 'swan':
-      return swan
-    case 'qq':
-      return qq
-    case 'tt':
-      return tt
-    case 'jd':
-      return jd
-    case 'qa':
-      return qa
-    case 'dd':
-      return dd
-    case 'web':
-    case 'ios':
-    case 'android':
-      return {}
-  }
-}
-
 function warn (msg) {
   console.warn && console.warn(`[@mpxjs/api-proxy warn]:\n ${msg}`)
 }
@@ -87,20 +54,10 @@ function error (msg) {
 }
 function envError (method) {
   return () => {
-    console.error && console.error(`[@mpxjs/api-proxy error]:\n ${__mpx_mode__}环境不支持${method}方法`)
+    throw Error(`[@mpxjs/api-proxy error]:\n ${__mpx_mode__}环境不支持${method}方法`)
   }
 }
 
-function noop () {
-}
-
-function makeMap (arr) {
-  return arr.reduce((obj, item) => {
-    obj[item] = true
-    return obj
-  }, {})
-}
-
 function defineUnsupportedProps (resObj, props) {
   const defineProps = {}
   props.forEach((item) => {
@@ -120,21 +77,28 @@ function throwSSRWarning (info) {
   console.error(`[Mpx runtime error]: Dangerous API! ${info}, It may cause some problems, please use this method with caution`)
 }
 
+function successHandle (result, success, complete) {
+  typeof success === 'function' && success(result)
+  typeof complete === 'function' && complete(result)
+}
+
+function failHandle (result, fail, complete) {
+  typeof fail === 'function' && fail(result)
+  typeof complete === 'function' && complete(result)
+}
+
 const ENV_OBJ = getEnvObj()
 
 export {
   changeOpts,
   handleSuccess,
-  getEnvObj,
   error,
   envError,
   warn,
-  noop,
-  makeMap,
   isBrowser,
-  hasOwn,
   throwSSRWarning,
   ENV_OBJ,
-  type,
-  defineUnsupportedProps
+  defineUnsupportedProps,
+  successHandle,
+  failHandle
 }

package/src/common/js/web.js

@@ -1,13 +1,3 @@
-function webHandleSuccess (result, success, complete) {
-  typeof success === 'function' && success(result)
-  typeof complete === 'function' && complete(result)
-}
-
-function webHandleFail (result, fail, complete) {
-  typeof fail === 'function' && fail(result)
-  typeof complete === 'function' && complete(result)
-}
-
 function isTabBarPage (url, router) {
   const tabBarPagesMap = global.__tabBarPagesMap
   if (!tabBarPagesMap || !url) return false
@@ -49,8 +39,6 @@ function getRootElement () {
 }
 
 export {
-  webHandleSuccess,
-  webHandleFail,
   createDom,
   bindTap,
   getRootElement,

package/src/install.js

@@ -1,5 +1,5 @@
 import * as platformApi from './platform'
-import { getEnvObj } from './common/js'
+import { ENV_OBJ } from './common/js'
 import promisify from './common/js/promisify'
 
 export default function install (target, options = {}) {
@@ -9,8 +9,7 @@ export default function install (target, options = {}) {
     blackList = [], // 强制不变成 promise 格式的 api
     custom = {} // 自定义转化规则
   } = options
-  const envObj = getEnvObj()
-  const transedApi = Object.assign({}, envObj, platformApi)
+  const transedApi = Object.assign({}, ENV_OBJ, platformApi)
   const promisedApi = usePromise ? promisify(transedApi, whiteList, blackList) : {}
   Object.assign(target, transedApi, promisedApi, custom[__mpx_mode__])
 }

package/src/platform/api/action-sheet/ActionSheet.js

@@ -1,4 +1,4 @@
-import { webHandleSuccess, webHandleFail, createDom, bindTap, getRootElement } from '../../../common/js'
+import { successHandle, failHandle, createDom, bindTap, getRootElement } from '../../../common/js'
 import '../../../common/stylus/ActionSheet.styl'
 
 export default class ActionSheet {
@@ -44,8 +44,7 @@ export default class ActionSheet {
           errMsg: 'showActionSheet:ok',
           tapIndex: index
         }
-        webHandleSuccess(res, opts.success, opts.complete)
-        // this.toPromiseResolve(res)
+        successHandle(res, opts.success, opts.complete)
       }))
       list.appendChild(sheet)
     })
@@ -57,8 +56,7 @@ export default class ActionSheet {
     this.tempListeners.push(bindTap(this.cancelBtn, () => {
       this.hide()
       const err = { errMsg: 'showActionSheet:fail cancel' }
-      webHandleFail(err, opts.fail, opts.complete)
-      // !opts.fail && this.toPromiseReject(err)
+      failHandle(err, opts.fail, opts.complete)
     }))
     // make transition next frame
     this.actionSheet.classList.add('show')
@@ -66,8 +64,6 @@ export default class ActionSheet {
     setTimeout(() => {
       this.box.classList.add('show')
     }, 17)
-
-    // return this.toPromiseInitPromise()
   }
 
   hide () {

package/src/platform/api/action-sheet/index.ali.js

@@ -1,4 +1,5 @@
-import { ENV_OBJ, changeOpts, noop } from '../../../common/js'
+import { ENV_OBJ, changeOpts } from '../../../common/js'
+import { noop } from '@mpxjs/utils'
 
 function showActionSheet (options = {}) {
   const opts = changeOpts(options, {

package/src/platform/api/action-sheet/index.android.js

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

package/src/platform/api/action-sheet/index.ios.js

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

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

@@ -0,0 +1,127 @@
+import { View, TouchableHighlight, Text, StyleSheet, Button, Animated } from 'react-native'
+import { successHandle, failHandle } from '../../../common/js'
+import { Portal } from '@ant-design/react-native'
+function showActionSheet (options) {
+  const { alertText, itemList = [], itemColor = '#000000', success, fail, complete } = options
+  let actionSheetKey
+  const slideAnim = new Animated.Value(500)
+  const slideIn = () => {
+    // Will change fadeAnim value to 1 in 5 seconds
+    Animated.timing(slideAnim, {
+      toValue: 0,
+      duration: 200,
+      useNativeDriver: true,
+    }).start()
+  }
+  const slideOut = () => {
+    // Will change fadeAnim value to 1 in 5 seconds
+    Animated.timing(slideAnim, {
+      toValue: 500,
+      duration: 200,
+      useNativeDriver: true,
+    }).start(() => {
+    })
+  }
+  if (itemList.length === 0 || itemList.length > 6) {
+    const result = {
+      errMsg: 'showActionSheet:fail parameter error: itemList should not be large than 6'
+    }
+    if (itemList.length === 0) {
+      result.errno = 1001
+      result.errMsg = 'showActionSheet:fail parameter error: parameter.itemList should have at least 1 item;'
+    }
+    failHandle(result, fail, complete)
+    return
+  }
+  const styles = StyleSheet.create({
+    actionActionMask: {
+      left: 0,
+      top: 0,
+      bottom: 0,
+      right: 0,
+      backgroundColor: 'rgba(0,0,0,0.6)',
+      position: 'absolute',
+      zIndex: 1000
+    },
+    actionSheetContent: {
+      left: 0,
+      right: 0,
+      position: 'absolute',
+      bottom: 0,
+      backgroundColor: '#ffffff',
+      borderTopLeftRadius: 10,
+      borderTopRightRadius: 10,
+      transform: [{
+        translateY: -500
+      }]
+    },
+    itemStyle: {
+      paddingTop: 15,
+      paddingBottom: 15,
+      justifyContent: 'center',
+      alignItems: 'center',
+      borderBottomWidth: 1,
+      borderBottomStyle: 'solid',
+      borderBottomColor: 'rgba(0,0,0,0.1)'
+    },
+    itemTextStyle: {
+      fontSize: 18
+    },
+    buttonStyle: {
+      fontSize: 18,
+      paddingTop: 10,
+      paddingBottom: 10
+    }
+  })
+  const remove = function () {
+    if (actionSheetKey) {
+      slideOut()
+      setTimeout(() => {
+        Portal.remove(actionSheetKey)
+        actionSheetKey = null
+      }, 200)
+    }
+  }
+  const selectAction = function (index) {
+    const result = {
+      errMsg: 'showActionSheet:ok',
+      tapIndex: index
+    }
+    successHandle(result, success, complete)
+    remove()
+  }
+  const cancelAction = function () {
+    const result = {
+      errMsg: 'showActionSheet:fail cancel'
+    }
+    failHandle(result, fail, complete)
+    remove()
+  }
+  let alertTextList = []
+  if (alertText) {
+    alertTextList = [alertText]
+  }
+  const ActionSheetView = <TouchableHighlight underlayColor="rgba(0,0,0,0.6)" onPress={cancelAction} style={styles.actionActionMask}>
+    <Animated.View
+      style={[
+        styles.actionSheetContent,
+        {
+          transform: [{translateY: slideAnim}]
+        }
+      ]}>
+      { alertTextList.map((item, index) => <View key={index} style={ styles.itemStyle }><Text style={[styles.itemTextStyle, { color: '#666666' }]}>{item}</Text></View>) }
+      { itemList.map((item, index) => <TouchableHighlight key={index} underlayColor="#ececec" onPress={() => selectAction(index)} style={ [styles.itemStyle, itemList.length -1 === index ? {
+        borderBottomWidth: 6,
+        borderBottomStyle: 'solid',
+        borderBottomColor: '#f7f7f7'
+      } : {}] }><Text style={[styles.itemTextStyle, { color: itemColor }]}>{item}</Text></TouchableHighlight>) }
+      <View style={styles.buttonStyle}><Button color={'#000000'} title={'取消'} onPress={cancelAction}></Button></View>
+    </Animated.View>
+  </TouchableHighlight>
+  actionSheetKey = Portal.add(ActionSheetView)
+  slideIn()
+}
+
+export {
+  showActionSheet
+}

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

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

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

@@ -1,4 +1,5 @@
-import { isBrowser } from '../../../common/js'
+import { isBrowser, isReact } from '@mpxjs/utils'
+
 global.__mpxAppCbs = global.__mpxAppCbs || {
   show: [],
   hide: [],
@@ -7,7 +8,7 @@ global.__mpxAppCbs = global.__mpxAppCbs || {
 }
 
 function onError (callback) {
-  if (isBrowser) {
+  if (isBrowser || isReact) {
     global.__mpxAppCbs.error.push(callback)
   }
 }
@@ -19,7 +20,7 @@ function offError (callback) {
 }
 
 function onAppShow (callback) {
-  if (isBrowser) {
+  if (isBrowser || isReact) {
     global.__mpxAppCbs.show.push(callback)
   }
 }
@@ -31,7 +32,7 @@ function offAppShow (callback) {
 }
 
 function onAppHide (callback) {
-  if (isBrowser) {
+  if (isBrowser || isReact) {
     global.__mpxAppCbs.hide.push(callback)
   }
 }

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

@@ -1,5 +1,5 @@
 import Clipboard from '@react-native-clipboard/clipboard'
-import { webHandleSuccess, webHandleFail } from '../../../common/js/web'
+import { successHandle, failHandle } from '../../../common/js'
 import { type } from '@mpxjs/utils'
 const setClipboardData = function (options) {
   const { data, success, fail, complete } = options
@@ -9,14 +9,14 @@ const setClipboardData = function (options) {
       errno: 1001,
       errMsg: errStr
     }
-    webHandleFail(result, fail, complete)
+    failHandle(result, fail, complete)
     return
   }
   Clipboard.setString(data)
   const result = {
     errMsg: 'setClipboardData:ok'
   }
-  webHandleSuccess(result, success, complete)
+  successHandle(result, success, complete)
 }
 
 const getClipboardData = function (options) {
@@ -26,12 +26,12 @@ const getClipboardData = function (options) {
       data,
       errMsg: 'getClipboardData:ok'
     }
-    webHandleSuccess(result, success, complete)
+    successHandle(result, success, complete)
   }).catch(() => {
     const result = {
       errMsg: 'setClipboardData:fail'
     }
-    webHandleFail(result, fail, complete)
+    failHandle(result, fail, complete)
   })
 }
 

package/src/platform/api/create-selector-query/index.ali.js

@@ -1,4 +1,5 @@
-import { ENV_OBJ, noop } from '../../../common/js'
+import { ENV_OBJ } from '../../../common/js'
+import { noop } from '@mpxjs/utils'
 
 function createSelectorQuery (options = {}) {
   const selectorQuery = ENV_OBJ.createSelectorQuery(options)

package/src/platform/api/create-selector-query/index.android.js

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

package/src/platform/api/create-selector-query/index.ios.js

@@ -0,0 +1,9 @@
+import SelectorQuery from './rnSelectQuery'
+
+function createSelectorQuery () {
+  return new SelectorQuery()
+}
+
+export {
+  createSelectorQuery
+}