Fix detection for direct props in prop-types (fixes #497)

jsx-eslint · Mar 14, 2016 · 2884a80 · 2884a80
1 parent e83079d
commit 2884a80
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/lib/rules/prop-types.js b/lib/rules/prop-types.js
@@ -10,6 +10,12 @@
 var Components = require('../util/Components');
 var variable = require('../util/variable');
 
+// ------------------------------------------------------------------------------
+// Constants
+// ------------------------------------------------------------------------------
+
+var DIRECT_PROPS_REGEX = /^props\s*(\.|\[)/;
+
 // ------------------------------------------------------------------------------
 // Rule Definition
 // ------------------------------------------------------------------------------
@@ -461,7 +467,7 @@ module.exports = Components.detect(function(context, components, utils) {
    * @return {string} the name of the property or undefined if not found
    */
   function getPropertyName(node) {
-    var isDirectProp = /^props(\.|\[)/.test(sourceCode.getText(node));
+    var isDirectProp = DIRECT_PROPS_REGEX.test(sourceCode.getText(node));
     var isInClassComponent = utils.getParentES6Component() || utils.getParentES5Component();
     var isNotInConstructor = !inConstructor(node);
     if (isDirectProp && isInClassComponent && isNotInConstructor) {
@@ -567,7 +573,7 @@ module.exports = Components.detect(function(context, components, utils) {
           break;
         }
 
-        var isDirectProp = /^props(\.|\[)/.test(sourceCode.getText(node));
+        var isDirectProp = DIRECT_PROPS_REGEX.test(sourceCode.getText(node));
 
         usedPropTypes.push({
           name: name,

diff --git a/tests/lib/rules/prop-types.js b/tests/lib/rules/prop-types.js
@@ -1159,6 +1159,19 @@ ruleTester.run('prop-types', rule, {
         '}'
       ].join('\n'),
       parserOptions: parserOptions
+    }, {
+      code: [
+        'function JobList(props) {',
+        '  props',
+        '  .jobs',
+        '  .forEach(() => {});',
+        '  return <div></div>;',
+        '}',
+        'JobList.propTypes = {',
+        '  jobs: PropTypes.array',
+        '};'
+      ].join('\n'),
+      parser: 'babel-eslint'
     }
   ],