fix: Fix unions generating invalid prop types.

milesj · Jan 28, 2020 · 172092d · 172092d
1 parent 12aea4c
commit 172092d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/src/convertBabelToPropTypes.ts b/src/convertBabelToPropTypes.ts
@@ -249,7 +249,6 @@ function convert(type: any, state: ConvertState, depth: number): PropType | null
   } else if (t.isTSUnionType(type) || t.isTSIntersectionType(type)) {
     const isAllLiterals = type.types.every(param => t.isTSLiteralType(param));
     const containsAny = type.types.some(param => t.isTSAnyKeyword(param));
-    const containsNull = type.types.some(param => t.isTSNullKeyword(param));
     let label;
     let args;
 
@@ -267,7 +266,7 @@ function convert(type: any, state: ConvertState, depth: number): PropType | null
       label = t.identifier('oneOfType');
 
       // Contained unresolved references, so just omit for now
-      if (args.length !== type.types.length && args.length === 1 && (containsAny || containsNull)) {
+      if (args.length !== type.types.length) {
         return null;
       }
     }

diff --git a/tests/__snapshots__/index.test.ts.snap b/tests/__snapshots__/index.test.ts.snap
@@ -1444,17 +1444,11 @@ export interface Props {
 export default class NullUndefined extends React.Component<Props> {
   static propTypes = {
     nullable: _pt.oneOfType([_pt.string, _pt.oneOf([null])]),
-    undefined: _pt.oneOfType([_pt.string]),
     optional: _pt.string,
-    optionalUndefined: _pt.oneOfType([_pt.string]),
     optionalNullable: _pt.oneOfType([_pt.string, _pt.oneOf([null])]),
-    optionalBoth: _pt.oneOfType([_pt.string, _pt.oneOf([null])]),
     literalNullable: _pt.oneOfType([_pt.oneOf(['foo']), _pt.oneOf([null])]),
-    literalUndefined: _pt.oneOfType([_pt.oneOf(['foo'])]),
     literalOptional: _pt.oneOf(['foo']),
-    literalOptionalUndefined: _pt.oneOfType([_pt.oneOf(['foo'])]),
-    literalOptionalNullable: _pt.oneOfType([_pt.oneOf(['foo']), _pt.oneOf([null])]),
-    literalOptionalBoth: _pt.oneOfType([_pt.oneOf(['foo']), _pt.oneOf([null])])
+    literalOptionalNullable: _pt.oneOfType([_pt.oneOf(['foo']), _pt.oneOf([null])])
   };
 
   render() {
@@ -1640,7 +1634,7 @@ export interface Props {
   typeRefIntersection?: Foo & Bar;
   enumUnion: Color.RED | Color.BLUE;
   enumIntersection: Color.BLUE & Color.GREEN;
-  missingToNull?: InvalidReference | null;
+  missingRefs?: InvalidReference | null;
 }
 export default class TypeUnionIntersection extends React.Component<Props> {
   static propTypes = {

diff --git a/tests/fixtures/type-unions.ts b/tests/fixtures/type-unions.ts
@@ -28,7 +28,7 @@ export interface Props {
   enumUnion: Color.RED | Color.BLUE;
   enumIntersection: Color.BLUE & Color.GREEN;
   // @ts-ignore
-  missingToNull?: InvalidReference | null;
+  missingRefs?: InvalidReference | null;
 }
 
 export default class TypeUnionIntersection extends React.Component<Props> {