@mpxjs/core 2.10.1-beta.1 → 2.10.1-beta.3

package/package.json

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

package/src/convertor/convertor.js

@@ -37,7 +37,8 @@ const rulesMap = {
   wxToDd: extend({}, defaultConvertRule, wxToDdRule),
   wxToJd: extend({}, defaultConvertRule, wxToJdRule),
   wxToIos: extend({}, defaultConvertRule, wxToReactRule),
-  wxToAndroid: extend({}, defaultConvertRule, wxToReactRule)
+  wxToAndroid: extend({}, defaultConvertRule, wxToReactRule),
+  wxToHarmony: extend({}, defaultConvertRule, wxToReactRule)
 }
 
 export function getConvertRule (convertMode) {

package/src/convertor/getConvertMode.js

@@ -7,7 +7,8 @@ const convertModes = {
   'wx-jd': 'wxToJd',
   'wx-dd': 'wxToDd',
   'wx-ios': 'wxToIos',
-  'wx-android': 'wxToAndroid'
+  'wx-android': 'wxToAndroid',
+  'wx-harmony': 'wxToHarmony'
 }
 
 export function getConvertMode (srcMode) {

package/src/platform/builtInMixins/index.js

@@ -1,3 +1,4 @@
+import { isReact } from '@mpxjs/utils'
 import pageStatusMixin from './pageStatusMixin'
 import proxyEventMixin from './proxyEventMixin'
 import renderHelperMixin from './renderHelperMixin'
@@ -16,7 +17,7 @@ import directiveHelperMixin from './directiveHelperMixin'
 
 export default function getBuiltInMixins ({ type, rawOptions = {} }) {
   let bulitInMixins
-  if (__mpx_mode__ === 'ios' || __mpx_mode__ === 'android') {
+  if (isReact) {
     bulitInMixins = [
       proxyEventMixin(),
       directiveHelperMixin(),

package/src/platform/createApp.ios.js

@@ -6,6 +6,8 @@ import { LIFECYCLE } from '../platform/patch/lifecycle/index'
 import Mpx from '../index'
 import { createElement, memo, useRef, useEffect } from 'react'
 import * as ReactNative from 'react-native'
+import { Image } from 'react-native'
+
 import { initAppProvides } from './export/inject'
 
 const appHooksMap = makeMap(mergeLifecycle(LIFECYCLE).app)
@@ -181,6 +183,7 @@ export default function createApp (options) {
     }, [])
 
     const { initialRouteName, initialParams } = initialRouteRef.current
+    const headerBackImageProps = Mpx.config.rnConfig.headerBackImageProps || null
     const headerBackImageSource = Mpx.config.rnConfig.headerBackImageSource || null
     const navScreenOpts = {
       // 7.x替换headerBackTitleVisible
@@ -188,9 +191,13 @@ export default function createApp (options) {
       headerBackTitleVisible: false,
       // 安卓上会出现初始化时闪现导航条的问题
       headerShown: false,
-      // 隐藏导航下的那条线
       headerShadowVisible: false
     }
+    if (headerBackImageProps) {
+      navScreenOpts.headerBackImage = () => {
+        return createElement(Image, headerBackImageProps)
+      }
+    }
     if (headerBackImageSource) {
       navScreenOpts.headerBackImageSource = headerBackImageSource
     }

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

@@ -583,7 +583,7 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
           headerTintColor: pageConfig.navigationBarTextStyle || 'white'
         })
 
-        if (__mpx_mode__ === 'android') {
+        if (__mpx_mode__ === 'android' || __mpx_mode__ === 'harmony') {
           ReactNative.StatusBar.setBarStyle(pageConfig.barStyle || 'dark-content')
           ReactNative.StatusBar.setTranslucent(isCustom) // 控制statusbar是否占位
           const color = isCustom ? 'transparent' : pageConfig.statusBarColor