expo-router 1.2.2 → 1.3.0

package/build/views/Splash.d.ts

@@ -0,0 +1,26 @@
+/**
+ * A stack based component for keeping the splash screen visible.
+ * Useful for stacked requests that need to be completed before the app is ready.
+ * After all instances have been unmounted, the splash screen will be hidden.
+ *
+ * @example
+ * ```tsx
+ * function App() {
+ *   const [isLoading, setIsLoading] = React.useState(true);
+ *
+ *   if (isLoading) {
+ *     return <SplashScreen />
+ *   }
+ *
+ *   return <Text>Ready!</Text>
+ * }
+ * ```
+ */
+export declare function SplashScreen(): null;
+export declare namespace SplashScreen {
+    var hideAsync: () => void;
+    var preventAutoHideAsync: () => void;
+    var _pushEntry: () => any;
+    var _popEntry: (entry: string) => void;
+}
+//# sourceMappingURL=Splash.d.ts.map

package/build/views/Splash.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Splash.d.ts","sourceRoot":"","sources":["../../src/views/Splash.tsx"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,YAAY,SAG3B;yBAHe,YAAY"}

package/build/views/Try.d.ts

@@ -0,0 +1,24 @@
+import React from "react";
+/** Props passed to a page's `ErrorBoundary` export. */
+export type ErrorBoundaryProps = {
+    /** Retry rendering the component by clearing the `error` state. */
+    retry: () => Promise<void>;
+    /** The error that was thrown. */
+    error: Error;
+};
+export declare class Try extends React.Component<{
+    catch: React.ComponentType<ErrorBoundaryProps>;
+    children: React.ReactNode;
+}, {
+    error?: Error;
+}> {
+    state: {
+        error: undefined;
+    };
+    static getDerivedStateFromError(error: Error): {
+        error: Error;
+    };
+    retry: () => Promise<void>;
+    render(): string | number | boolean | React.ReactFragment | JSX.Element | null | undefined;
+}
+//# sourceMappingURL=Try.d.ts.map

package/build/views/Try.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Try.d.ts","sourceRoot":"","sources":["../../src/views/Try.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,uDAAuD;AACvD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,mEAAmE;IACnE,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,iCAAiC;IACjC,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAGF,qBAAa,GAAI,SAAQ,KAAK,CAAC,SAAS,CACtC;IACE,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC;IAC/C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,EACD;IAAE,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,CAClB;IACC,KAAK;;MAAwB;IAE7B,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,KAAK;;;IAO5C,KAAK,sBAMH;IAEF,MAAM;CAQP"}

package/build/views/Unmatched.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+/** Default screen for unmatched routes. */
+export declare function Unmatched(): JSX.Element;
+//# sourceMappingURL=Unmatched.d.ts.map

