Enhance isReturningJSX to handle more node types

Author: petersendidit

lib/rules/jsx-no-bind.js

@@ -12,17 +12,6 @@ var propName = require('jsx-ast-utils/propName');
 // Rule Definition
 // -----------------------------------------------------------------------------
 
-function renderReturnsJSX(node, utils) {
-  var i = node.value.body.body.length - 1;
-  for (; i >= 0; i--) {
-    var testNode = node.value.body.body[i];
-    if (testNode.type === 'ReturnStatement' && utils.isReturningJSX(testNode)) {
-      return true;
-    }
-  }
-  return false;
-}
-
 module.exports = Components.detect(function(context, components, utils) {
   var configuration = context.options[0] || {};
 
@@ -42,7 +31,7 @@ module.exports = Components.detect(function(context, components, utils) {
           (ancestors[i].type === 'MethodDefinition' && ancestors[i].key.name === 'render') ||
           (ancestors[i].type === 'Property' && ancestors[i].key.name === 'render')
         ) {
-          if (renderReturnsJSX(ancestors[i], utils)) {
+          if (utils.isReturningJSX(ancestors[i])) {
             context.report({
               node: callee,
               message: 'JSX props should not use .bind()'

lib/util/Components.js

@@ -199,12 +199,13 @@ function componentRule(rule, context) {
     /**
      * Check if the node is returning JSX
      *
-     * @param {ASTNode} node The AST node being checked (can be a ReturnStatement or an ArrowFunctionExpression).
+     * @param {ASTNode} ASTnode The AST node being checked
      * @param {Boolean} strict If true, in a ternary condition the node must return JSX in both cases
      * @returns {Boolean} True if the node is returning JSX, false if not
      */
-    isReturningJSX: function(node, strict) {
+    isReturningJSX: function(ASTnode, strict) {
       var property;
+      var node = ASTnode;
       switch (node.type) {
         case 'ReturnStatement':
           property = 'argument';
@@ -213,7 +214,11 @@ function componentRule(rule, context) {
           property = 'body';
           break;
         default:
-          return false;
+          node = utils.findReturnStatement(node);
+          if (!node) {
+            return false;
+          }
+          property = 'argument';
       }
 
       var returnsConditionalJSXConsequent =
@@ -248,6 +253,24 @@ function componentRule(rule, context) {
       );
     },
 
+    /**
+     * Find a return statment in the current node
+     *
+     * @param {ASTNode} ASTnode The AST node being checked
+     */
+    findReturnStatement: function(node) {
+      if (!node.value || !node.value.body) {
+        return false;
+      }
+      var i = node.value.body.body.length - 1;
+      for (; i >= 0; i--) {
+        if (node.value.body.body[i].type === 'ReturnStatement') {
+          return node.value.body.body[i];
+        }
+      }
+      return false;
+    },
+
     /**
      * Get the parent component node from the current scope
      *