Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion demos/intermediate/src/containers/NotFound/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const NotFound: ErrorPageComponentType = ({ error }) => (
<img className={styles.image} src={`/img/missingno.png`} alt="Not found" />
<h1 className={styles.title}>Uh-oh!</h1>
<p className={styles.body}>We couldn't catch that Pokémon.</p>
{error && <small className={styles.error}>{error}</small>}
{error instanceof Error && <small className={styles.error}>{error.message}</small>}

<Link to="/">View 'em all</Link>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/page-components.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ import {
const NotFound: ErrorPageComponentType = ({ error }) => (
<div>
<h1>Not found.</h1>
{error && <p>{error}</p>}
{error instanceof Error && <p>{error.message}</p>}
</div>
);

Expand Down
9 changes: 4 additions & 5 deletions package/src/Guard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import {
NextAction,
NextPropsPayload,
NextRedirectPayload,
RouteError,
} from './types';

type PageProps = NextPropsPayload;
Expand All @@ -40,7 +39,7 @@ const Guard: React.FunctionComponent<GuardProps> = ({ children, component, meta,
const hasGuards = useMemo(() => !!(guards && guards.length > 0), [guards]);
const [validationsRequested, setValidationsRequested] = useStateRef<number>(0);
const [routeValidated, setRouteValidated] = useStateRef<boolean>(!hasGuards);
const [routeError, setRouteError] = useStateWhenMounted<RouteError>(null);
const [routeError, setRouteError] = useStateWhenMounted<unknown>(undefined);
const [routeRedirect, setRouteRedirect] = useStateWhenMounted<RouteRedirect>(null);
const [pageProps, setPageProps] = useStateWhenMounted<PageProps>({});

Expand Down Expand Up @@ -126,15 +125,15 @@ const Guard: React.FunctionComponent<GuardProps> = ({ children, component, meta,
const currentRequests = validationsRequested.current;

let pageProps: PageProps = {};
let routeError: RouteError = null;
let routeError: unknown = undefined;
let routeRedirect: RouteRedirect = null;

try {
const { props, redirect } = await resolveAllGuards();
pageProps = props;
routeRedirect = redirect;
} catch (error) {
routeError = error.message || 'Not found.';
routeError = error;
}

if (currentRequests === getValidationsRequested()) {
Expand All @@ -152,7 +151,7 @@ const Guard: React.FunctionComponent<GuardProps> = ({ children, component, meta,
useEffect(() => {
if (hasPathChanged) {
setValidationsRequested(requests => requests + 1);
setRouteError(null);
setRouteError(undefined);
setRouteRedirect(null);
setRouteValidated(!hasGuards);
if (hasGuards) {
Expand Down
1 change: 0 additions & 1 deletion package/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ export {
GuardFunction,
GuardProviderProps,
Next,
RouteError,
PageComponent,
LoadingPageComponentType,
ErrorPageComponentType,
Expand Down
6 changes: 2 additions & 4 deletions package/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ export type GuardFunction = (
next: Next,
) => void;

export type RouteError = string | null;

/**
* Page Component Types
*/
Expand All @@ -72,10 +70,10 @@ export type PageComponent<P = {}> =
| number;

export type LoadingPageComponent = PageComponent;
export type ErrorPageComponent = PageComponent<{ error: RouteError }>;
export type ErrorPageComponent = PageComponent<{ error: unknown }>;

export type LoadingPageComponentType = PageComponentType;
export type ErrorPageComponentType = PageComponentType<{ error: RouteError }>;
export type ErrorPageComponentType = PageComponentType<{ error: unknown }>;

/**
* Props
Expand Down