Fix component detection to ignore functions expression without a pare…

…nt component
jsx-eslint · Aug 22, 2016 · 70bf28d · 70bf28d
1 parent 7ed3b29
commit 70bf28d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 10 deletions.
diff --git a/lib/util/Components.js b/lib/util/Components.js
@@ -483,14 +483,16 @@ function componentRule(rule, context) {
     },
 
     FunctionExpression: function(node) {
-      node = utils.getParentComponent();
+      var component = utils.getParentComponent();
       if (
-        !node ||
-        (node.parent && node.parent.type === 'JSXExpressionContainer')
+        !component ||
+        (component.parent && component.parent.type === 'JSXExpressionContainer')
       ) {
+        // Ban the node if we cannot find a parent component
+        components.add(node, 0);
         return;
       }
-      components.add(node, 1);
+      components.add(component, 1);
     },
 
     FunctionDeclaration: function(node) {
@@ -502,17 +504,19 @@ function componentRule(rule, context) {
     },
 
     ArrowFunctionExpression: function(node) {
-      node = utils.getParentComponent();
+      var component = utils.getParentComponent();
       if (
-        !node ||
-        (node.parent && node.parent.type === 'JSXExpressionContainer')
+        !component ||
+        (component.parent && component.parent.type === 'JSXExpressionContainer')
       ) {
+        // Ban the node if we cannot find a parent component
+        components.add(node, 0);
         return;
       }
-      if (node.expression && utils.isReturningJSX(node)) {
-        components.add(node, 2);
+      if (component.expression && utils.isReturningJSX(component)) {
+        components.add(component, 2);
       } else {
-        components.add(node, 1);
+        components.add(component, 1);
       }
     },
 

diff --git a/tests/lib/rules/display-name.js b/tests/lib/rules/display-name.js
@@ -358,6 +358,26 @@ ruleTester.run('display-name', rule, {
       'module.exports = someDecorator;'
     ].join('\n'),
     parser: 'babel-eslint'
+  }, {
+    code: [
+      'const element = (',
+      '  <Media query={query} render={() => {',
+      '    renderWasCalled = true',
+      '    return <div/>',
+      '  }}/>',
+      ')'
+    ].join('\n'),
+    parser: 'babel-eslint'
+  }, {
+    code: [
+      'const element = (',
+      '  <Media query={query} render={function() {',
+      '    renderWasCalled = true',
+      '    return <div/>',
+      '  }}/>',
+      ')'
+    ].join('\n'),
+    parser: 'babel-eslint'
   }
 ],