@mpxjs/core 2.10.19 → 2.10.21

package/@types/index.d.ts

@@ -279,6 +279,14 @@ export interface WebviewConfig {
  * 输出为 ReactNative 时使用的特殊配置，用于与容器进行功能桥接
  */
 export interface RnConfig {
+  /**
+   * RN 节点未显式声明 box-sizing 时使用的默认盒模型。
+   *
+   * 默认值为 content-box，用于对齐小程序 / Web 的默认行为。
+   * 如需保留 RN 原始默认盒模型，可配置为 border-box。
+   */
+  defaultBoxSizing?: 'border-box' | 'content-box'
+
   /**
    * 当导航状态发生变化时触发，例如页面跳转、返回等。
    *
@@ -312,6 +320,13 @@ export interface RnConfig {
    */
   disableAppStateListener?: boolean
 
+  /**
+   * RN 文本类组件是否允许跟随系统字体缩放。
+   *
+   * @default false
+   */
+  allowFontScaling?: boolean
+
   /**
    * 控制首页回退按钮是否展示，并监听点击事件。
    *
@@ -373,7 +388,7 @@ export interface RnConfig {
    * @param params.package 分包名
    * @returns Promise，表示加载完成
    */
-  loadChunkAsync?: (params: { url: string; package: string }) => Promise<any>
+  loadChunkAsync?: (params: { url: string; package: string }) => Promise<null>
 
   /**
    * 下载多个异步分包的方法（不执行）。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.10.19",
+  "version": "2.10.21",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -19,14 +19,15 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.10.18",
+    "@mpxjs/perf": "^2.10.21",
+    "@mpxjs/utils": "^2.10.21",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.10.0"
   },
   "peerDependencies": {
     "@d11/react-native-fast-image": "*",
-    "@mpxjs/api-proxy": "^2.9.0",
-    "@mpxjs/store": "^2.9.0",
+    "@mpxjs/api-proxy": "*",
+    "@mpxjs/store": "*",
     "@react-navigation/native": "*",
     "@react-navigation/native-stack": "*",
     "react": "*",
@@ -37,6 +38,7 @@
     "react-native-safe-area-context": "*",
     "react-native-screens": "*",
     "react-native-video": "*",
+    "react-native-vision-camera": "*",
     "react-native-webview": "*",
     "vue": "^2.7.10",
     "vue-demi": "^0.14.6",
@@ -44,16 +46,13 @@
     "vue-i18n-bridge": "^9.2.2"
   },
   "peerDependenciesMeta": {
-    "vue": {
-      "optional": true
-    },
-    "vue-demi": {
+    "@d11/react-native-fast-image": {
       "optional": true
     },
-    "vue-i18n": {
+    "@react-navigation/native": {
       "optional": true
     },
-    "vue-i18n-bridge": {
+    "@react-navigation/native-stack": {
       "optional": true
     },
     "react": {
@@ -62,13 +61,13 @@
     "react-native": {
       "optional": true
     },
-    "react-native-reanimated": {
+    "react-native-gesture-handler": {
       "optional": true
     },
-    "@react-navigation/native": {
+    "react-native-linear-gradient": {
       "optional": true
     },
-    "@react-navigation/native-stack": {
+    "react-native-reanimated": {
       "optional": true
     },
     "react-native-safe-area-context": {
@@ -77,19 +76,25 @@
     "react-native-screens": {
       "optional": true
     },
+    "react-native-video": {
+      "optional": true
+    },
     "react-native-webview": {
       "optional": true
     },
-    "react-native-gesture-handler": {
+    "react-native-vision-camera": {
       "optional": true
     },
-    "react-native-linear-gradient": {
+    "vue": {
       "optional": true
     },
-    "@d11/react-native-fast-image": {
+    "vue-demi": {
       "optional": true
     },
-    "react-native-video": {
+    "vue-i18n": {
+      "optional": true
+    },
+    "vue-i18n-bridge": {
       "optional": true
     }
   },
@@ -113,5 +118,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "ca50ba6b1361f3c7790746476dd8b8e6be802ea3"
+  "gitHead": "a2cbdad9f8dcc376f2098d217485525953b64cd9"
 }

package/src/index.js

@@ -154,7 +154,9 @@ Mpx.config = {
   /**
   * react-native 相关配置，用于挂载事件等，如 onShareAppMessage
   */
-  rnConfig: {}
+  rnConfig: {
+    defaultBoxSizing: 'content-box'
+  }
 }
 
 init(Mpx)

package/src/platform/builtInMixins/pageStatusMixin.js

@@ -19,7 +19,11 @@ export default function pageStatusMixin (mixinType) {
           // 处理以上平台直接透传encode的结果，给到onload第二个参数供开发者使用
           if (isObject(rawQuery)) {
             for (const key in rawQuery) {
-              decodedQuery[key] = decodeURIComponent(rawQuery[key])
+              try {
+                decodedQuery[key] = decodeURIComponent(rawQuery[key])
+              } catch (e) {
+                decodedQuery[key] = rawQuery[key]
+              }
             }
           }
           this.__mpxProxy.callHook(ONLOAD, [rawQuery, decodedQuery])

package/src/platform/builtInMixins/styleHelperMixin.ios.js

@@ -1,4 +1,5 @@
 import { isObject, isArray, dash2hump, cached, isEmptyObject, hasOwn, getFocusedNavigation } from '@mpxjs/utils'
+import * as perf from '@mpxjs/perf'
 import { StyleSheet, Dimensions } from 'react-native'
 import { reactive } from '../../observer/reactive'
 import Mpx from '../../index'
@@ -81,12 +82,12 @@ const empty = {}
 
 function formatValue (value, unitType) {
   if (!dimensionsInfoInitialized) useDimensionsInfo(global.__mpxAppDimensionsInfo)
-  if (unitType === 'hairlineWidth') {
-    return StyleSheet.hairlineWidth
-  }
   if (unitType && typeof unit[unitType] === 'function') {
     return unit[unitType](+value)
   }
+  if (value === 'hairlineWidth') {
+    return StyleSheet.hairlineWidth
+  }
   const matched = unitRegExp.exec(value)
   if (matched) {
     if (!matched[2] || matched[2] === 'px') {
@@ -95,7 +96,6 @@ function formatValue (value, unitType) {
       return unit[matched[2]](+matched[1])
     }
   }
-  if (hairlineRegExp.test(value)) return StyleSheet.hairlineWidth
   return value
 }
 
@@ -171,7 +171,6 @@ function stringifyDynamicClass (value) {
 const listDelimiter = /;(?![^(]*[)])/g
 const propertyDelimiter = /:(.+)/
 const unitRegExp = /^\s*(-?\d+(?:\.\d+)?)(rpx|vw|vh|px)?\s*$/
-const hairlineRegExp = /^\s*hairlineWidth\s*$/
 const varRegExp = /^--/
 
 const parseStyleText = cached((cssText) => {
@@ -254,6 +253,9 @@ export default function styleHelperMixin () {
         return concat(staticClass, stringifyDynamicClass(dynamicClass))
       },
       __getStyle (staticClass, dynamicClass, staticStyle, dynamicStyle, hide) {
+        let stopTotal
+        if (__mpx_perf_framework__) stopTotal = perf.scope('getStyle:total')
+
         const isNativeStaticStyle = staticStyle && isNativeStyle(staticStyle)
         let result = isNativeStaticStyle ? [] : {}
         const mergeResult = isNativeStaticStyle ? (...args) => result.push(...args) : (...args) => Object.assign(result, ...args)
@@ -261,6 +263,8 @@ export default function styleHelperMixin () {
         this.__getSizeCount()
 
         if (staticClass || dynamicClass) {
+          let stopClass
+          if (__mpx_perf_framework__) stopClass = perf.scope('getStyle:class')
           // todo 当前为了复用小程序unocss产物，暂时进行mpEscape，等后续正式支持unocss后可不进行mpEscape
           const classString = mpEscape(concat(staticClass, stringifyDynamicClass(dynamicClass)))
 
@@ -268,13 +272,13 @@ export default function styleHelperMixin () {
             let localStyle, appStyle
             if (localStyle = this.__getClassStyle?.(className)) {
               if (localStyle._media?.length) {
-                mergeResult(localStyle._default, getMediaStyle(localStyle._media))
+                mergeResult(localStyle, getMediaStyle(localStyle._media))
               } else {
                 mergeResult(localStyle)
               }
             } else if (appStyle = global.__getAppClassStyle?.(className)) {
               if (appStyle._media?.length) {
-                mergeResult(appStyle._default, getMediaStyle(appStyle._media))
+                mergeResult(appStyle, getMediaStyle(appStyle._media))
               } else {
                 mergeResult(appStyle)
               }
@@ -283,9 +287,12 @@ export default function styleHelperMixin () {
               mergeResult(this.__props[className])
             }
           })
+          if (__mpx_perf_framework__) stopClass()
         }
 
         if (staticStyle || dynamicStyle) {
+          let stopStyle
+          if (__mpx_perf_framework__) stopStyle = perf.scope('getStyle:style')
           const styleObj = {}
           if (isNativeStaticStyle) {
             if (Array.isArray(staticStyle)) {
@@ -298,6 +305,7 @@ export default function styleHelperMixin () {
           }
           Object.assign(styleObj, normalizeDynamicStyle(dynamicStyle))
           mergeResult(transformStyleObj(styleObj))
+          if (__mpx_perf_framework__) stopStyle()
         }
 
         if (hide) {
@@ -319,6 +327,7 @@ export default function styleHelperMixin () {
           })
         }
         const isEmpty = isNativeStaticStyle ? !result.length : isEmptyObject(result)
+        if (__mpx_perf_framework__) stopTotal()
         return isEmpty ? empty : result
       }
     }

package/src/platform/patch/getDefaultOptions.ios.js

@@ -318,7 +318,11 @@ function createInstance ({ propsRef, type, rawOptions, currentInject, validProps
     const rawQuery = props.route.params || {}
     if (isObject(rawQuery)) {
       for (const key in rawQuery) {
-        decodedQuery[key] = decodeURIComponent(rawQuery[key])
+        try {
+          decodedQuery[key] = decodeURIComponent(rawQuery[key])
+        } catch (e) {
+          decodedQuery[key] = rawQuery[key]
+        }
       }
     }
     proxy.callHook(ONLOAD, [rawQuery, decodedQuery])