@mpxjs/core 2.10.8 → 2.10.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.10.8",
+  "version": "2.10.10",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -109,5 +109,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "23f6e6d5fa30e4abdc35e137007edbd38337b36e"
+  "gitHead": "cee4b9ba7c2b455ebb864cbad7d2a8374b2d7308"
 }

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

@@ -1,15 +1,27 @@
 import { isObject, isArray, dash2hump, cached, isEmptyObject } from '@mpxjs/utils'
 import { Dimensions, StyleSheet } from 'react-native'
+import Mpx from '../../index'
+
+let dimensionsInfo = {
+  screen: Dimensions.get('screen'),
+  window: Dimensions.get('window')
+}
+let width, height
 
-let { width, height } = Dimensions.get('screen')
 // TODO 临时适配折叠屏场景适配
-const isLargeFoldableLike = (__mpx_mode__ === 'android') && (height / width < 1.5) && (width > 600)
-if (isLargeFoldableLike) width = width / 2
+// const isLargeFoldableLike = (__mpx_mode__ === 'android') && (height / width < 1.5) && (width > 600)
+// if (isLargeFoldableLike) width = width / 2
+
+function customDimensionsInfo (dimensions) {
+  if (typeof Mpx.config.rnConfig?.customDimensionsInfo === 'function') {
+    dimensionsInfo = Mpx.config.rnConfig.customDimensionsInfo(dimensions) || dimensions
+    width = dimensionsInfo.screen.width
+    height = dimensionsInfo.screen.height
+  }
+}
 
-Dimensions.addEventListener('change', ({ screen }) => {
-  width = screen.width
-  height = screen.height
-})
+customDimensionsInfo(dimensionsInfo)
+Dimensions.addEventListener('change', customDimensionsInfo)
 
 function rpx (value) {
   // rn 单位 dp = 1(css)px =  1 物理像素 * pixelRatio(像素比)

package/src/platform/createApp.ios.js

@@ -73,17 +73,20 @@ export default function createApp (options) {
           children
         )
       }
+      const getComponent = () => {
+        return item.displayName ? item : item()
+      }
       if (key === initialRouteName) {
         return createElement(Stack.Screen, {
           name: key,
-          getComponent: () => item(),
+          getComponent,
           initialParams,
           layout: headerLayout
         })
       }
       return createElement(Stack.Screen, {
         name: key,
-        getComponent: () => item(),
+        getComponent,
         layout: headerLayout
       })
     })

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

@@ -53,8 +53,8 @@ function createEffect (proxy, componentsMap) {
     const appComponentsMap = global.__appComponentsMap || {}
     const generichash = proxy.target.generichash || ''
     const genericComponentsMap = global.__mpxGenericsMap?.[generichash] || {}
-    const componentGetter = componentsMap[tagName] || genericComponentsMap[tagName] || appComponentsMap[tagName]
-    return componentGetter ? componentGetter() : getByPath(ReactNative, tagName)
+    const component = componentsMap[tagName] || genericComponentsMap[tagName] || appComponentsMap[tagName]
+    return component ? component.displayName ? component : component() : getByPath(ReactNative, tagName)
   }
   const innerCreateElement = (type, ...rest) => {
     if (!type) return null