Merge pull request #1563 from justinanastos/fix/prop-types-union-flow…

…type-1468 Fix crash when using Unions in flow propTypes
jsx-eslint · Nov 22, 2017 · df17cd4 · df17cd4
2 parents 6829c5c + dd10851
commit df17cd4
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 0 deletions.
diff --git a/lib/rules/no-unused-prop-types.js b/lib/rules/no-unused-prop-types.js
@@ -780,6 +780,10 @@ module.exports = {
           return declarePropTypesForObjectTypeAnnotation(annotation, declaredPropTypes);
         }
 
+        if (annotation.type === 'UnionTypeAnnotation') {
+          return true;
+        }
+
         const typeNode = typeScope(annotation.id.name);
 
         if (!typeNode) {

diff --git a/lib/rules/prop-types.js b/lib/rules/prop-types.js
@@ -726,6 +726,10 @@ module.exports = {
           return declarePropTypesForObjectTypeAnnotation(annotation, declaredPropTypes);
         }
 
+        if (annotation.type === 'UnionTypeAnnotation') {
+          return true;
+        }
+
         const typeNode = typeScope(annotation.id.name);
 
         if (!typeNode) {

diff --git a/tests/lib/rules/no-unused-prop-types.js b/tests/lib/rules/no-unused-prop-types.js
@@ -1097,6 +1097,28 @@ ruleTester.run('no-unused-prop-types', rule, {
         '}'
       ].join('\n'),
       parser: 'babel-eslint'
+    }, {
+      code: [
+        'type PropsUnionA = {',
+        '  a: string,',
+        '  b?: void,',
+        '};',
+        'type PropsUnionB = {',
+        '  a?: void,',
+        '  b: string,',
+        '};',
+        'type Props = {',
+        '  name: string,',
+        '} & (PropsUnionA | PropsUnionB);',
+        'class Hello extends React.Component {',
+        '  props: Props;',
+        '  render() {',
+        '    const {name} = this.props;',
+        '    return name;',
+        '  }',
+        '}'
+      ].join('\n'),
+      parser: 'babel-eslint'
     }, {
       code: [
         'Card.propTypes = {',

diff --git a/tests/lib/rules/prop-types.js b/tests/lib/rules/prop-types.js
@@ -1129,6 +1129,28 @@ ruleTester.run('prop-types', rule, {
         '}'
       ].join('\n'),
       parser: 'babel-eslint'
+    }, {
+      code: [
+        'type PropsUnionA = {',
+        '  a: string,',
+        '  b?: void,',
+        '};',
+        'type PropsUnionB = {',
+        '  a?: void,',
+        '  b: string,',
+        '};',
+        'type Props = {',
+        '  name: string,',
+        '} & (PropsUnionA | PropsUnionB);',
+        'class Hello extends React.Component {',
+        '  props: Props;',
+        '  render() {',
+        '    const {name} = this.props;',
+        '    return name;',
+        '  }',
+        '}'
+      ].join('\n'),
+      parser: 'babel-eslint'
     }, {
       code: [
         'Card.propTypes = {',