package/build/views/Unmatched.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Unmatched.d.ts","sourceRoot":"","sources":["../../src/views/Unmatched.tsx"],"names":[],"mappings":";AAQA,2CAA2C;AAC3C,wBAAgB,SAAS,gBAwCxB"}

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "expo-router",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "main": "src/index.tsx",
-  "types": "src/index.tsx",
+  "types": "build/index.d.ts",
   "files": [
     "src",
+    "build",
     "node",
     "entry.js",
     "_root.tsx",
@@ -26,12 +27,12 @@
   },
   "homepage": "https://expo.github.io/router/docs/",
   "scripts": {
-    "build": "expo-module typecheck",
+    "build": "expo-module typecheck --noEmit false",
     "clean": "expo-module clean",
     "lint": "expo-module lint",
     "test": "expo-module test",
     "prepare": "expo-module prepare",
-    "prepublishOnly": "expo-module prepublishOnly",
+    "prepublishOnly": "expo-module prepublishOnly && expo-module typecheck --noEmit false",
     "expo-module": "expo-module"
   },
   "keywords": [
@@ -73,7 +74,7 @@
   },
   "dependencies": {
     "@bacons/react-views": "^1.1.3",
-    "@expo/metro-runtime": "1.1.0",
+    "@expo/metro-runtime": "1.1.1",
     "@radix-ui/react-slot": "^1.0.0",
     "@react-navigation/bottom-tabs": "~6.5.7",
     "@react-navigation/native": "~6.1.6",

package/src/fork/getStateFromPath.ts

@@ -472,8 +472,7 @@ const createNormalizedConfigs = (
 
   parentScreens.push(screen);
 
-  // @ts-expect-error
-  const config = routeConfig[screen];
+  const config = (routeConfig as any)[screen];
 
   if (typeof config === "string") {
     // If a string is specified as the value of the key(e.g. Foo: '/path'), use it as the pattern

package/src/link/Link.tsx

@@ -10,7 +10,7 @@ import useLinkToPathProps from "./useLinkToPathProps";
 import { useRouter } from "./useRouter";
 import { useFocusEffect } from "../useFocusEffect";
 
-type Props = {
+export interface LinkProps extends Omit<TextProps, "href" | "hoverStyle"> {
   /** Path to route to. */
   href: Href;
 
@@ -24,7 +24,7 @@ type Props = {
   onPress?: (
     e: React.MouseEvent<HTMLAnchorElement, MouseEvent> | GestureResponderEvent
   ) => void;
-} & (Omit<TextProps, "href" | "hoverStyle"> & { children?: React.ReactNode });
+}
 
 /** Redirects to the href as soon as the component is mounted. */
 export function Redirect({ href }: { href: Href }) {
@@ -35,6 +35,12 @@ export function Redirect({ href }: { href: Href }) {
   return null;
 }
 
+export interface LinkComponent {
+  (props: React.PropsWithChildren<LinkProps>): JSX.Element;
+  /** Helper method to resolve an Href object into a string. */
+  resolveHref: typeof resolveHref;
+}
+
 /**
  * Component to render link to another route using a path.
  * Uses an anchor tag on the web.
@@ -44,10 +50,9 @@ export function Redirect({ href }: { href: Href }) {
  * @param props.asChild Forward props to child component. Useful for custom buttons.
  * @param props.children Child elements to render the content.
  */
-export const Link = React.forwardRef(ExpoRouterLink) as {
-  /** Helper method to resolve an Href object into a string. */
-  resolveHref: typeof resolveHref;
-} & React.ForwardRefExoticComponent<Props>;
+export const Link = React.forwardRef(
+  ExpoRouterLink
+) as unknown as LinkComponent;
 
 Link.resolveHref = resolveHref;
 
@@ -58,7 +63,7 @@ function ExpoRouterLink(
     // TODO: This does not prevent default on the anchor tag.
     asChild,
     ...rest
-  }: Props,
+  }: LinkProps,
   ref: React.ForwardedRef<Text>
 ) {
   const resolvedHref = React.useMemo(() => {

package/src/link/href.ts

@@ -1,11 +1,11 @@
 export type Href = string | HrefObject;
 
-export type HrefObject = {
+export interface HrefObject {
   /** Path representing the selected route `/[id]`. */
   pathname?: string;
   /** Query parameters for the path. */
   params?: Record<string, any>;
-};
+}
 
 /** Resolve an href object into a fully qualified, relative href. */
 export const resolveHref = (href: Href): string => {

package/src/link/stateOperations.ts

@@ -1,12 +1,25 @@
-import { InitialState, NavigationState } from "@react-navigation/native";
+import {
+  InitialState,
+  NavigationState,
+  ParamListBase,
+  getActionFromState,
+} from "@react-navigation/native";
 
 import { ResultState } from "../fork/getStateFromPath";
 
-export type ActionParams = {
-  params?: ActionParams;
+export type NavigateAction = Extract<
+  ReturnType<typeof getActionFromState>,
+  { type: "NAVIGATE" }
+> & {
+  payload: NavigateActionParams;
+};
+
+export type NavigateActionParams = {
+  params?: NavigateActionParams;
   path: string;
   initial: boolean;
   screen: string;
+  name?: string;
 };
 
 // Get the last state for a given target state (generated from a path).
@@ -95,19 +108,12 @@ export function getQualifiedStateForTopOfTargetState(
   return currentRoot;
 }
 
-type SubState = NavigationState & {
-  key?: string;
-  type: string;
-  routes?: { name: string; state?: SubState }[];
-  index?: number;
-};
-
 // Given the root state and a target state from `getStateFromPath`,
 // return the root state containing the highest target route matching the root state.
 // This can be used to determine what type of navigator action should be used.
-export function getEarliestMismatchedRoute(
-  rootState: SubState | undefined,
-  actionParams: ActionParams & { name?: string }
+export function getEarliestMismatchedRoute<T extends ParamListBase>(
+  rootState: NavigationState<T> | undefined,
+  actionParams: NavigateActionParams
 ): { name: string; params?: any; type?: string } | null {
   const actionName = actionParams.name ?? actionParams.screen;
   if (!rootState?.routes || rootState.index == null) {
@@ -126,7 +132,9 @@ export function getEarliestMismatchedRoute(
     }
 
     return getEarliestMismatchedRoute(
-      nextCurrentRoot.state,
+      // @react-navigation/native types this as NavigationState | Partial<NavigationState> | undefined
+      // In our usage, it's always a NavigationState | undefined
+      nextCurrentRoot.state as NavigationState<T> | undefined,
       actionParams.params
     );
   }

package/src/link/useLinkToPath.ts

@@ -14,6 +14,7 @@ import {
   getEarliestMismatchedRoute,
   getQualifiedStateForTopOfTargetState,
   isMovingToSiblingRoute,
+  NavigateAction,
 } from "./stateOperations";
 import { useLinkingContext } from "./useLinkingContext";
 
@@ -116,14 +117,9 @@ export function useLinkToPath() {
         // Then find the nearest mismatched route in the existing state.
         // Finally, use the correct navigator-based action to replace the nested screens.
         // NOTE(EvanBacon): A future version of this will involve splitting the navigation request so we replace as much as possible, then push the remaining screens to fulfill the request.
-        if (
-          event === "REPLACE" &&
-          action.type === "NAVIGATE" &&
-          isAbsoluteInitialRoute(action)
-        ) {
+        if (event === "REPLACE" && isAbsoluteInitialRoute(action)) {
           const earliest = getEarliestMismatchedRoute(
             rootState,
-            // @ts-expect-error
             action.payload
           );
           if (earliest) {
@@ -159,7 +155,7 @@ export function useLinkToPath() {
 /** @returns `true` if the action is moving to the first screen of all the navigators in the action. */
 export function isAbsoluteInitialRoute(
   action: ReturnType<typeof getActionFromState>
-) {
+): action is NavigateAction {
   if (action?.type !== "NAVIGATE") {
     return false;
   }

package/src/ts-declarations.d.ts

@@ -0,0 +1 @@
+/// <reference path="../../../ts-declarations/index.d.ts" />

package/src/useFocusEffect.tsx

@@ -15,7 +15,7 @@ type EffectCallback = () => undefined | void | (() => void);
  */
 export function useFocusEffect(
   effect: EffectCallback,
-  do_not_pass_a_second_prop?: any
+  do_not_pass_a_second_prop?: never
 ) {
   const navigation = useOptionalNavigation();