flip/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/FlipsideCrypto/DefinitelyTyped.git synced 2026-02-06 10:56:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[@types/react-router] Added undefined union type handling for useParams. (#43213)

Browse Source
This commit is contained in:
Pawel 2020-04-01 01:15:26 +02:00 committed by GitHub
parent be9dcd06bc
commit 314ba85888
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
types/react-router/index.d.ts vendored
View File

@ -20,6 +20,7 @@
// Wesley Tsai <https://github.com/wezleytsai>
// Sebastian Silbermann <https://github.com/eps1lon>
// Nicholas Hehr <https://github.com/HipsterBrown>
// Pawel Fajfer <https://github.com/pawfa>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
// TypeScript Version: 2.8
@ -161,7 +162,7 @@ export function useHistory<HistoryLocationState = H.LocationState>(): H.History<
export function useLocation<S = H.LocationState>(): H.Location<S>;
export function useParams<Params extends { [K in keyof Params]?: string } = {}>(): { [p in keyof Params]: string };
export function useParams<Params extends { [K in keyof Params]?: string } = {}>(): { [p in keyof Params]: keyof Params[p] extends undefined ? string | undefined : string };
export function useRouteMatch<Params extends { [K in keyof Params]?: string } = {}>(): match<Params>;
export function useRouteMatch<Params extends { [K in keyof Params]?: string } = {}>(

9
types/react-router/test/hooks.tsx
View File

@ -5,6 +5,11 @@ interface Params {
id: string;
}
interface OptionalParams {
id?: string;
s: string | undefined;
}
interface LocationState {
s: string;
}
@ -14,6 +19,8 @@ const HooksTest: React.FC = () => {
const location = useLocation<LocationState>();
const { id } = useParams();
const params = useParams<Params>();
// $ExpectType { id?: string | undefined; s: string | undefined; }
const optionalParams = useParams<OptionalParams>();
// $ExpectType match<Params> | null
const match1 = useRouteMatch<Params>('/:id');
// $ExpectType match<Params> | null
@ -27,6 +34,8 @@ const HooksTest: React.FC = () => {
location.state.s;
id && id.replace;
params.id.replace;
optionalParams.id && optionalParams.id.replace;
optionalParams.s && optionalParams.s.replace;
match1 && match1.params.id.replace;
match2 && match2.params.id.replace;
match3 && match3.params.id.replace;