@react-navigation/core 7.0.0-rc.14 → 7.0.0-rc.15

package/src/getPathFromState.tsx

@@ -37,10 +37,24 @@ const getActiveRoute = (state: State): { name: string; params?: object } => {
   return route;
 };
 
-let cachedNormalizedConfigs: [
-  PathConfigMap<{}> | undefined,
-  Record<string, ConfigItem>,
-] = [undefined, {}];
+const cachedNormalizedConfigs = new WeakMap<
+  PathConfigMap<{}>,
+  Record<string, ConfigItem>
+>();
+
+const getNormalizedConfigs = (options?: Options<{}>) => {
+  if (!options?.screens) return {};
+
+  const cached = cachedNormalizedConfigs.get(options?.screens);
+
+  if (cached) return cached;
+
+  const normalizedConfigs = createNormalizedConfigs(options.screens);
+
+  cachedNormalizedConfigs.set(options.screens, normalizedConfigs);
+
+  return normalizedConfigs;
+};
 
 /**
  * Utility to serialize a navigation state object to a path string.
@@ -85,14 +99,7 @@ export function getPathFromState<ParamList extends {}>(
     validatePathConfig(options);
   }
 
-  // Create a normalized configs object which will be easier to use
-  if (cachedNormalizedConfigs[0] !== options?.screens) {
-    cachedNormalizedConfigs = [
-      options?.screens,
-      options?.screens ? createNormalizedConfigs(options.screens) : {},
-    ];
-  }
-  const configs: Record<string, ConfigItem> = cachedNormalizedConfigs[1];
+  const configs = getNormalizedConfigs(options);
 
   let path = '/';
   let current: State | undefined = state;

package/src/getStateFromPath.tsx

@@ -169,19 +169,22 @@ export function getStateFromPath<ParamList extends {}>(
 /**
  * Reference to the last used config resources. This is used to avoid recomputing the config resources when the options are the same.
  */
-let cachedConfigResources: [Options<{}> | undefined, ConfigResources] = [
-  undefined,
-  prepareConfigResources(),
-];
+const cachedConfigResources = new WeakMap<Options<{}>, ConfigResources>();
 
 function getConfigResources<ParamList extends {}>(
   options: Options<ParamList> | undefined
 ) {
-  if (cachedConfigResources[0] !== options) {
-    cachedConfigResources = [options, prepareConfigResources(options)];
-  }
+  if (!options) return prepareConfigResources();
+
+  const cached = cachedConfigResources.get(options);
+
+  if (cached) return cached;
+
+  const resources = prepareConfigResources(options);
+
+  cachedConfigResources.set(options, resources);
 
-  return cachedConfigResources[1];
+  return resources;
 }
 
 function prepareConfigResources(options?: Options<{}>) {