@mpxjs/core 2.10.2 → 2.10.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.10.2",
+  "version": "2.10.3",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -109,5 +109,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "4445de7c3ce29fb0166d3bb77a1a0460e41a32d3"
+  "gitHead": "043c9bc770ce9cc11f865bab67f46849ff573728"
 }

package/src/core/transferOptions.js

@@ -18,6 +18,10 @@ export default function transferOptions (options, type, needConvert = true) {
   if (!options.__nativeRender__) {
     options = mergeInjectedMixins(options, type)
   }
+  if (currentInject && currentInject.injectProperties) {
+    // 编译属性注入
+    options.properties = Object.assign({}, currentInject.injectProperties, options.properties)
+  }
   if (currentInject && currentInject.injectComputed) {
     // 编译计算属性注入
     options.computed = Object.assign({}, currentInject.injectComputed, options.computed)

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

@@ -195,7 +195,14 @@ export default function styleHelperMixin () {
 
         if (hide) {
           Object.assign(result, {
-            display: 'none'
+            // display: 'none'
+            // RN下display:'none'容易引发未知异常问题，使用布局样式模拟
+            flex: 0,
+            height: 0,
+            width: 0,
+            padding: 0,
+            margin: 0,
+            overflow: 'hidden'
           })
         }
 

package/src/platform/createApp.ios.js

@@ -10,8 +10,8 @@ import { initAppProvides } from './export/inject'
 
 const appHooksMap = makeMap(mergeLifecycle(LIFECYCLE).app)
 
-function getOrientation (window = ReactNative.Dimensions.get('window')) {
-  return window.width > window.height ? 'landscape' : 'portrait'
+function getPageSize (window = ReactNative.Dimensions.get('window')) {
+  return window.width + 'x' + window.height
 }
 
 function filterOptions (options, appData) {
@@ -56,16 +56,22 @@ export default function createApp (options) {
   const Stack = createStackNavigator()
   const getPageScreens = (initialRouteName, initialParams) => {
     return Object.entries(pages).map(([key, item]) => {
+      const options = {
+        // __mpxPageStatusMap 为编译注入的全局变量
+        headerShown: !(Object.assign({}, global.__mpxPageConfig, global.__mpxPageConfigsMap[key]).navigationStyle === 'custom')
+      }
       if (key === initialRouteName) {
         return createElement(Stack.Screen, {
           name: key,
           component: item,
-          initialParams
+          initialParams,
+          options
         })
       }
       return createElement(Stack.Screen, {
         name: key,
-        component: item
+        component: item,
+        options
       })
     })
   }
@@ -154,7 +160,9 @@ export default function createApp (options) {
           }
         } else if (currentState === 'inactive' || currentState === 'background') {
           global.__mpxAppCbs.hide.forEach((cb) => {
-            cb()
+            cb({
+              reason: 3
+            })
           })
           const navigation = getFocusedNavigation()
           if (navigation && hasOwn(global.__mpxPageStatusMap, navigation.pageId)) {
@@ -164,17 +172,23 @@ export default function createApp (options) {
       })
 
       let count = 0
-      let lastOrientation = getOrientation()
+      let lastPageSize = getPageSize()
       const resizeSubScription = ReactNative.Dimensions.addEventListener('change', ({ window }) => {
-        const orientation = getOrientation(window)
-        if (orientation === lastOrientation) return
-        lastOrientation = orientation
+        const pageSize = getPageSize(window)
+        if (pageSize === lastPageSize) return
+        lastPageSize = pageSize
         const navigation = getFocusedNavigation()
         if (navigation && hasOwn(global.__mpxPageStatusMap, navigation.pageId)) {
           global.__mpxPageStatusMap[navigation.pageId] = `resize${count++}`
         }
       })
       return () => {
+        // todo 跳到原生页面或者其他rn bundle可以考虑使用reason 1/2进行模拟抹平
+        global.__mpxAppCbs.hide.forEach((cb) => {
+          cb({
+            reason: 0
+          })
+        })
         changeSubscription && changeSubscription.remove()
         resizeSubScription && resizeSubScription.remove()
       }
@@ -186,6 +200,9 @@ export default function createApp (options) {
       // headerBackButtonDisplayMode: 'minimal',
       headerBackTitleVisible: false,
       headerShadowVisible: false
+      // 整体切换native-stack时进行修改如下
+      // statusBarTranslucent: true,
+      // statusBarBackgroundColor: 'transparent'
     }
     if (__mpx_mode__ === 'ios') {
       // ios使用native-stack
@@ -194,8 +211,8 @@ export default function createApp (options) {
         navScreenOpts.headerBackImageSource = headerBackImageSource
       }
     } else {
-       // 安卓上会出现导航条闪现的问题所以默认加headerShown false（stack版本， native-stack版本可以干掉）
-       // iOS加上默认headerShown false的话会因为iOS根高度是screenHeight - useHeaderHeight()会导致出现渲染两次情况，因此iOS不加此默认值
+      // 安卓上会出现导航条闪现的问题所以默认加headerShown false（stack版本， native-stack版本可以干掉）
+      // iOS加上默认headerShown false的话会因为iOS根高度是screenHeight - useHeaderHeight()会导致出现渲染两次情况，因此iOS不加此默认值
       navScreenOpts.headerShown = false
       // 安卓和鸿蒙先用stack
       const headerBackImageProps = Mpx.config.rnConfig.headerBackImageProps || null

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

@@ -10,20 +10,19 @@ import mergeOptions from '../../core/mergeOptions'
 import { queueJob, hasPendingJob } from '../../observer/scheduler'
 import { createSelectorQuery, createIntersectionObserver } from '@mpxjs/api-proxy'
 import { IntersectionObserverContext, RouteContext, KeyboardAvoidContext } from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/context'
-import KeyboardAvoidingView from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/KeyboardAvoidingView'
+import MpxKeyboardAvoidingView from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/mpx-keyboard-avoiding-view'
 
 const ProviderContext = createContext(null)
-
+const windowDimensions = ReactNative.Dimensions.get('window')
+const screenDimensions = ReactNative.Dimensions.get('screen')
 function getSystemInfo () {
-  const window = ReactNative.Dimensions.get('window')
-  const screen = ReactNative.Dimensions.get('screen')
   return {
-    deviceOrientation: window.width > window.height ? 'landscape' : 'portrait',
+    deviceOrientation: windowDimensions.width > windowDimensions.height ? 'landscape' : 'portrait',
     size: {
-      screenWidth: screen.width,
-      screenHeight: screen.height,
-      windowWidth: window.width,
-      windowHeight: window.height
+      screenWidth: screenDimensions.width,
+      screenHeight: screenDimensions.height,
+      windowWidth: windowDimensions.width,
+      windowHeight: windowDimensions.height
     }
   }
 }
@@ -46,7 +45,9 @@ function createEffect (proxy, components) {
     if (!tagName) return null
     if (tagName === 'block') return Fragment
     const appComponents = global.__getAppComponents?.() || {}
-    return components[tagName] || appComponents[tagName] || getByPath(ReactNative, tagName)
+    const generichash = proxy.target.generichash || ''
+    const genericComponents = global.__mpxGenericsMap[generichash] || noop
+    return components[tagName] || genericComponents(tagName) || appComponents[tagName] || getByPath(ReactNative, tagName)
   }
   const innerCreateElement = (type, ...rest) => {
     if (!type) return null
@@ -440,6 +441,8 @@ const checkRelation = (options) => {
   }
 }
 
+// 临时用来存储安卓底部（iOS没有这个）的高度（虚拟按键等高度）根据第一次进入推算
+let bottomVirtualHeight = null
 export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
   rawOptions = mergeOptions(rawOptions, type, false)
   const components = Object.assign({}, rawOptions.components, currentInject.getComponents())
@@ -586,9 +589,7 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
       })
       usePageStatus(navigation, currentPageId)
       useLayoutEffect(() => {
-        const isCustom = pageConfig.navigationStyle === 'custom'
         navigation.setOptions({
-          headerShown: !isCustom,
           title: pageConfig.navigationBarTitleText?.trim() || '',
           headerStyle: {
             backgroundColor: pageConfig.navigationBarBackgroundColor || '#000000'
@@ -596,29 +597,56 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
           headerTintColor: pageConfig.navigationBarTextStyle || 'white'
         })
 
+        // TODO 此部分内容在native-stack可删除，用setOptions设置
         if (__mpx_mode__ === 'android') {
           ReactNative.StatusBar.setBarStyle(pageConfig.barStyle || 'dark-content')
-          ReactNative.StatusBar.setTranslucent(isCustom) // 控制statusbar是否占位
-          const color = isCustom ? 'transparent' : pageConfig.statusBarColor
-          color && ReactNative.StatusBar.setBackgroundColor(color)
+          ReactNative.StatusBar.setTranslucent(true) // 控制statusbar是否占位
+          ReactNative.StatusBar.setBackgroundColor('transparent')
         }
       }, [])
 
       const rootRef = useRef(null)
       const keyboardAvoidRef = useRef(null)
-      useEffect(() => {
-        setTimeout(() => {
-          rootRef.current?.measureInWindow((x, y, width, height) => {
-            navigation.layout = { x, y, width, height }
-          })
-        }, 100)
-      }, [])
+      const headerHeight = useHeaderHeight()
+      const onLayout = () => {
+        if (__mpx_mode__ === 'ios') {
+          navigation.layout = {
+            x: 0,
+            y: headerHeight,
+            width: windowDimensions.width,
+            height: screenDimensions.height - headerHeight
+          }
+        } else {
+          if (bottomVirtualHeight === null) {
+            rootRef.current?.measureInWindow((height) => {
+              // 沉浸模式的计算方式
+              bottomVirtualHeight = screenDimensions.height - height - headerHeight
+              // 非沉浸模式（translucent=true）计算方式, 现在默认是全用沉浸模式，所以先不算这个
+              // bottomVirtualHeight = windowDimensions.height - height - headerHeight
+              navigation.layout = {
+                x: 0,
+                y: headerHeight,
+                width: windowDimensions.width,
+                height: height
+              }
+            })
+          } else {
+            navigation.layout = {
+              x: 0,
+              y: headerHeight, // 这个y值
+              width: windowDimensions.width,
+              // 后续页面的layout是通过第一次路由进入时候推算出来的底部区域来推算出来的
+              height: screenDimensions.height - bottomVirtualHeight - headerHeight
+            }
+          }
+        }
+      }
       const withKeyboardAvoidingView = (element) => {
         return createElement(KeyboardAvoidContext.Provider,
           {
             value: keyboardAvoidRef
           },
-          createElement(KeyboardAvoidingView,
+          createElement(MpxKeyboardAvoidingView,
             {
               style: {
                 flex: 1
@@ -652,7 +680,9 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
                 flex: 1,
                 backgroundColor: pageConfig.backgroundColor || '#ffffff'
               },
-              ref: rootRef
+              ref: rootRef,
+              // 测试过了 键盘拉起后不会重新触发onLayout
+              onLayout
             },
             createElement(RouteContext.Provider,
               {