fix handling of warnOnSpreadAttributes being false

jsx-eslint · Mar 24, 2021 · 2efdbf7 · 2efdbf7
1 parent c2a790a
commit 2efdbf7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/lib/rules/jsx-no-target-blank.js b/lib/rules/jsx-no-target-blank.js
@@ -148,7 +148,7 @@ module.exports = {
 
           if (warnOnSpreadAttributes && hasSpread) {
             // continue to check below
-          } else if ((hasSpread && targetIndex < spreadAttributeIndex) || !hasSpread) {
+          } else if ((hasSpread && targetIndex < spreadAttributeIndex) || !hasSpread || !warnOnSpreadAttributes) {
             return;
           }
         }

diff --git a/tests/lib/rules/jsx-no-target-blank.js b/tests/lib/rules/jsx-no-target-blank.js
@@ -109,6 +109,12 @@ ruleTester.run('jsx-no-target-blank', rule, {
     },
     {
       code: '<a target={3} />'
+    },
+    {
+      code: '<a href="some-link" {...otherProps} target="some-non-blank-target"></a>'
+    },
+    {
+      code: '<a href="some-link" target="some-non-blank-target" {...otherProps}></a>'
     }
   ],
   invalid: [
@@ -266,6 +272,20 @@ ruleTester.run('jsx-no-target-blank', rule, {
       options: [{enforceDynamicLinks: 'always'}],
       settings: {linkComponents: {name: 'Link', linkAttribute: 'to'}},
       errors: defaultErrors
+    },
+    {
+      code: '<a href="some-link" {...otherProps} target="some-non-blank-target"></a>',
+      errors: defaultErrors,
+      options: [{
+        warnOnSpreadAttributes: true
+      }]
+    },
+    {
+      code: '<a href="some-link" target="some-non-blank-target" {...otherProps}></a>',
+      errors: defaultErrors,
+      options: [{
+        warnOnSpreadAttributes: true
+      }]
     }
   ]
 });