Merge pull request #1089 from benstepp/bs-multicomp-false-positives

Bug fix for false positives with no-multi-comp
jsx-eslint · Feb 24, 2017 · b646485 · b646485
2 parents 8148833 + c038899
commit b646485
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 5 deletions.
diff --git a/lib/util/Components.js b/lib/util/Components.js
@@ -237,14 +237,25 @@ function componentRule(rule, context) {
      * @returns {Boolean} True if React.createElement called
      */
     isReactCreateElement: function(node) {
-      return (
+      var calledOnReact = (
         node &&
         node.callee &&
         node.callee.object &&
         node.callee.object.name === 'React' &&
         node.callee.property &&
         node.callee.property.name === 'createElement'
       );
+
+      var calledDirectly = (
+        node &&
+        node.callee &&
+        node.callee.name === 'createElement'
+      );
+
+      if (this.hasDestructuredReactCreateElement()) {
+        return calledDirectly || calledOnReact;
+      }
+      return calledOnReact;
     },
 
     /**
@@ -290,10 +301,7 @@ function componentRule(rule, context) {
         node[property] &&
         node[property].type === 'JSXElement'
       ;
-      var returnsReactCreateElement =
-        this.hasDestructuredReactCreateElement() ||
-        this.isReactCreateElement(node[property])
-      ;
+      var returnsReactCreateElement = this.isReactCreateElement(node[property]);
 
       return Boolean(
         returnsConditionalJSX ||

diff --git a/tests/lib/rules/no-multi-comp.js b/tests/lib/rules/no-multi-comp.js
@@ -10,6 +10,7 @@
 
 var rule = require('../../../lib/rules/no-multi-comp');
 var RuleTester = require('eslint').RuleTester;
+var assign = require('object.assign');
 
 var parserOptions = {
   ecmaVersion: 6,
@@ -89,6 +90,21 @@ ruleTester.run('no-multi-comp', rule, {
     options: [{
       ignoreStateless: true
     }]
+  }, {
+    // multiple non-components
+    code: [
+      'import React, { createElement } from "react"',
+      'const helperFoo = () => {',
+      '  return true;',
+      '};',
+      'function helperBar() {',
+      '  return false;',
+      '};',
+      'function RealComponent() {',
+      '  return createElement("img");',
+      '};'
+    ].join('\n'),
+    parserOptions: assign({sourceType: 'module'}, parserOptions)
   }],
 
   invalid: [{