Support trivial template literals

jsx-eslint · Aug 9, 2020 · 6836793 · 6836793
1 parent c1cceba
commit 6836793
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 11 deletions.
diff --git a/lib/rules/button-has-type.js b/lib/rules/button-has-type.js
@@ -95,18 +95,24 @@ module.exports = {
     }
 
     function checkExpression(node, expression) {
-      if (expression.type === 'Literal') {
-        checkValue(node, expression.value);
-        return;
-      }
-
-      if (expression.type === 'ConditionalExpression') {
-        checkExpression(node, expression.consequent);
-        checkExpression(node, expression.alternate);
-        return;
+      switch (expression.type) {
+        case 'Literal':
+          checkValue(node, expression.value);
+          return;
+        case 'TemplateLiteral':
+          if (expression.expressions.length === 0) {
+            checkValue(node, expression.quasis[0].value.raw);
+          } else {
+            reportComplex(expression);
+          }
+          return;
+        case 'ConditionalExpression':
+          checkExpression(node, expression.consequent);
+          checkExpression(node, expression.alternate);
+          return;
+        default:
+          reportComplex(expression);
       }
-
-      reportComplex(expression);
     }
 
     return {

diff --git a/tests/lib/rules/button-has-type.js b/tests/lib/rules/button-has-type.js
@@ -33,6 +33,8 @@ ruleTester.run('button-has-type', rule, {
     {code: '<button type="submit"/>'},
     {code: '<button type="reset"/>'},
     {code: '<button type={"button"}/>'},
+    {code: '<button type={\'button\'}/>'},
+    {code: '<button type={`button`}/>'},
     {code: '<button type={condition ? "button" : "submit"}/>'},
     {
       code: '<button type="button"/>',
@@ -91,6 +93,18 @@ ruleTester.run('button-has-type', rule, {
         message: '"foo" is an invalid value for button type attribute'
       }]
     },
+    {
+      code: '<button type={`foo`}/>',
+      errors: [{
+        message: '"foo" is an invalid value for button type attribute'
+      }]
+    },
+    {
+      code: '<button type={`button${foo}`}/>',
+      errors: [{
+        message: 'The button type attribute must be specified by a static string or a trivial ternary expression'
+      }]
+    },
     {
       code: '<button type="reset"/>',
       options: [{reset: false}],