Fix props validation for nested stateless components (fixes #331)

jsx-eslint · Nov 28, 2015 · f1ca75d · f1ca75d
1 parent bccf86b
commit f1ca75d
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 7 deletions.
diff --git a/lib/rules/prop-types.js b/lib/rules/prop-types.js
@@ -153,15 +153,23 @@ module.exports = Components.detect(function(context, components, utils) {
 
   /**
    * Checks if the prop is declared
-   * @param {Object} component The component to process
+   * @param {ASTNode} node The AST node being checked.
    * @param {String[]} names List of names of the prop to check.
    * @returns {Boolean} True if the prop is declared, false if not.
    */
-  function isDeclaredInComponent(component, names) {
-    return _isDeclaredInComponent(
-      component.declaredPropTypes || {},
-      names
-    );
+  function isDeclaredInComponent(node, names) {
+    while (node) {
+      var component = components.get(node);
+      var isDeclared =
+        component && component.confidence === 2 &&
+        _isDeclaredInComponent(component.declaredPropTypes || {}, names)
+      ;
+      if (isDeclared) {
+        return true;
+      }
+      node = node.parent;
+    }
+    return false;
   }
 
   /**
@@ -532,7 +540,7 @@ module.exports = Components.detect(function(context, components, utils) {
       allNames = component.usedPropTypes[i].allNames;
       if (
         isIgnored(allNames[0]) ||
-        isDeclaredInComponent(component, allNames)
+        isDeclaredInComponent(component.node, allNames)
       ) {
         continue;
       }

diff --git a/tests/lib/rules/prop-types.js b/tests/lib/rules/prop-types.js
@@ -935,6 +935,24 @@ ruleTester.run('prop-types', rule, {
         jsx: true,
         experimentalObjectRestSpread: true
       }
+    }, {
+      code: [
+        'const statelessComponent = (props) => {',
+        '  const subRender = () => {',
+        '    return <span>{props.someProp}</span>;',
+        '  };',
+        '  return <div>{subRender()}</div>;',
+        '};',
+        'statelessComponent.propTypes = {',
+        '  someProp: PropTypes.string',
+        '};'
+      ].join('\n'),
+      env: {
+        es6: true
+      },
+      ecmaFeatures: {
+        jsx: true
+      }
     }
   ],