@react-navigation/core 8.0.0-alpha.7 → 8.0.0-alpha.8

package/src/useNavigationBuilder.tsx

@@ -15,6 +15,7 @@ import * as React from 'react';
 import { isValidElementType } from 'react-is';
 import useLatestCallback from 'use-latest-callback';
 
+import { ConsumedParamsContext } from './ConsumedParamsContext';
 import { deepFreeze } from './deepFreeze';
 import { Group } from './Group';
 import { isArrayEqual } from './isArrayEqual';
@@ -62,8 +63,6 @@ type NavigatorRoute = {
   params?: NavigatorScreenParams<ParamListBase> | undefined;
 };
 
-const CONSUMED_PARAMS = Symbol('CONSUMED_PARAMS');
-
 const isScreen = (
   child: React.ReactElement<unknown>
 ): child is React.ReactElement<{
@@ -325,10 +324,11 @@ export function useNavigationBuilder<
 
   const route = React.use(NavigationRouteContext) as NavigatorRoute | undefined;
 
+  const consumedParams = React.use(ConsumedParamsContext);
+
   const isNestedParamsConsumed =
     typeof route?.params === 'object' && route.params != null
-      ? CONSUMED_PARAMS in route.params &&
-        route.params[CONSUMED_PARAMS] === route.params
+      ? consumedParams?.ref?.deref() === route.params
       : false;
 
   const {
@@ -722,20 +722,20 @@ export function useNavigationBuilder<
         : nextState;
   }
 
+  const setConsumedParamsRef = consumedParams?.setRef;
+
   React.useEffect(() => {
     if (
+      setConsumedParamsRef &&
       didConsumeNestedParams &&
       typeof route?.params === 'object' &&
       route.params != null
     ) {
       // Track whether the params have been already consumed
       // Set it to the same object, so merged params can be handled again
-      Object.defineProperty(route.params, CONSUMED_PARAMS, {
-        value: route.params,
-        enumerable: false,
-      });
+      setConsumedParamsRef(new WeakRef(route.params));
     }
-  }, [didConsumeNestedParams, route?.params]);
+  }, [didConsumeNestedParams, route?.params, setConsumedParamsRef]);
 
   const shouldUpdate = state !== nextState;