resolved alternate, added test cases and helper func

jsx-eslint · Jul 20, 2022 · d979dd4 · d979dd4
1 parent d72a24a
commit d979dd4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/lib/rules/jsx-no-target-blank.js b/lib/rules/jsx-no-target-blank.js
@@ -65,6 +65,19 @@ function hasDynamicLink(node, linkAttribute) {
   }
 }
 
+function attributeValuePossiblyRel(value) {
+  if (
+    typeof value === 'string'
+    && (
+      (value && value.toLowerCase() === 'noreferrer')
+      || (value && value.toLowerCase() === 'noopener noreferrer')
+      || (value && value.toLowerCase() === 'noreferrer noopener')
+    )
+  ) {
+    return true;
+  }
+}
+
 function getStringFromValue(value) {
   if (value) {
     if (value.type === 'Literal') {
@@ -76,24 +89,10 @@ function getStringFromValue(value) {
       }
       const expr = value.expression;
       if (expr.type === 'ConditionalExpression') {
-        if (
-          typeof expr.consequent.value === 'string'
-          && (
-            (expr.consequent.value && expr.consequent.value.toLowerCase() === 'noreferrer')
-            || (expr.consequent.value && expr.consequent.value.toLowerCase() === 'noopener noreferrer')
-            || (expr.consequent.value && expr.consequent.value.toLowerCase() === 'noreferrer noopener')
-          )
-        ) {
+        if (attributeValuePossiblyRel(expr.consequent.value)) {
           return expr.consequent.value;
         }
-        if (
-          typeof expr.alternate.value === 'string'
-          && (
-            (expr.alternate.value && expr.alternate.value.toLowerCase() === 'noreferrer')
-            || (expr.alternate.value && expr.alternate.value.toLowerCase() === 'noopener noreferrer')
-            || (expr.consequent.value && expr.consequent.value.toLowerCase() === 'noreferrer noopener')
-          )
-        ) {
+        if (attributeValuePossiblyRel(expr.alternate.value)) {
           return expr.alternate.value;
         }
       }

diff --git a/tests/lib/rules/jsx-no-target-blank.js b/tests/lib/rules/jsx-no-target-blank.js
@@ -156,6 +156,12 @@ ruleTester.run('jsx-no-target-blank', rule, {
     {
       code: '<a href={href} target="_blank" rel={isExternal ? "noopener" : "noopener noreferrer"} />',
     },
+    {
+      code: '<a href={href} target="_blank" rel={isExternal ? 3 : "noopener noreferrer"} />',
+    },
+    {
+      code: '<a href={href} target="_blank" rel={isExternal ? "noopener noreferrer" : "3"} />',
+    },
   ]),
   invalid: parsers.all([
     {