@mpxjs/core 2.9.41-react.0 → 2.9.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.9.41-react.0",
+  "version": "2.9.41",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -19,18 +19,18 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.9.41-react.0",
+    "@mpxjs/utils": "^2.9.41",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.10.0"
   },
   "peerDependencies": {
+    "@ant-design/react-native": "^5.1.3",
     "@mpxjs/api-proxy": "^2.9.0",
     "@mpxjs/store": "^2.9.0",
     "@react-navigation/native": "^6.1.17",
     "@react-navigation/native-stack": "^6.9.26",
     "react": "^18.3.1",
     "react-native": "^0.74.3",
-    "react-native-root-siblings": "^5.0.1",
     "vue": "^2.7.10",
     "vue-demi": "^0.14.6",
     "vue-i18n": "^8.27.2",
@@ -61,7 +61,7 @@
     "@react-navigation/native-stack": {
       "optional": true
     },
-    "react-native-root-siblings": {
+    "@ant-design/react-native": {
       "optional": true
     }
   },
@@ -81,5 +81,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "1c9ae7527a257fad98f5536114e63415cea54271"
+  "gitHead": "0b3ee5d2c1b6c6e0af6a842eb4e12f4a1173c067"
 }

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

@@ -40,7 +40,7 @@ function stringifyDynamicClass (value) {
 }
 
 const listDelimiter = /;(?![^(]*[)])/g
-const propertyDelimiter = /':(.+)'/
+const propertyDelimiter = /:(.+)/
 const rpxRegExp = /^\s*(\d+(\.\d+)?)rpx\s*$/
 const pxRegExp = /^\s*(\d+(\.\d+)?)(px)?\s*$/
 

package/src/platform/createApp.ios.js

@@ -81,6 +81,7 @@ export default function createApp (option, config = {}) {
         referrerInfo: {}
       }
       global.__mpxEnterOptions = options
+      // todo relaunch时会重复执行，需check
       defaultOptions.onLaunch && defaultOptions.onLaunch.call(instance, options)
     }, [])
     return createElement(NavigationContainer,

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

@@ -1,4 +1,4 @@
-import { useEffect, useSyncExternalStore, useRef, createElement, memo, forwardRef, useImperativeHandle } from 'react'
+import { useEffect, useLayoutEffect, useSyncExternalStore, useRef, createElement, memo, forwardRef, useImperativeHandle } from 'react'
 import * as ReactNative from 'react-native'
 import { ReactiveEffect } from '../../../observer/effect'
 import { hasOwn, isFunction, noop, isObject, error, getByPath, collectDataset } from '@mpxjs/utils'
@@ -7,10 +7,6 @@ import { BEFOREUPDATE, UPDATED } from '../../../core/innerLifecycle'
 import mergeOptions from '../../../core/mergeOptions'
 import { queueJob } from '../../../observer/scheduler'
 
-function getNativeComponent (tagName) {
-  return getByPath(ReactNative, tagName)
-}
-
 function getRootProps (props) {
   const rootProps = {}
   for (const key in props) {
@@ -39,8 +35,11 @@ function createEffect (proxy, components, props) {
     proxy.onStoreChange && proxy.onStoreChange()
   }
   update.id = proxy.uid
+  const getComponent = (tagName) => {
+    return components[tagName] || getByPath(ReactNative, tagName)
+  }
   proxy.effect = new ReactiveEffect(() => {
-    return proxy.target.__injectedRender(createElement, components, getNativeComponent, getRootProps(props))
+    return proxy.target.__injectedRender(createElement, getComponent, getRootProps(props))
   }, () => queueJob(update), proxy.scope)
 }
 
@@ -198,8 +197,7 @@ function createInstance ({ propsRef, ref, type, rawOptions, currentInject, valid
 
 export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
   rawOptions = mergeOptions(rawOptions, type, false)
-  const { RootSiblingParent } = global.__navigationHelper
-  const components = currentInject.getComponents() || {}
+  const components = Object.assign({}, rawOptions.components, currentInject.getComponents())
   const validProps = Object.assign({}, rawOptions.props, rawOptions.properties)
   const defaultOptions = memo(forwardRef((props, ref) => {
     const instanceRef = useRef(null)
@@ -249,13 +247,25 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
   }))
 
   if (type === 'page') {
-    const Page = () => {
-      return createElement(RootSiblingParent,
+    const { Provider } = global.__navigationHelper
+    const pageConfig = Object.assign({}, global.__mpxPageConfig, currentInject.pageConfig)
+    const Page = ({ navigation }) => {
+      useLayoutEffect(() => {
+        navigation.setOptions({
+          headerTitle: pageConfig.navigationBarTitleText || '',
+          headerStyle: {
+            backgroundColor: pageConfig.navigationBarBackgroundColor || '#000000'
+          },
+          headerTintColor: pageConfig.navigationBarTextStyle || 'white'
+        })
+      }, [])
+      return createElement(Provider,
         null,
         createElement(ReactNative.ScrollView,
           {
             style: {
-              ...ReactNative.StyleSheet.absoluteFillObject
+              ...ReactNative.StyleSheet.absoluteFillObject,
+              backgroundColor: pageConfig.backgroundColor || '#ffffff'
             },
             showsVerticalScrollIndicator: false
           },