@mpxjs/core 2.9.42 → 2.9.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.9.42",
+  "version": "2.9.46",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -29,8 +29,8 @@
     "@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": "*",
+    "react-native": "*",
     "vue": "^2.7.10",
     "vue-demi": "^0.14.6",
     "vue-i18n": "^8.27.2",
@@ -81,5 +81,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "45c7fd96af6723fa8c8ea2d659065417e66c77e2"
+  "gitHead": "310d4b0986313835bb30f027983c2bc1b64814c6"
 }

package/src/dynamic/dynamicRenderMixin.empty.js

@@ -0,0 +1,17 @@
+function dynamicRefsMixin () {
+  return {}
+}
+
+function dynamicSlotMixin () {
+  return {}
+}
+
+function dynamicRenderHelperMixin () {
+  return {}
+}
+
+export {
+  dynamicRefsMixin,
+  dynamicSlotMixin,
+  dynamicRenderHelperMixin
+}

package/src/platform/builtInMixins/index.js

@@ -10,7 +10,7 @@ import pageScrollMixin from './pageScrollMixin'
 import componentGenericsMixin from './componentGenericsMixin'
 import getTabBarMixin from './getTabBarMixin'
 import pageRouteMixin from './pageRouteMixin'
-import { dynamicRefsMixin, dynamicRenderHelperMixin, dynamicSlotMixin } from '../../dynamic/dynamicRenderMixin'
+import { dynamicRefsMixin, dynamicRenderHelperMixin, dynamicSlotMixin } from '../../dynamic/dynamicRenderMixin.empty'
 import styleHelperMixin from './styleHelperMixin'
 import directiveHelperMixin from './directiveHelperMixin'
 import { isReact } from '@mpxjs/utils'
@@ -50,15 +50,11 @@ export default function getBuiltInMixins (options, type) {
       bulitInMixins = bulitInMixins.concat([
         renderHelperMixin(),
         showMixin(type),
-        i18nMixin()
+        i18nMixin(),
+        dynamicRenderHelperMixin(),
+        dynamicSlotMixin(),
+        dynamicRefsMixin()
       ])
-      if (__mpx_dynamic_runtime__) {
-        bulitInMixins = bulitInMixins.concat([
-          dynamicRenderHelperMixin(),
-          dynamicSlotMixin(),
-          dynamicRefsMixin()
-        ])
-      }
     }
   }
   return bulitInMixins.filter(item => item)

package/src/platform/builtInMixins/proxyEventMixin.js

@@ -18,6 +18,8 @@ export default function proxyEventMixin () {
       }
       const location = this.__mpxProxy.options.mpxFileResource
       const type = $event.type
