Skip to content
This repository was archived by the owner on Sep 21, 2019. It is now read-only.

Use React.ReactNode for React.PropTypes.node type #9

Merged
merged 2 commits into from
Jul 16, 2017
Merged

Use React.ReactNode for React.PropTypes.node type #9

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
d74a8dd
Update readme: dynamic state is not optional becasue react state is a…
Jul 16, 2017
19088f3
Use React.ReactNode
Jul 16, 2017
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ type MyComponentProps = {
type MyComponentState = {
foo: number;
bar: string;
baz: number | undefined;
baz: number;
}

class MyComponent extends React.Component<MyComponentProps, MyComponentState> {
Expand Down
8 changes: 1 addition & 7 deletions src/transforms/react-js-make-props-and-state-transform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,13 +271,7 @@ export function reactJSMakePropsAndStateInterfaceTransformFactoryFactory(typeChe
} else if (/object/.test(text)) {
result = ts.createKeywordTypeNode(ts.SyntaxKind.ObjectKeyword);
} else if (/node/.test(text)) {
result = ts.createUnionOrIntersectionTypeNode(
ts.SyntaxKind.UnionType, [
ts.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword),
ts.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
ts.createTypeReferenceNode('JSX.Element', [])
]
)
result = ts.createTypeReferenceNode('React.ReactNode', []);
} else if (/element/.test(text)) {
result = ts.createTypeReferenceNode('JSX.Element', []);
} else if (/func/.test(text)) {
Expand Down
4 changes: 2 additions & 2 deletions test/react-js-make-props-and-state-transform/static-proptypes-many-props/output.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default class MyComponent extends React.Component<{
number?: number;
object?: object;
string?: string;
node?: number | string | JSX.Element;
node?: React.ReactNode;
element?: JSX.Element;
anyRequired: any;
arrayRequired: any[];
Expand All @@ -17,7 +17,7 @@ export default class MyComponent extends React.Component<{
numberRequired: number;
objectRequired: object;
stringRequired: string;
nodeRequired: number | string | JSX.Element;
nodeRequired: React.ReactNode;
elementRequired: JSX.Element;
}, {}> {
static propTypes = {
Expand Down