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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.9.69-beta.1",
+  "version": "2.9.69-beta.3",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -19,7 +19,7 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.9.69-beta.0",
+    "@mpxjs/utils": "^2.9.69-beta.1",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.10.0"
   },

package/src/platform/createApp.ios.js

@@ -1,6 +1,6 @@
 import transferOptions from '../core/transferOptions'
 import builtInKeysMap from './patch/builtInKeysMap'
-import { makeMap, spreadProp, parseUrlQuery, getFocusedNavigation, hasOwn, extend } from '@mpxjs/utils'
+import { makeMap, spreadProp, getFocusedNavigation, hasOwn, extend } from '@mpxjs/utils'
 import { mergeLifecycle } from '../convertor/mergeLifecycle'
 import { LIFECYCLE } from '../platform/patch/lifecycle/index'
 import Mpx from '../index'
@@ -96,14 +96,10 @@ export default function createApp (option, config = {}) {
     })
 
     if (!global.__mpxAppLaunched) {
-      const parsed = Mpx.config.rnConfig.parseAppProps?.(props) || {}
-      if (parsed.url) {
-        const { path, queryObj } = parseUrlQuery(parsed.url)
-        Object.assign(initialRouteRef.current, {
-          initialRouteName: path.startsWith('/') ? path.slice(1) : path,
-          initialParams: queryObj
-        })
-      }
+      const { initialRouteName, initialParams } = Mpx.config.rnConfig.parseAppProps?.(props) || {}
+      initialRouteRef.current.initialRouteName = initialRouteName || initialRouteRef.current.initialRouteName
+      initialRouteRef.current.initialParams = initialParams || initialRouteRef.current.initialParams
+
       global.__mpxAppOnLaunch = (navigation) => {
         global.__mpxAppLaunched = true
         const state = navigation.getState()
@@ -151,7 +147,7 @@ export default function createApp (option, config = {}) {
             }
           }
           global.__mpxAppCbs.show.forEach((cb) => {
-            cb(options)
+            cb(options || {})
           })
           if (navigation && hasOwn(global.__mpxPageStatusMap, navigation.pageId)) {
             global.__mpxPageStatusMap[navigation.pageId] = 'show'
@@ -187,7 +183,6 @@ export default function createApp (option, config = {}) {
     const { initialRouteName, initialParams } = initialRouteRef.current
     const headerBackImageProps = Mpx.config.rnConfig.headerBackImageProps || null
     const navScreenOpts = {
-      gestureEnabled: true,
       // 7.x替换headerBackTitleVisible
       // headerBackButtonDisplayMode: 'minimal',
       headerBackTitleVisible: false,

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

@@ -367,6 +367,12 @@ function usePageStatus (navigation, pageId) {
     const blurSubscription = navigation.addListener('blur', () => {
       pageStatusMap[pageId] = 'hide'
     })
+    const transitionEndSubscription = navigation.addListener('transitionEnd', () => {
+      if (global.__navigationHelper.transitionEndCallback) {
+        global.__navigationHelper.transitionEndCallback()
+        global.__navigationHelper.transitionEndCallback = null
+      }
+    })
     const unWatchAppFocusedState = watch(global.__mpxAppFocusedState, (value) => {
       pageStatusMap[pageId] = value
     })
@@ -375,11 +381,13 @@ function usePageStatus (navigation, pageId) {
       focusSubscription()
       blurSubscription()
       unWatchAppFocusedState()
+      transitionEndSubscription()
       del(pageStatusMap, pageId)
     }
   }, [navigation])
 }
 
+const pageConfigStack = []
 export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
   rawOptions = mergeOptions(rawOptions, type, false)
   const components = Object.assign({}, rawOptions.components, currentInject.getComponents())
@@ -490,7 +498,7 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
     const { Provider, useSafeAreaInsets, GestureHandlerRootView } = global.__navigationHelper
     const pageConfig = Object.assign({}, global.__mpxPageConfig, currentInject.pageConfig)
     const Page = ({ navigation, route }) => {
-      const [enabled, setEnabled] = useState(true)
+      const [enabled, setEnabled] = useState(false)
       const currentPageId = useMemo(() => ++pageId, [])
       const intersectionObservers = useRef({})
       usePageStatus(navigation, currentPageId)
@@ -505,20 +513,38 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
           },
           headerTintColor: pageConfig.navigationBarTextStyle || 'white'
         })
-        if (__mpx_mode__ === 'android') {
-          ReactNative.StatusBar.setBarStyle(pageConfig.barStyle || 'dark-content')
+
+        const setStatusBar = (config) => {
+          ReactNative.StatusBar.setBarStyle(config.barStyle || 'dark-content')
           ReactNative.StatusBar.setTranslucent(isCustom) // 控制statusbar是否占位
-          const color = isCustom ? 'transparent' : pageConfig.statusBarColor
+          const color = isCustom ? 'transparent' : config.statusBarColor
           color && ReactNative.StatusBar.setBackgroundColor(color)
         }
+        if (__mpx_mode__ === 'android') {
+          pageConfigStack.push(pageConfig)
+          setStatusBar(pageConfig)
+        }
+        return () => {
+          if (__mpx_mode__ === 'android') {
+            pageConfigStack.pop()
+            const config = pageConfigStack[pageConfigStack.length - 1] || {}
+            setStatusBar(config)
+          }
+        };
       }, [])
 
       const rootRef = useRef(null)
-      const onLayout = useCallback(() => {
-        rootRef.current?.measureInWindow((x, y, width, height) => {
-          navigation.layout = { x, y, width, height }
-        })
-      }, [])
+
+      useEffect(() => {
+        const unsubscribe = navigation.addListener('transitionEnd', (e) => {
+          setTimeout(() => {
+            rootRef.current?.measureInWindow((x, y, width, height) => {
+              navigation.layout = { x, y, width, height }
+            })
+          }, 200)
+        });
+        return unsubscribe;
+      }, [navigation]);
 
       const withKeyboardAvoidingView = (element) => {
         if (__mpx_mode__ === 'ios') {
@@ -546,6 +572,14 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
 
       navigation.insets = useSafeAreaInsets()
 
+      const [, setState] = useState(1)
+
+      const setStateRef = useRef(setState)
+
+      if (setStateRef.current !== setState) {
+        setStateRef.current = setState
+      }
+
       return createElement(GestureHandlerRootView,
         {
           style: {
@@ -559,8 +593,7 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
                 flex: 1,
                 backgroundColor: pageConfig.backgroundColor || '#ffffff'
               },
-              ref: rootRef,
-              onLayout
+              ref: rootRef
             },
             createElement(RouteContext.Provider,
               {

package/src/platform/patch/getDefaultOptions.js

@@ -23,11 +23,13 @@ function transformProperties (properties) {
     } else {
       newFiled = Object.assign({}, rawFiled)
     }
+    const rawObserver = rawFiled?.observer
     newFiled.observer = function (value, oldValue) {
       if (this.__mpxProxy) {
         this[key] = value
         this.__mpxProxy.propsUpdated()
       }
+      rawObserver && rawObserver.call(this, value, oldValue)
     }
     newProps[key] = newFiled
   })