Merge pull request #153 from CalebMorris/fix/typeOfChildTypes

Change oneOfType to actually keep the child types (fixes #148)
jsx-eslint · Jul 15, 2015 · 4a91497 · 4a91497
2 parents ab4da9f + 6296ca3
commit 4a91497
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/lib/rules/prop-types.js b/lib/rules/prop-types.js
@@ -276,8 +276,9 @@ module.exports = function(context) {
                 unionTypeDefinition.children = true;
                 return unionTypeDefinition;
               }
-              unionTypeDefinition.children.push(type);
             }
+
+            unionTypeDefinition.children.push(type);
           }
           if (unionTypeDefinition.length === 0) {
             // no complex type found, simply accept everything

diff --git a/tests/lib/rules/prop-types.js b/tests/lib/rules/prop-types.js
@@ -351,6 +351,25 @@ eslintTester.addRuleTest('lib/rules/prop-types', {
         classes: true,
         jsx: true
       }
+    }, {
+      code: [
+        'class Hello extends React.Component {',
+        '  render() {',
+        '    this.props.a.length;',
+        '    return <div>Hello</div>;',
+        '  }',
+        '}',
+        'Hello.propTypes = {',
+        '  a: React.PropTypes.oneOfType([',
+        '    React.PropTypes.array,',
+        '    React.PropTypes.string',
+        '  ])',
+        '};'
+      ].join('\n'),
+      ecmaFeatures: {
+        classes: true,
+        jsx: true
+      }
     }, {
       code: [
         'class Hello extends React.Component {',