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

package/package.json

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

package/src/platform/createApp.ios.js

@@ -183,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,6 +381,7 @@ function usePageStatus (navigation, pageId) {
       focusSubscription()
       blurSubscription()
       unWatchAppFocusedState()
+      transitionEndSubscription()
       del(pageStatusMap, pageId)
     }
   }, [navigation])
@@ -530,9 +537,11 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
 
       useEffect(() => {
         const unsubscribe = navigation.addListener('transitionEnd', (e) => {
-          rootRef.current?.measureInWindow((x, y, width, height) => {
-            navigation.layout = { x, y, width, height }
-          })
+          setTimeout(() => {
+            rootRef.current?.measureInWindow((x, y, width, height) => {
+              navigation.layout = { x, y, width, height }
+            })
+          }, 200)
         });
         return unsubscribe;
       }, [navigation]);