vhad/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/gosticks/DefinitelyTyped.git synced 2026-06-28 14:20:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for forwardedAs to styled-components (#41347)

Browse Source 
* Add support for forwardedAs to styled-components

* Test whether as/forwardedAs correctly rejects invalid props

* Revert "Test whether as/forwardedAs correctly rejects invalid props"

The newly added tests pass locally, but fail in automated testing, as per the comment on another case in test/index.tsx:580.

This reverts commit d09acb1eba6250b0761b2d626ce52d8e7df64310.
This commit is contained in:
Dominik Rowicki
2020-01-07 01:07:28 +01:00
committed by Armando Aguirre
parent 1100f122e4
commit dc4340f3da
4 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
types/styled-components/index.d.ts vendored
View File

@@ -89,7 +89,7 @@ type StyledComponentPropsWithAs<
T extends object,
O extends object,
A extends keyof any
> = StyledComponentProps<C, T, O, A> & { as?: C };
> = StyledComponentProps<C, T, O, A> & { as?: C, forwardedAs?: C };
export type FalseyValue = undefined | null | false;
export type Interpolation<P> =
@@ -190,6 +190,7 @@ export interface StyledComponentBase<
* String types need to be cast to themselves to become literal types (as={'a' as 'a'}).
*/
as?: keyof JSX.IntrinsicElements | React.ComponentType<any>;
forwardedAs?: keyof JSX.IntrinsicElements | React.ComponentType<any>;
}
): React.ReactElement<StyledComponentProps<C, T, O, A>>;

9
types/styled-components/test/index.tsx
View File

@@ -590,6 +590,15 @@ const asTest = (
</>
);
const ForwardedAsNestedComponent = styled.div``;
const ForwardedAsComponent = styled(ForwardedAsNestedComponent)``;
const forwardedAsTest = (
<>
<ForwardedAsComponent forwardedAs="h2" />
<ForwardedAsComponent forwardedAs={WithComponentH2} />
</>
);
interface TestContainerProps {
size: "big" | "small";
test?: boolean;

4
types/styled-components/ts3.7/index.d.ts vendored
View File

@@ -75,7 +75,7 @@ type StyledComponentPropsWithAs<
T extends object,
O extends object,
A extends keyof any
> = StyledComponentProps<C, T, O, A> & { as?: C };
> = StyledComponentProps<C, T, O, A> & { as?: C, forwardedAs?: C };
export type FalseyValue = undefined | null | false;
export type Interpolation<P> =
@@ -155,7 +155,7 @@ export interface StyledComponentBase<
> extends ForwardRefExoticBase<StyledComponentProps<C, T, O, A>> {
// add our own fake call signature to implement the polymorphic 'as' prop
(
props: StyledComponentProps<C, T, O, A> & { as?: never }
props: StyledComponentProps<C, T, O, A> & { as?: never, forwardedAs?: never }
): React.ReactElement<StyledComponentProps<C, T, O, A>>;
<AsC extends keyof JSX.IntrinsicElements | React.ComponentType<any> = C>(
props: StyledComponentPropsWithAs<AsC, T, O, A>

9
types/styled-components/ts3.7/test/index.tsx
View File

@@ -589,6 +589,15 @@ const asTest = (
</>
);
const ForwardedAsNestedComponent = styled.div``;
const ForwardedAsComponent = styled(ForwardedAsNestedComponent)``;
const forwardedAsTest = (
<>
<ForwardedAsComponent forwardedAs="h2" />
<ForwardedAsComponent forwardedAs={WithComponentH2} />
</>
);
interface TestContainerProps {
size: "big" | "small";
test?: boolean;