[feat]optimize Dimensions change event

CommanderXL · Aug 20, 2024 · 829e00d · 829e00d
1 parent ba66a52
commit 829e00d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 20 deletions.
diff --git a/packages/core/src/platform/createApp.ios.js b/packages/core/src/platform/createApp.ios.js
@@ -10,6 +10,10 @@ import { ref } from '../observer/ref'
 
 const appHooksMap = makeMap(mergeLifecycle(wxLifecycle.LIFECYCLE).app)
 
+function getOrientation (window = ReactNative.Dimensions.get('window')) {
+  return window.width > window.height ? 'landscape' : 'portrait'
+}
+
 function filterOptions (options, appData) {
   const newOptions = {}
   Object.keys(options).forEach(key => {
@@ -115,8 +119,18 @@ export default function createApp (option, config = {}) {
           })
         }
       })
+
+      let count = 0
+      let lastOrientation = getOrientation()
+      const resizeSubScription = ReactNative.Dimensions.addEventListener('change', ({ window }) => {
+        const orientation = getOrientation(window)
+        if (orientation === lastOrientation) return
+        lastOrientation = orientation
+        global.__mpxAppFocusedState.value = `resize${count++}`
+      })
       return () => {
         changeSubscription()
+        resizeSubScription && resizeSubScription.remove()
       }
     }, [])
 

diff --git a/packages/core/src/platform/patch/react/getDefaultOptions.ios.js b/packages/core/src/platform/patch/react/getDefaultOptions.ios.js
@@ -9,15 +9,11 @@ import { BEFOREUPDATE, ONLOAD, UPDATED, ONSHOW, ONHIDE, ONRESIZE } from '../../.
 import mergeOptions from '../../../core/mergeOptions'
 import { queueJob } from '../../../observer/scheduler'
 
-function getOrientation (window = ReactNative.Dimensions.get('window')) {
-  return window.width > window.height ? 'landscape' : 'portrait'
-}
-
 function getSystemInfo () {
   const window = ReactNative.Dimensions.get('window')
   const screen = ReactNative.Dimensions.get('screen')
   return {
-    deviceOrientation: getOrientation(),
+    deviceOrientation: window.width > window.height ? 'landscape' : 'portrait',
     size: {
       screenWidth: screen.width,
       screenHeight: screen.height,
@@ -303,25 +299,10 @@ function usePageStatus (navigation, route) {
       }
     })
 
-    let count = 0
-    let lastOrientation = getOrientation()
-    const resizeSubScription = ReactNative.Dimensions.addEventListener(
-      'change',
-      ({ window }) => {
-        const orientation = getOrientation(window)
-        if (orientation === lastOrientation) return
-        lastOrientation = orientation
-        if (isFocused) {
-          setPageStatus(route.name, `resize${count++}`)
-        }
-      }
-    )
-
     return () => {
       focusSubscription()
       blurSubscription()
       appFocusedStateWatcher()
-      resizeSubScription && resizeSubScription.remove()
     }
   }, [navigation])
 }