+      // thanos 平台特殊事件标识
+      const emitMode = $event.detail && $event.detail.mpxEmit
       if (!type) {
         error('Event object must have [type] property!', location)
         return
@@ -44,6 +46,10 @@ export default function proxyEventMixin () {
       let returnedValue
       curEventConfig.forEach((item) => {
         const callbackName = item[0]
+        if (emitMode) {
+          // thanos 平台特殊事件标识处理
+          $event = $event.detail.data
+        }
         if (callbackName) {
           const params = item.length > 1
             ? item.slice(1).map(item => {

package/src/platform/createApp.ios.js

@@ -49,7 +49,6 @@ export default function createApp (option, config = {}) {
       component: item
     })
   })
-  global.__navigationRef = navigationRef
   global.__mpxOptionsMap = global.__mpxOptionsMap || {}
   const onStateChange = () => {
     if (global.__navigationHelper.lastSuccessCallback) {
@@ -81,7 +80,6 @@ export default function createApp (option, config = {}) {
         referrerInfo: {}
       }
       global.__mpxEnterOptions = options
-      // todo relaunch时会重复执行，需check
       defaultOptions.onLaunch && defaultOptions.onLaunch.call(instance, options)
     }, [])
     return createElement(NavigationContainer,
@@ -101,4 +99,13 @@ export default function createApp (option, config = {}) {
   global.getApp = function () {
     return appData
   }
+  global.getCurrentPages = function () {
+    const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
+    if (navigation) {
+      return navigation.getState().routes.map((route) => {
+        return global.__mpxPagesMap[route.key] && global.__mpxPagesMap[route.key][0]
+      }).filter(item => item)
+    }
+    return []
+  }
 }

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

@@ -3,7 +3,7 @@ import * as ReactNative from 'react-native'
 import { ReactiveEffect } from '../../../observer/effect'
 import { hasOwn, isFunction, noop, isObject, error, getByPath, collectDataset } from '@mpxjs/utils'
 import MpxProxy from '../../../core/proxy'
-import { BEFOREUPDATE, UPDATED } from '../../../core/innerLifecycle'
+import { BEFOREUPDATE, UPDATED, ONLOAD } from '../../../core/innerLifecycle'
 import mergeOptions from '../../../core/mergeOptions'
 import { queueJob } from '../../../observer/scheduler'
 
@@ -43,7 +43,7 @@ function createEffect (proxy, components, props) {
   }, () => queueJob(update), proxy.scope)
 }
 
-function createInstance ({ propsRef, ref, type, rawOptions, currentInject, validProps, components }) {
+function createInstance ({ propsRef, type, rawOptions, currentInject, validProps, components }) {
   const instance = Object.create({
     setData (data, callback) {
       return this.__mpxProxy.forceUpdate(data, { sync: true }, callback)
@@ -61,7 +61,7 @@ function createInstance ({ propsRef, ref, type, rawOptions, currentInject, valid
       return propsData
     },
     __getSlot (name) {
-      const { children } = propsRef.current || {}
+      const { children } = propsRef.current
       if (children) {
         const result = []
         if (Array.isArray(children)) {
@@ -164,8 +164,20 @@ function createInstance ({ propsRef, ref, type, rawOptions, currentInject, valid
     }
   })
 
+  const props = propsRef.current
+
+  if (type === 'page') {
+    instance.route = props.route.name
+    global.__mpxPagesMap[props.route.key] = [instance, props.navigation]
+  }
+
   const proxy = instance.__mpxProxy = new MpxProxy(rawOptions, instance)
   proxy.created()
+
+  if (type === 'page') {
+    proxy.callHook(ONLOAD, [props.route.params])
+  }
+
   Object.assign(proxy, {
     onStoreChange: null,
     // eslint-disable-next-line symbol-description
@@ -205,7 +217,7 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
     let isFirst = false
     if (!instanceRef.current) {
       isFirst = true
-      instanceRef.current = createInstance({ propsRef, ref, type, rawOptions, currentInject, validProps, components })
+      instanceRef.current = createInstance({ propsRef, type, rawOptions, currentInject, validProps, components })
     }
     const instance = instanceRef.current
     // reset instance
@@ -238,6 +250,9 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
       proxy.mounted()
       return () => {
         proxy.unmounted()
+        if (type === 'page') {
+          delete global.__mpxPagesMap[props.route.key]
+        }
       }
     }, [])
 
@@ -249,7 +264,7 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
   if (type === 'page') {
     const { Provider } = global.__navigationHelper
     const pageConfig = Object.assign({}, global.__mpxPageConfig, currentInject.pageConfig)
-    const Page = ({ navigation }) => {
+    const Page = ({ navigation, route }) => {
       useLayoutEffect(() => {
         navigation.setOptions({
           headerTitle: pageConfig.navigationBarTitleText || '',
@@ -259,6 +274,7 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
           headerTintColor: pageConfig.navigationBarTextStyle || 'white'
         })
       }, [])
+
       return createElement(Provider,
         null,
         createElement(ReactNative.View,
@@ -268,7 +284,7 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
               backgroundColor: pageConfig.backgroundColor || '#ffffff'
             }
           },
-          createElement(defaultOptions)
+          createElement(defaultOptions, { navigation, route, pageConfig })
         )
       )
     }