@mpxjs/api-proxy 2.9.66 → 2.9.69-beta.1

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

@@ -1,20 +1,6 @@
 import { successHandle, failHandle } from '../../../common/js'
-import { parseQuery } from '@mpxjs/utils'
-
-function parseUrl (url) {
-  let path = url
-  let query = ''
-  const queryIndex = url.indexOf('?')
-  if (queryIndex >= 0) {
-    path = url.slice(0, queryIndex)
-    query = url.slice(queryIndex)
-  }
-  const queryObj = parseQuery(query || '?')
-  return {
-    path,
-    queryObj
-  }
-}
+import { parseUrlQuery as parseUrl } from '@mpxjs/utils'
+import { nextTick } from '../next-tick'
 
 function getBasePath (navigation) {
   if (navigation) {
@@ -90,14 +76,23 @@ function navigateBack (options = {}) {
   const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
   const navigationHelper = global.__navigationHelper
   if (navigation && navigationHelper) {
-    navigation.pop(options.delta || 1)
-    navigationHelper.lastSuccessCallback = () => {
-      const res = { errMsg: 'navigateBack:ok' }
-      successHandle(res, options.success, options.complete)
-    }
-    navigationHelper.lastFailCallback = (msg) => {
-      const res = { errMsg: `navigateBack:fail ${msg}` }
-      failHandle(res, options.fail, options.complete)
+    const delta = options.delta || 1
+    const routeLength = navigation.getState().routes.length
+    if (delta >= routeLength && global.__mpx?.config.rnConfig.onAppBack?.(delta - routeLength + 1)) {
+      nextTick(() => {
+        const res = { errMsg: 'navigateBack:ok' }
+        successHandle(res, options.success, options.complete)
+      })
+    } else {
+      navigation.pop(delta)
+      navigationHelper.lastSuccessCallback = () => {
+        const res = { errMsg: 'navigateBack:ok' }
+        successHandle(res, options.success, options.complete)
+      }
+      navigationHelper.lastFailCallback = (msg) => {
+        const res = { errMsg: `navigateBack:fail ${msg}` }
+        failHandle(res, options.fail, options.complete)
+      }
     }
   }
 }

package/src/platform/api/set-navigation-bar/index.ali.js

@@ -17,7 +17,12 @@ function setNavigationBarColor (options = {}) {
   return ENV_OBJ.setNavigationBar(options)
 }
 
+function hideHomeButton (options = {}) {
+  return ENV_OBJ.hideBackHome(options)
+}
+
 export {
   setNavigationBarTitle,
-  setNavigationBarColor
+  setNavigationBarColor,
+  hideHomeButton
 }

package/src/platform/api/set-navigation-bar/index.ios.js

@@ -1,4 +1,4 @@
-import { successHandle, failHandle, getFocusedNavigation } from '../../../common/js'
+import { successHandle, failHandle, getFocusedNavigation, envError } from '../../../common/js'
 import { nextTick } from '../next-tick'
 function setNavigationBarTitle (options = {}) {
   const { title = '', success, fail, complete } = options
@@ -7,7 +7,7 @@ function setNavigationBarTitle (options = {}) {
     failHandle({ errMsg: 'setNavigationBarTitle:fail' }, fail, complete)
   } else {
     nextTick(() => {
-      navigation.setOptions({ headerTitle: title })
+      navigation.setOptions({ title })
       successHandle({ errMsg: 'setNavigationBarTitle:ok' }, success, complete)
     })
   }
@@ -31,7 +31,10 @@ function setNavigationBarColor (options = {}) {
   }
 }
 
+const hideHomeButton = envError('hideHomeButton')
+
 export {
   setNavigationBarTitle,
-  setNavigationBarColor
+  setNavigationBarColor,
+  hideHomeButton
 }

package/src/platform/api/set-navigation-bar/index.js

@@ -4,7 +4,10 @@ const setNavigationBarTitle = ENV_OBJ.setNavigationBarTitle || envError('setNavi
 
 const setNavigationBarColor = ENV_OBJ.setNavigationBarColor || envError('setNavigationBarColor')
 
+const hideHomeButton = ENV_OBJ.hideHomeButton || envError('hideHomeButton')
+
 export {
   setNavigationBarTitle,
-  setNavigationBarColor
+  setNavigationBarColor,
+  hideHomeButton
 }

package/src/platform/api/set-navigation-bar/index.web.js

@@ -1,4 +1,4 @@
-import { isBrowser, throwSSRWarning, successHandle } from '../../../common/js'
+import { isBrowser, envError, throwSSRWarning, successHandle } from '../../../common/js'
 
 function setNavigationBarTitle (options = {}) {
   if (!isBrowser) {
@@ -26,7 +26,10 @@ function setNavigationBarColor (options = {}) {
   successHandle({ errMsg: 'setNavigationBarColor:ok' }, success, complete)
 }
 
+const hideHomeButton = envError('hideHomeButton')
+
 export {
   setNavigationBarTitle,
-  setNavigationBarColor
+  setNavigationBarColor,
+  hideHomeButton
 }

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

@@ -0,0 +1,19 @@
+import { ENV_OBJ, envError } from '../../../common/js'
+
+const getSetting = ENV_OBJ.getSetting || envError('getSetting')
+
+const openSetting = ENV_OBJ.openSetting || envError('openSetting')
+
+const enableAlertBeforeUnload = ENV_OBJ.enableAlertBeforeUnload || envError('enableAlertBeforeUnload')
+
+const disableAlertBeforeUnload = ENV_OBJ.disableAlertBeforeUnload || envError('disableAlertBeforeUnload')
+
+const getMenuButtonBoundingClientRect = ENV_OBJ.getMenuButtonBoundingClientRect || envError('getMenuButtonBoundingClientRect')
+
+export {
+  getSetting,
+  openSetting,
+  enableAlertBeforeUnload,
+  disableAlertBeforeUnload,
+  getMenuButtonBoundingClientRect
+}

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

@@ -69,7 +69,7 @@ function getItem (key) {
   } catch (e) {
   }
 
-  if (item && typeof item === 'object' && hasOwn(item, 'data')) {
+  if (hasOwn(item, 'data')) {
     return { result: true, data: item.data }
   } else {
     return { result: false }

package/src/platform/api/storage/rnStorage.js

@@ -49,7 +49,7 @@ function getStorage (options = {}) {
       item = JSON.parse(res)
     } catch (e) {
     }
-    if (item && typeof item === 'object' && hasOwn(item, 'data')) {
+    if (hasOwn(item, 'data')) {
       data = item.data
     }
     const result = {

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

@@ -40,9 +40,15 @@ const getDeviceInfo = function () {
 
 const getWindowInfo = ENV_OBJ.getWindowInfo || envError('getWindowInfo')
 
+const getLaunchOptionsSync = ENV_OBJ.getLaunchOptionsSync || envError('getLaunchOptionsSync')
+
+const getEnterOptionsSync = ENV_OBJ.getEnterOptionsSync || envError('getEnterOptionsSync')
+
 export {
   getSystemInfo,
   getSystemInfoSync,
   getDeviceInfo,
-  getWindowInfo
+  getWindowInfo,
+  getLaunchOptionsSync,
+  getEnterOptionsSync
 }

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

@@ -1 +1,84 @@
-export * from './rnSystem'
+import DeviceInfo from 'react-native-device-info'
+import { PixelRatio } from 'react-native'
+import { successHandle, failHandle, defineUnsupportedProps } from '../../../common/js'
+import { getWindowInfo, getLaunchOptionsSync, getEnterOptionsSync } from './rnSystem'
+
+const getSystemInfoSync = function () {
+  const windowInfo = getWindowInfo()
+  const { screenWidth, screenHeight } = windowInfo
+
+  const result = {
+    brand: DeviceInfo.getBrand(),
+    model: DeviceInfo.getModel(),
+    system: `${DeviceInfo.getSystemName()} ${DeviceInfo.getSystemVersion()}`,
+    platform: DeviceInfo.isEmulatorSync() ? 'emulator' : DeviceInfo.getSystemName(),
+    deviceOrientation: screenWidth > screenHeight ? 'portrait' : 'landscape',
+    fontSizeSetting: PixelRatio.getFontScale()
+  }
+  Object.assign(result, windowInfo)
+  defineUnsupportedProps(result, [
+    'language',
+    'version',
+    'SDKVersion',
+    'benchmarkLevel',
+    'albumAuthorized',
+    'cameraAuthorized',
+    'locationAuthorized',
+    'microphoneAuthorized',
+    'notificationAuthorized',
+    'phoneCalendarAuthorized',
+    'host',
+    'enableDebug',
+    'notificationAlertAuthorized',
+    'notificationBadgeAuthorized',
+    'notificationSoundAuthorized',
+    'bluetoothEnabled',
+    'locationEnabled',
+    'wifiEnabled',
+    'locationReducedAccuracy',
+    'theme'
+  ])
+  return result
+}
+
+const getSystemInfo = function (options = {}) {
+  const { success, fail, complete } = options
+  try {
+    const systemInfo = getSystemInfoSync()
+    Object.assign(systemInfo, {
+      errMsg: 'setStorage:ok'
+    })
+    successHandle(systemInfo, success, complete)
+  } catch (err) {
+    const result = {
+      errMsg: `getSystemInfo:fail ${err}`
+    }
+    failHandle(result, fail, complete)
+  }
+}
+
+const getDeviceInfo = function () {
+  const deviceInfo = {}
+  if (__mpx_mode__ === 'android') {
+    const deviceAbi = DeviceInfo.supported64BitAbisSync() || []
+    deviceInfo.deviceAbi = deviceAbi[0] || null
+  }
+  defineUnsupportedProps(deviceInfo, ['benchmarkLevel', 'abi', 'cpuType'])
+  Object.assign(deviceInfo, {
+    brand: DeviceInfo.getBrand(),
+    model: DeviceInfo.getModel(),
+    system: `${DeviceInfo.getSystemName()} ${DeviceInfo.getSystemVersion()}`,
+    platform: DeviceInfo.isEmulatorSync() ? 'emulator' : DeviceInfo.getSystemName(),
+    memorySize: DeviceInfo.getTotalMemorySync() / (1024 * 1024)
+  })
+  return deviceInfo
+}
+
+export {
+  getSystemInfo,
+  getSystemInfoSync,
+  getDeviceInfo,
+  getWindowInfo,
+  getLaunchOptionsSync,
+  getEnterOptionsSync
+}

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

@@ -8,9 +8,15 @@ const getDeviceInfo = ENV_OBJ.getDeviceInfo || envError('getDeviceInfo')
 
 const getWindowInfo = ENV_OBJ.getWindowInfo || envError('getWindowInfo')
 
+const getLaunchOptionsSync = ENV_OBJ.getLaunchOptionsSync || envError('getLaunchOptionsSync')
+
+const getEnterOptionsSync = ENV_OBJ.getEnterOptionsSync || envError('getEnterOptionsSync')
+
 export {
   getSystemInfo,
   getSystemInfoSync,
   getDeviceInfo,
-  getWindowInfo
+  getWindowInfo,
+  getLaunchOptionsSync,
+  getEnterOptionsSync
 }

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

@@ -1,10 +1,6 @@
-import { envError, isBrowser, throwSSRWarning, successHandle } from '../../../common/js'
+import { isBrowser, throwSSRWarning, successHandle } from '../../../common/js'
 
-function getSystemInfoSync () {
-  if (!isBrowser) {
-    throwSSRWarning('getSystemInfoSync API is running in non browser environments')
-    return
-  }
+const getDeviceInfo = function () {
   const ua = navigator.userAgent.split('(')[1]?.split(')')[0] || ''
   const phones = new Map([
     ['iPhone', /iPhone|iPad|iPod|iOS/i],
@@ -37,20 +33,57 @@ function getSystemInfoSync () {
   } else {
     system = `Android ${ua.replace(/^.*Android ([\d.]+);.*$/, '$1')}`
   }
-
   return {
-    brand: brand,
+    abi: null,
+    deviceAbi: null,
+    benchmarkLevel: null,
+    brand,
     model: brand,
+    system,
+    platform: navigator.platform,
+    cpuType: null,
+    memorySize: null
+  }
+}
+
+const getWindowInfo = function () {
+  return {
     pixelRatio: window.devicePixelRatio,
     screenWidth: window.screen.width,
     screenHeight: window.screen.height,
     windowWidth: document.documentElement.clientWidth,
     windowHeight: document.documentElement.clientHeight,
     statusBarHeight: null,
+    safeArea: null,
+    screenTop: null
+  }
+}
+
+function getSystemInfoSync () {
+  if (!isBrowser) {
+    throwSSRWarning('getSystemInfoSync API is running in non browser environments')
+    return
+  }
+
+  const {
+    pixelRatio,
+    screenWidth,
+    screenHeight,
+    windowWidth,
+    windowHeight,
+    statusBarHeight,
+    safeArea
+  } = getWindowInfo()
+  const {
+    benchmarkLevel,
+    brand,
+    model,
+    system,
+    platform
+  } = getDeviceInfo()
+  const result = Object.assign({
     language: navigator.language,
     version: null,
-    system,
-    platform: navigator.platform,
     fontSizeSetting: null,
     SDKVersion: null,
     benchmarkLevel: null,
@@ -64,9 +97,23 @@ function getSystemInfoSync () {
     notificationSoundAuthorized: null,
     bluetoothEnabled: null,
     locationEnabled: null,
-    wifiEnabled: null,
-    safeArea: null
-  }
+    wifiEnabled: null
+  }, {
+    pixelRatio,
+    screenWidth,
+    screenHeight,
+    windowWidth,
+    windowHeight,
+    statusBarHeight,
+    safeArea
+  }, {
+    benchmarkLevel,
+    brand,
+    model,
+    system,
+    platform
+  })
+  return result
 }
 
 function getSystemInfo (options = {}) {
@@ -79,13 +126,27 @@ function getSystemInfo (options = {}) {
   successHandle(res, options.success, options.complete)
 }
 
-const getDeviceInfo = envError('getDeviceInfo')
+const getEnterOptionsSync = function () {
+  if (!isBrowser) {
+    throwSSRWarning('getEnterOptionsSync API is running in non browser environments')
+    return
+  }
+  return global.__mpxEnterOptions || {}
+}
 
-const getWindowInfo = envError('getWindowInfo')
+const getLaunchOptionsSync = function () {
+  if (!isBrowser) {
+    throwSSRWarning('getLaunchOptionsSync API is running in non browser environments')
+    return
+  }
+  return global.__mpxEnterOptions || {}
+}
 
 export {
   getSystemInfo,
   getSystemInfoSync,
   getDeviceInfo,
-  getWindowInfo
+  getWindowInfo,
+  getLaunchOptionsSync,
+  getEnterOptionsSync
 }

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

@@ -1,23 +1,18 @@
-import DeviceInfo from 'react-native-device-info'
-import { Platform, PixelRatio, Dimensions, StatusBar } from 'react-native'
+import { PixelRatio, Dimensions } from 'react-native'
 import { initialWindowMetrics } from 'react-native-safe-area-context'
-import { successHandle, failHandle, defineUnsupportedProps, getFocusedNavigation } from '../../../common/js'
+import { getFocusedNavigation } from '../../../common/js'
 
 const getWindowInfo = function () {
   const dimensionsScreen = Dimensions.get('screen')
-  const navigation = getFocusedNavigation()
-  const insets = {
-    ...initialWindowMetrics?.insets,
-    ...navigation?.insets
-  }
+  const navigation = getFocusedNavigation() || {}
+  const initialWindowMetricsInset = initialWindowMetrics?.insets || {}
+  const navigationInsets = navigation.insets || {}
+  const insets = Object.assign(initialWindowMetricsInset, navigationInsets)
   let safeArea = {}
-  let { top = 0, bottom = 0, left = 0, right = 0 } = insets
-  if (Platform.OS === 'android') {
-    top = StatusBar.currentHeight || 0
-  }
-  const screenHeight = dimensionsScreen.height
-  const screenWidth = dimensionsScreen.width
-  const layout = navigation?.layout || {}
+  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 || {}
   const layoutHeight = layout.height || 0
   const layoutWidth = layout.width || 0
   const windowHeight = layoutHeight || screenHeight
@@ -39,86 +34,29 @@ const getWindowInfo = function () {
     screenWidth: screenWidth,
     screenHeight: screenHeight,
     screenTop: screenHeight - windowHeight,
-    safeArea
-  }
-  return result
-}
-
-const getSystemInfoSync = function () {
-  const windowInfo = getWindowInfo()
-  const { screenWidth, screenHeight, safeArea } = windowInfo
-
-  const result = {
-    brand: DeviceInfo.getBrand(),
-    model: DeviceInfo.getModel(),
-    system: `${DeviceInfo.getSystemName()} ${DeviceInfo.getSystemVersion()}`,
-    platform: DeviceInfo.isEmulatorSync() ? 'emulator' : DeviceInfo.getSystemName(),
-    deviceOrientation: screenWidth > screenHeight ? 'portrait' : 'landscape',
     statusBarHeight: safeArea.top,
-    fontSizeSetting: PixelRatio.getFontScale(),
-    ...windowInfo
+    safeArea
   }
-  defineUnsupportedProps(result, [
-    'language',
-    'version',
-    'SDKVersion',
-    'benchmarkLevel',
-    'albumAuthorized',
-    'cameraAuthorized',
-    'locationAuthorized',
-    'microphoneAuthorized',
-    'notificationAuthorized',
-    'phoneCalendarAuthorized',
-    'host',
-    'enableDebug',
-    'notificationAlertAuthorized',
-    'notificationBadgeAuthorized',
-    'notificationSoundAuthorized',
-    'bluetoothEnabled',
-    'locationEnabled',
-    'wifiEnabled',
-    'locationReducedAccuracy',
-    'theme'
-  ])
   return result
 }
 
-const getSystemInfo = function (options = {}) {
-  const { success, fail, complete } = options
-  try {
-    const systemInfo = getSystemInfoSync()
-    Object.assign(systemInfo, {
-      errMsg: 'setStorage:ok'
-    })
-    successHandle(systemInfo, success, complete)
-  } catch (err) {
-    const result = {
-      errMsg: `getSystemInfo:fail ${err}`
-    }
-    failHandle(result, fail, complete)
+const getLaunchOptionsSync = function () {
+  const options = global.__mpxEnterOptions || {}
+  const { path, scene, query } = options
+  return {
+    path,
+    scene,
+    query
   }
 }
 
-const getDeviceInfo = function () {
-  const deviceInfo = {}
-  if (Platform.OS === 'android') {
-    const deviceAbi = DeviceInfo.supported64BitAbisSync() || []
-    deviceInfo.deviceAbi = deviceAbi[0] || null
-  }
-  defineUnsupportedProps(deviceInfo, ['benchmarkLevel', 'abi', 'cpuType'])
-  Object.assign(deviceInfo, {
-    brand: DeviceInfo.getBrand(),
-    model: DeviceInfo.getModel(),
-    system: `${DeviceInfo.getSystemName()} ${DeviceInfo.getSystemVersion()}`,
-    platform: DeviceInfo.isEmulatorSync() ? 'emulator' : DeviceInfo.getSystemName(),
-    memorySize: DeviceInfo.getTotalMemorySync() / (1024 * 1024)
-  })
-  return deviceInfo
+const getEnterOptionsSync = function () {
+  const result = getLaunchOptionsSync()
+  return result
 }
 
 export {
-  getSystemInfo,
-  getSystemInfoSync,
-  getDeviceInfo,
-  getWindowInfo
+  getWindowInfo,
+  getLaunchOptionsSync,
+  getEnterOptionsSync
 }

package/src/platform/api/toast/rnToast.jsx

@@ -1,13 +1,15 @@
-import { View, Text, Image, StyleSheet, ActivityIndicator } from 'react-native'
+import { View, Text, Image, StyleSheet, ActivityIndicator, Dimensions } from 'react-native'
 import { successHandle, failHandle } from '../../../common/js'
 import { Portal } from '@ant-design/react-native'
 
 let toastKey
 let isLoadingShow
+const dimensionsScreen = Dimensions.get('screen')
+const screenHeight = dimensionsScreen.height
+const contentTop = parseInt(screenHeight * 0.35)
 let tId // show duration 计时id
 const styles = StyleSheet.create({
   toastContent: {
-    minWdth: 150,
     maxWidth: '60%',
     backgroundColor: 'rgba(20, 20, 20, 0.7)',
     paddingTop: 15,
@@ -18,7 +20,8 @@ const styles = StyleSheet.create({
     display: 'flex',
     flexDirection: 'column',
     justifyContent: 'center',
-    alignItems: 'center'
+    alignItems: 'center',
+    marginTop: contentTop // 小程序里面展示偏上一点
   },
   toastWrap: {
     left: 0,
@@ -28,25 +31,29 @@ const styles = StyleSheet.create({
     zIndex: 10000,
     position: "absolute",
     display: 'flex',
-    justifyContent: 'center',
     alignItems: 'center'
   },
+  toastHasIcon: {
+    height: 110,
+    width: 120
+  },
   toastImg: {
     width: 40,
     height: 40,
     marginLeft: 'auto',
-    marginRight: 'auto',
-    marginBottom: 10
+    marginRight: 'auto'
   },
   toastText: {
     textAlign: 'center',
     color: '#ffffff',
-    fontSize: 14,
+    fontSize: 12,
     lineHeight: 18,
     height: 18,
-    overflow: 'hidden'
+    overflow: 'hidden',
+    marginTop: 10
   }
 })
+
 function showToast (options = {}) {
   const { title, icon = 'success', image, duration = 1500, mask = false, success, fail, complete, isLoading } = options
   let ToastView
@@ -64,29 +71,29 @@ function showToast (options = {}) {
   tId = null
   if (image || icon === 'success' || icon === 'error') {
     ToastView = <View style={styles.toastWrap} pointerEvents={pointerEvents}>
-      <View style={styles.toastContent}>
+      <View style={[styles.toastContent, styles.toastHasIcon]}>
         <Image style={ styles.toastImg } source={{uri: image || iconImg[icon]}}></Image>
-        <Text style={styles.toastText}>{title}</Text>
+        { title ? <Text style={styles.toastText}>{title}</Text> : null }
       </View>
     </View>
   } else if (icon === 'loading') {
     ToastView = <View style={styles.toastWrap} pointerEvents={pointerEvents}>
-      <View style={styles.toastContent}>
+      <View style={[styles.toastContent, styles.toastHasIcon]}>
         <ActivityIndicator
           animating
-          style={{ marginBottom: 10 }}
           size='small'
           color='#eee'
         />
-        <Text style={styles.toastText}>{title}</Text>
+        { title ? <Text style={styles.toastText}>{title}</Text> : null }
       </View>
     </View>
   }  else  {
     ToastView = <View style={styles.toastWrap} pointerEvents={pointerEvents}>
       <View style={styles.toastContent}>
-        <Text numberOfLines={2} style={{ ...styles.toastText, ...(icon === 'none' ? {
-            height: 36
-          } : {}) }}>{title}</Text>
+        { title ? <Text numberOfLines={2} style={{ ...styles.toastText, ...(icon === 'none' ? {
+            height: 'auto',
+            marginTop: 0
+          } : {}) }}>{title}</Text> : null }
       </View>
     </View>
   }