Fix scope limit for stateless component detection (fixes #268)

jsx-eslint · Nov 4, 2015 · a98fa94 · a98fa94
1 parent 1a5143a
commit a98fa94
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 8 deletions.
diff --git a/lib/rules/prop-types.js b/lib/rules/prop-types.js
@@ -417,10 +417,13 @@ module.exports = Components.detect(function(context, components) {
         if (Object.prototype[name]) {
           break;
         }
+
+        var isDirectProp = /^props\./.test(context.getSource(node));
+
         usedPropTypes.push({
           name: name,
           allNames: allNames,
-          node: node.object.name !== 'props' && !inConstructor() ? node.parent.property : node.property
+          node: !isDirectProp && !inConstructor(node) ? node.parent.property : node.property
         });
         break;
       case 'destructuring':

diff --git a/lib/util/Components.js b/lib/util/Components.js
@@ -202,14 +202,17 @@ function componentRule(rule, context) {
      */
     getParentStatelessComponent: function() {
       var scope = context.getScope();
-      var node = scope.block;
-      var isNotAFunction = !/Function/.test(node.type); // Ignore non functions
-      var isMethod = node.parent && node.parent.type === 'MethodDefinition'; // Ignore classes methods
-      var isArgument = node.parent && node.parent.type === 'CallExpression'; // Ignore arguments (map, callback, etc.)
-      if (isNotAFunction || isMethod || isArgument) {
-        return null;
+      while (scope) {
+        var node = scope.block;
+        var isFunction = /Function/.test(node.type); // Ignore non functions
+        var isNotMethod = !node.parent || node.parent.type !== 'MethodDefinition'; // Ignore classes methods
+        var isNotArgument = !node.parent || node.parent.type !== 'CallExpression'; // Ignore arguments (callback, etc.)
+        if (isFunction && isNotMethod && isNotArgument) {
+          return node;
+        }
+        scope = scope.upper;
       }
-      return node;
+      return null;
     },
 
     /**

diff --git a/tests/lib/rules/prop-types.js b/tests/lib/rules/prop-types.js
@@ -869,6 +869,20 @@ ruleTester.run('prop-types', rule, {
         '};'
       ].join('\n'),
       parser: 'babel-eslint'
+    }, {
+      code: [
+        'const Hello = (props) => {',
+        '  let team = props.names.map((name) => {',
+        '      return <li>{name}, {props.company}</li>;',
+        '    });',
+        '  return <ul>{team}</ul>;',
+        '};',
+        'Hello.propTypes = {',
+        '  names: React.PropTypes.array,',
+        '  company: React.PropTypes.string',
+        '};'
+      ].join('\n'),
+      parser: 'babel-eslint'
     }
   ],
 
@@ -1430,6 +1444,21 @@ ruleTester.run('prop-types', rule, {
         {message: '\'firstname\' is missing in props validation'},
         {message: '\'name\' is missing in props validation'}
       ]
+    }, {
+      code: [
+        'const Hello = (props) => {',
+        '  let team = props.names.map((name) => {',
+        '      return <li>{name}, {props.company}</li>;',
+        '    });',
+        '  return <ul>{team}</ul>;',
+        '};'
+      ].join('\n'),
+      parser: 'babel-eslint',
+      errors: [
+        {message: '\'names\' is missing in props validation'},
+        {message: '\'names.map\' is missing in props validation'},
+        {message: '\'company\' is missing in props validation'}
+      ]
     }
   ]
 });