@mpxjs/core 2.10.24-beta.1 → 2.10.24-test.1

package/@types/index.d.ts

@@ -294,13 +294,6 @@ export interface RnConfig {
    */
   onStateChange?: (state: Record<string, any>) => void
 
-  /**
-   * 自定义 React Navigation Stack.Navigator 的 screenOptions。
-   *
-   * 会与 Mpx 默认 screenOptions 合并，用户配置优先。
-   */
-  screenOptions?: Record<string, any>
-
   /**
    * 用于获取初始路由配置的函数。
    *
@@ -327,13 +320,6 @@ export interface RnConfig {
    */
   disableAppStateListener?: boolean
 
-  /**
-   * Stack screenOptions 中 statusBarTranslucent 的默认值。
-   *
-   * @default true
-   */
-  statusBarTranslucent?: boolean
-
   /**
    * RN 文本类组件是否允许跟随系统字体缩放。
    *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.10.24-beta.1",
+  "version": "2.10.24-test.1",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",

package/src/core/proxy.js

@@ -54,6 +54,7 @@ import {
 import contextMap from '../dynamic/vnode/context'
 import { getAst } from '../dynamic/astCache'
 import { inject, provide } from '../platform/export/inject'
+import * as perf from '@mpxjs/perf'
 
 let uid = 0
 
@@ -166,6 +167,8 @@ export default class MpxProxy {
   }
 
   created () {
+    let perfId = -1
+    if (__mpx_perf_framework__) perfId = perf.scopeStart('proxy:created')
     if (__mpx_dynamic_runtime__) {
       // 缓存上下文，在 destoryed 阶段删除
       contextMap.set(this.uid, this.target)
@@ -199,6 +202,7 @@ export default class MpxProxy {
     if (this.reCreated) {
       nextTick(this.mounted.bind(this))
     }
+    if (__mpx_perf_framework__) perf.scopeEnd(perfId)
   }
 
   resolveParent () {
@@ -248,6 +252,8 @@ export default class MpxProxy {
   }
 
   unmounted () {
+    let perfId = -1
+    if (__mpx_perf_framework__) perfId = perf.scopeStart('proxy:unmounted')
     if (__mpx_dynamic_runtime__) {
       // 页面/组件销毁清除上下文的缓存
       contextMap.remove(this.uid)
@@ -277,6 +283,7 @@ export default class MpxProxy {
       this.miniRenderData = null
       this.forceUpdateData = null
     }
+    if (__mpx_perf_framework__) perf.scopeEnd(perfId)
   }
 
   isUnmounted () {

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

@@ -80,6 +80,8 @@ const unit = {
 
 const empty = {}
 
+const isNum = (v) => !isNaN(+v)
+
 function formatValue (value, unitType) {
   if (!dimensionsInfoInitialized) useDimensionsInfo(global.__mpxAppDimensionsInfo)
   if (unitType && typeof unit[unitType] === 'function') {
@@ -170,7 +172,7 @@ function stringifyDynamicClass (value) {
 
 const listDelimiter = /;(?![^(]*[)])/g
 const propertyDelimiter = /:(.+)/
-const unitRegExp = /^\s*(-?\d+(?:\.\d+)?)(rpx|vw|vh|px)?\s*$/
+const unitRegExp = /^\s*(-?(?:\d+(?:\.\d+)?|\.\d+))(rpx|vw|vh|px)?\s*$/
 const varRegExp = /^--/
 
 const parseStyleText = cached((cssText) => {
@@ -213,7 +215,17 @@ function mergeObjectArray (arr) {
 function transformStyleObj (styleObj) {
   const transformed = {}
   Object.keys(styleObj).forEach((prop) => {
-    transformed[prop] = formatValue(styleObj[prop])
+    if (prop === 'lineHeight' && isNum(styleObj[prop])) {
+      if (+styleObj[prop] === 0) {
+        transformed[prop] = 0
+      } else {
+        transformed[prop] = `${Math.round(styleObj[prop] * 100)}%`
+      }
+    } else if (prop === 'flex') {
+      transformed[prop] = styleObj[prop]
+    } else {
+      transformed[prop] = formatValue(styleObj[prop])
+    }
   })
   return transformed
 }

package/src/platform/createApp.ios.js

@@ -133,7 +133,7 @@ export default function createApp (options) {
         cb(options)
       })
     } else if (value === 'hide' || value === 'exit') {
-      global.__mpxAppCbs.hide.forEach((cb) => {
+       global.__mpxAppCbs.hide.forEach((cb) => {
         cb({
           reason: value === 'exit' ? 0 : 3
         })
@@ -211,11 +211,11 @@ export default function createApp (options) {
     }, [])
 
     const { initialRouteName, initialParams } = initialRouteRef.current
-    const navScreenOpts = Object.assign({
+    const navScreenOpts = {
       headerShown: false,
       statusBarTranslucent: Mpx.config.rnConfig.statusBarTranslucent ?? true,
       statusBarBackgroundColor: 'transparent'
-    }, Mpx.config.rnConfig.screenOptions)
+    }
 
     return createElement(SafeAreaProvider,
       null,