Fix require-default-props quoted defaultProps detection (fix #1201)

jsx-eslint · May 17, 2017 · 45e3b9f · 45e3b9f
1 parent 62daf82
commit 45e3b9f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/lib/rules/require-default-props.js b/lib/rules/require-default-props.js
@@ -9,6 +9,8 @@ var Components = require('../util/Components');
 var variableUtil = require('../util/variable');
 var annotations = require('../util/annotations');
 
+const QUOTES_REGEX = /^["']|["']$/g;
+
 // ------------------------------------------------------------------------------
 // Rule Definition
 // ------------------------------------------------------------------------------
@@ -25,6 +27,8 @@ module.exports = {
 
   create: Components.detect(function(context, components, utils) {
 
+    var sourceCode = context.getSourceCode();
+
     /**
      * Get properties name
      * @param {Object} node - Property.
@@ -142,7 +146,7 @@ module.exports = {
 
       return props.map(function(property) {
         return {
-          name: property.key.name || property.key.value,
+          name: sourceCode.getText(property.key).replace(QUOTES_REGEX, ''),
           isRequired: isRequiredPropType(property.value),
           node: property
         };
@@ -222,7 +226,7 @@ module.exports = {
       }
 
       return objectExpression.properties.map(function(property) {
-        return property.key.name;
+        return sourceCode.getText(property.key).replace(QUOTES_REGEX, '');
       });
     }
 

diff --git a/tests/lib/rules/require-default-props.js b/tests/lib/rules/require-default-props.js
@@ -720,6 +720,21 @@ ruleTester.run('require-default-props', rule, {
         '}'
       ].join('\n'),
       parser: 'babel-eslint'
+    },
+    // make sure defaultProps are correctly detected with quoted properties
+    {
+      code: [
+        'function Hello(props) {',
+        '  return <div>Hello {props.bar}</div>;',
+        '}',
+        'Hello.propTypes = {',
+        '  bar: PropTypes.string',
+        '};',
+        'Hello.defaultProps = {',
+        '  "bar": "bar"',
+        '};'
+      ].join('\n'),
+      parser: 'babel-eslint'
     }
   ],