Fix propTypes detection when declared before the component (fixes #472)

jsx-eslint · Feb 29, 2016 · 1b0caca · 1b0caca
1 parent 45b3c27
commit 1b0caca
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/lib/util/Components.js b/lib/util/Components.js
@@ -24,6 +24,7 @@ function Components() {
  *
  * @param {ASTNode} node The AST node being added.
  * @param {Number} confidence Confidence in the component detection (0=banned, 1=maybe, 2=yes)
+ * @returns {Object} Added component object
  */
 Components.prototype.add = function(node, confidence) {
   var id = this._getId(node);
@@ -33,12 +34,13 @@ Components.prototype.add = function(node, confidence) {
     } else {
       this._list[id].confidence = Math.max(this._list[id].confidence, confidence);
     }
-    return;
+    return this._list[id];
   }
   this._list[id] = {
     node: node,
     confidence: confidence
   };
+  return this._list[id];
 };
 
 /**
@@ -333,7 +335,7 @@ function componentRule(rule, context) {
       }
 
       // Return the component
-      return components.get(node);
+      return components.add(node, 1);
     }
   };
 

diff --git a/tests/lib/rules/prop-types.js b/tests/lib/rules/prop-types.js
@@ -1145,6 +1145,20 @@ ruleTester.run('prop-types', rule, {
         '}'
       ].join('\n'),
       parser: 'babel-eslint'
+    }, {
+      code: [
+        'Card.propTypes = {',
+        '  title: PropTypes.string.isRequired,',
+        '  children: PropTypes.element.isRequired,',
+        '  footer: PropTypes.node',
+        '}',
+        'function Card ({ title, children, footer }) {',
+        '  return (',
+        '    <div/>',
+        '  )',
+        '}'
+      ].join('\n'),
+      parserOptions: parserOptions
     }
   ],