Fix jsx-handler-names for stateless components (fixes #346)

jsx-eslint · Dec 5, 2015 · 889461b · 889461b
1 parent be3b7f3
commit 889461b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 24 deletions.
diff --git a/lib/rules/jsx-handler-names.js b/lib/rules/jsx-handler-names.js
@@ -14,40 +14,18 @@ module.exports = function(context) {
   var eventHandlerPrefix = configuration.eventHandlerPrefix || 'handle';
   var eventHandlerPropPrefix = configuration.eventHandlerPropPrefix || 'on';
 
-  var EVENT_HANDLER_REGEX = new RegExp('^((this\.props\.' + eventHandlerPropPrefix + ')'
+  var EVENT_HANDLER_REGEX = new RegExp('^((props\.' + eventHandlerPropPrefix + ')'
                                        + '|((.*\.)?' + eventHandlerPrefix + ')).+$');
   var PROP_EVENT_HANDLER_REGEX = new RegExp('^' + eventHandlerPropPrefix + '.+$');
 
-  /**
-   * Get full prop value for a handler, i.e. `this.props.<name>`
-   * @param {Object} node.value.expression for JSXAttribute
-   * @return {String} Full prop value
-   */
-  function rebuildPropValue(valueNode) {
-    var valueNodeObject = valueNode.object;
-    var subObjectType = valueNodeObject.object ? valueNodeObject.object.type : '';
-    var propertyName = valueNodeObject.property && valueNodeObject.property.name ? valueNodeObject.property.name : '';
-    var propValue = valueNode.property && valueNode.property.name ? valueNode.property.name : '';
-
-    if (propertyName.length) {
-      propValue = propertyName + '.' + propValue;
-    }
-
-    if (subObjectType === 'ThisExpression') {
-      propValue = 'this.' + propValue;
-    }
-
-    return propValue;
-  }
-
   return {
     JSXAttribute: function(node) {
       if (!node.value || !node.value.expression || !node.value.expression.object) {
         return;
       }
 
       var propKey = typeof node.name === 'object' ? node.name.name : node.name;
-      var propValue = rebuildPropValue(node.value.expression);
+      var propValue = context.getSource(node.value.expression).replace(/^this\./, '');
 
       var propIsEventHandler = PROP_EVENT_HANDLER_REGEX.test(propKey);
       var propFnIsNamedCorrectly = EVENT_HANDLER_REGEX.test(propValue);

diff --git a/tests/lib/rules/jsx-handler-names.js b/tests/lib/rules/jsx-handler-names.js
@@ -59,6 +59,13 @@ ruleTester.run('jsx-handler-names', rule, {
     ecmaFeatures: {
       jsx: true
     }
+  }, {
+    code: [
+      '<TestComponent onChange={props.onChange} />'
+    ].join('\n'),
+    ecmaFeatures: {
+      jsx: true
+    }
   }],
 
   invalid: [{