@react-navigation/core 7.14.0 → 8.0.0-alpha.1

package/src/getActionFromState.tsx

@@ -167,9 +167,10 @@ export function getActionFromState(
 const createNormalizedConfigItem = (config: PathConfig<object> | string) =>
   typeof config === 'object' && config != null
     ? {
-        initialRouteName: config.initialRouteName,
+        initialRouteName:
+          'initialRouteName' in config ? config.initialRouteName : undefined,
         screens:
-          config.screens != null
+          'screens' in config && config.screens != null
             ? createNormalizedConfigs(config.screens)
             : undefined,
       }
@@ -177,6 +178,7 @@ const createNormalizedConfigItem = (config: PathConfig<object> | string) =>
 
 const createNormalizedConfigs = (options: PathConfigMap<object>) =>
   Object.entries(options).reduce<Record<string, ConfigItem>>((acc, [k, v]) => {
+    // @ts-expect-error -we can't properly type this
     acc[k] = createNormalizedConfigItem(v);
     return acc;
   }, {});

package/src/getPathFromState.tsx

@@ -17,7 +17,7 @@ type Options<ParamList extends {}> = {
 
 type State = NavigationState | Omit<PartialState<NavigationState>, 'stale'>;
 
-type StringifyConfig = Record<string, (value: unknown) => string>;
+type StringifyConfig = Record<string, ((value: unknown) => string) | undefined>;
 
 type ConfigItem = {
   parts?: PatternPart[];
@@ -288,7 +288,7 @@ export function getPathFromState<ParamList extends {}>(
 }
 
 const createConfigItem = (
-  config: PathConfig<object> | string,
+  config: PathConfig<{}> | string,
   parentParts?: PatternPart[]
 ): ConfigItem => {
   if (typeof config === 'string') {
@@ -320,9 +320,10 @@ const createConfigItem = (
         ? getPatternParts(config.path)
         : undefined;
 
-  const screens = config.screens
-    ? createNormalizedConfigs(config.screens, parts)
-    : undefined;
+  const screens =
+    'screens' in config && config.screens
+      ? createNormalizedConfigs(config.screens, parts)
+      : undefined;
 
   return {
     parts,

package/src/getStateFromPath.tsx

@@ -1,7 +1,6 @@
 import type {
   InitialState,
   NavigationState,
-  ParamListBase,
   PartialState,
 } from '@react-navigation/routers';
 import escape from 'escape-string-regexp';
@@ -20,7 +19,7 @@ type Options<ParamList extends {}> = {
   screens: PathConfigMap<ParamList>;
 };
 
-type ParseConfig = Record<string, (value: string) => unknown>;
+type ParseConfig = Record<string, ((value: string) => unknown) | undefined>;
 
 type RouteConfig = {
   screen: string;
@@ -213,7 +212,7 @@ function getInitialRoutes(options?: Options<{}>) {
 
 function getSortedNormalizedConfigs(
   initialRoutes: InitialRouteConfig[],
-  screens: Record<string, string | PathConfig<ParamListBase>> = {}
+  screens: Record<string, string | PathConfig<{}>> = {}
 ) {
   // Create a normalized configs array which will be easier to use
   return ([] as RouteConfig[])
@@ -418,7 +417,7 @@ const matchAgainstConfigs = (remaining: string, configs: RouteConfig[]) => {
 
 const createNormalizedConfigs = (
   screen: string,
-  routeConfig: Record<string, string | PathConfig<ParamListBase>>,
+  routeConfig: Record<string, string | PathConfig<{}>>,
   initials: InitialRouteConfig[],
   paths: { screen: string; path: string }[],
   parentScreens: string[],
@@ -500,9 +499,12 @@ const createNormalizedConfigs = (
       );
     }
 
-    if (config.screens) {
+    if ('screens' in config && config.screens) {
       // property `initialRouteName` without `screens` has no purpose
-      if (config.initialRouteName) {
+      if (
+        'initialRouteName' in config &&
+        typeof config.initialRouteName === 'string'
+      ) {
         initials.push({
           initialRouteName: config.initialRouteName,
           parentScreens,
@@ -512,7 +514,7 @@ const createNormalizedConfigs = (
       Object.keys(config.screens).forEach((nestedConfig) => {
         const result = createNormalizedConfigs(
           nestedConfig,
-          config.screens as Record<string, string | PathConfig<ParamListBase>>,
+          config.screens as Record<string, string | PathConfig<{}>>,
           initials,
           [...paths],
           [...parentScreens],
@@ -709,10 +711,7 @@ const createNestedStateObject = (
   return state;
 };
 
-const parseQueryParams = (
-  path: string,
-  parseConfig?: Record<string, (value: string) => unknown>
-) => {
+const parseQueryParams = (path: string, parseConfig?: ParseConfig) => {
   const query = path.split('?')[1];
   const params: Record<string, unknown> = queryString.parse(query);
 
@@ -720,6 +719,7 @@ const parseQueryParams = (
     Object.keys(params).forEach((name) => {
       if (
         Object.hasOwnProperty.call(parseConfig, name) &&
+        parseConfig[name] &&
         typeof params[name] === 'string'
       ) {
         params[name] = parseConfig[name](params[name]);

package/src/index.tsx

@@ -8,21 +8,25 @@ export { getFocusedRouteNameFromRoute } from './getFocusedRouteNameFromRoute';
 export { getPathFromState } from './getPathFromState';
 export { getStateFromPath } from './getStateFromPath';
 export { NavigationContainerRefContext } from './NavigationContainerRefContext';
-export { NavigationContext } from './NavigationContext';
 export { NavigationHelpersContext } from './NavigationHelpersContext';
 export { NavigationIndependentTree } from './NavigationIndependentTree';
 export { NavigationMetaContext } from './NavigationMetaContext';
-export { NavigationRouteContext } from './NavigationRouteContext';
+export {
+  NavigationContext,
+  NavigationProvider,
+  NavigationRouteContext,
+} from './NavigationProvider';
 export { PreventRemoveContext } from './PreventRemoveContext';
 export { PreventRemoveProvider } from './PreventRemoveProvider';
 export {
   createComponentForStaticNavigation,
   createPathConfigForStaticNavigation,
   type StaticConfig,
-  type StaticConfigGroup,
-  type StaticConfigScreens,
   type StaticNavigation,
   type StaticParamList,
+  type StaticScreenConfig,
+  type StaticScreenConfigLinking,
+  type StaticScreenConfigScreen,
   type StaticScreenProps,
 } from './StaticNavigation';
 export { ThemeContext } from './theming/ThemeContext';

package/src/theming/ThemeContext.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 
-export const ThemeContext = React.createContext<
-  ReactNavigation.Theme | undefined
->(undefined);
+import type { Theme } from '../types';
+
+export const ThemeContext = React.createContext<Theme | undefined>(undefined);
 
 ThemeContext.displayName = 'ThemeContext';

package/src/theming/ThemeProvider.tsx

@@ -1,9 +1,10 @@
 import * as React from 'react';
 
+import type { Theme } from '../types';
 import { ThemeContext } from './ThemeContext';
 
 type Props = {
-  value: ReactNavigation.Theme | undefined;
+  value: Theme | undefined;
   children: React.ReactNode;
 };
 

package/src/theming/useTheme.tsx

@@ -7,7 +7,7 @@ export function useTheme() {
 
   if (theme == null) {
     throw new Error(
-      "Couldn't find a theme. Is your component inside NavigationContainer or does it have a theme?"
+      "Couldn't find a theme. Is your component inside NavigationContainer or a ThemeProvider?"
     );
   }