Skip to content

[react] Change React StatelessComponent return type to ReactNode #25349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jstcki wants to merge 2 commits into from
Closed

[react] Change React StatelessComponent return type to ReactNode #25349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cddb98b
Fix React StatelessComponent return type
jstcki Apr 26, 2018
b36083e
Change JSX.Element to React.ReactNode
jstcki May 3, 2018
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
7 changes: 3 additions & 4 deletions types/react/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,15 +324,15 @@ declare namespace React {

type SFC<P = {}> = StatelessComponent<P>;
interface StatelessComponent<P = {}> {
(props: P & { children?: ReactNode }, context?: any): ReactElement<any> | null;
(props: P & { children?: ReactNode }, context?: any): ReactNode;
propTypes?: ValidationMap<P>;
contextTypes?: ValidationMap<any>;
defaultProps?: Partial<P>;
displayName?: string;
}

interface RefForwardingComponent<T, P = {}> {
(props: P & { children?: ReactNode }, ref?: Ref<T>): ReactElement<any> | null;
(props: P & { children?: ReactNode }, ref?: Ref<T>): ReactNode;
propTypes?: ValidationMap<P>;
contextTypes?: ValidationMap<any>;
defaultProps?: Partial<P>;
Expand Down Expand Up @@ -2232,8 +2232,7 @@ declare namespace React {

declare global {
namespace JSX {
// tslint:disable-next-line:no-empty-interface
interface Element extends React.ReactElement<any> { }
type Element = React.ReactNode;
interface ElementClass extends React.Component<any> {
render(): React.ReactNode;
}
Expand Down
7 changes: 5 additions & 2 deletions types/react/test/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,11 @@ const StatelessComponent3: React.SFC<SCProps> =
// allows null return
props => props.foo ? DOM.div(null, props.foo, props.children) : null;

// allows null as props
const StatelessComponent4: React.SFC = props => null;
// allows any ReactNode as return type
const StatelessComponent4: React.SFC = () => [1, "foo", null, false, true];

// allows children as return
const StatelessComponent5: React.SFC = ({children}) => children;

// React.createFactory
const factory: React.CFactory<Props, ModernComponent> =
Expand Down