Merge pull request #1748 from didi/fix-rn-provider

feat: change the scope of Provider
didi · Dec 9, 2024 · ed5a794 · ed5a794
2 parents 0ed6586 + 659d7d0
commit ed5a794
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/packages/core/src/platform/patch/react/getDefaultOptions.ios.js b/packages/core/src/platform/patch/react/getDefaultOptions.ios.js
@@ -568,16 +568,16 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
                 ReactNative.Keyboard.isVisible() && ReactNative.Keyboard.dismiss()
               }
             },
-            createElement(Provider,
-              null,
-              createElement(RouteContext.Provider,
+            createElement(RouteContext.Provider,
+              {
+                value: currentPageId
+              },
+              createElement(IntersectionObserverContext.Provider,
                 {
-                  value: currentPageId
+                  value: intersectionObservers.current
                 },
-                createElement(IntersectionObserverContext.Provider,
-                  {
-                    value: intersectionObservers.current
-                  },
+                createElement(Provider,
+                  null,
                   createElement(defaultOptions,
                     {
                       navigation,
@@ -590,8 +590,8 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
             )
           )
         )
-        // todo custom portal host for active route
       )
+      // todo custom portal host for active route
     }
     return Page
   }