@atlaskit/eslint-plugin-design-system 13.4.0 → 13.4.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/eslint-plugin-design-system
 
+## 13.4.1
+
+### Patch Changes
+
+- [#136299](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/136299)
+  [`4da98e435c8da`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4da98e435c8da) -
+  Add better logic to `use-modal-dialog-close-button` rule.
+
 ## 13.4.0
 
 ### Minor Changes

package/dist/cjs/rules/use-modal-dialog-close-button/index.js

@@ -72,7 +72,7 @@ var rule = (0, _createRule.createLintRule)({
           return;
         }
         var name = node.openingElement.name.name;
-        if (name !== defaultImportLocalName) {
+        if (![defaultImportLocalName, modalHeaderLocalName].includes(name)) {
           return;
         }
         var modalHeaderNode = null;
@@ -136,13 +136,31 @@ var rule = (0, _createRule.createLintRule)({
             _iterator.f();
           }
         };
-        searchNode(node);
+        if (name === defaultImportLocalName) {
+          searchNode(node);
+
+          // If there is a close button, skip the rest, as this satisfies the
+          // rule. If there is a modal header, it will be recognized in later
+          // scans, so don't add duplicate errors
+          if (closeButtonNode || modalHeaderNode) {
+            return;
+            // No close button or modal header exists
+          } else {
+            return context.report({
+              node: node,
+              messageId: 'noCloseButtonExists'
+            });
+          }
+        } else if (name === modalHeaderLocalName) {
+          modalHeaderNode = node;
+          searchNode(node);
+
+          // If there is a close button, skip the rest, as this satisfies the rule.
+          if (closeButtonNode) {
+            return;
+          }
 
-        // If there is a close button, skip the rest, as this satisfies the rule.
-        if (closeButtonNode) {
-          return;
           // No close button exists, so check the modal header
-        } else if (modalHeaderNode !== null) {
           var prop = _jsxElement.JSXElementHelper.getAttributeByName(modalHeaderNode, PROP_NAME);
 
           // If the prop exists
@@ -175,12 +193,6 @@ var rule = (0, _createRule.createLintRule)({
               }]
             });
           }
-          // No close button or modal header exists
-        } else {
-          return context.report({
-            node: node,
-            messageId: 'noCloseButtonExists'
-          });
         }
       }
     };

package/dist/es2019/rules/use-modal-dialog-close-button/index.js

@@ -65,7 +65,7 @@ const rule = createLintRule({
           return;
         }
         const name = node.openingElement.name.name;
-        if (name !== defaultImportLocalName) {
+        if (![defaultImportLocalName, modalHeaderLocalName].includes(name)) {
           return;
         }
         let modalHeaderNode = null;
@@ -120,13 +120,31 @@ const rule = createLintRule({
             checkNode(child);
           }
         };
-        searchNode(node);
+        if (name === defaultImportLocalName) {
+          searchNode(node);
+
+          // If there is a close button, skip the rest, as this satisfies the
+          // rule. If there is a modal header, it will be recognized in later
+          // scans, so don't add duplicate errors
+          if (closeButtonNode || modalHeaderNode) {
+            return;
+            // No close button or modal header exists
+          } else {
+            return context.report({
+              node,
+              messageId: 'noCloseButtonExists'
+            });
+          }
+        } else if (name === modalHeaderLocalName) {
+          modalHeaderNode = node;
+          searchNode(node);
+
+          // If there is a close button, skip the rest, as this satisfies the rule.
+          if (closeButtonNode) {
+            return;
+          }
 
-        // If there is a close button, skip the rest, as this satisfies the rule.
-        if (closeButtonNode) {
-          return;
           // No close button exists, so check the modal header
-        } else if (modalHeaderNode !== null) {
           const prop = JSXElementHelper.getAttributeByName(modalHeaderNode, PROP_NAME);
 
           // If the prop exists
@@ -155,12 +173,6 @@ const rule = createLintRule({
               }]
             });
           }
-          // No close button or modal header exists
-        } else {
-          return context.report({
-            node,
-            messageId: 'noCloseButtonExists'
-          });
         }
       }
     };

package/dist/esm/rules/use-modal-dialog-close-button/index.js

@@ -68,7 +68,7 @@ var rule = createLintRule({
           return;
         }
         var name = node.openingElement.name.name;
-        if (name !== defaultImportLocalName) {
+        if (![defaultImportLocalName, modalHeaderLocalName].includes(name)) {
           return;
         }
         var modalHeaderNode = null;
@@ -132,13 +132,31 @@ var rule = createLintRule({
             _iterator.f();
           }
         };
-        searchNode(node);
+        if (name === defaultImportLocalName) {
+          searchNode(node);
+
+          // If there is a close button, skip the rest, as this satisfies the
+          // rule. If there is a modal header, it will be recognized in later
+          // scans, so don't add duplicate errors
+          if (closeButtonNode || modalHeaderNode) {
+            return;
+            // No close button or modal header exists
+          } else {
+            return context.report({
+              node: node,
+              messageId: 'noCloseButtonExists'
+            });
+          }
+        } else if (name === modalHeaderLocalName) {
+          modalHeaderNode = node;
+          searchNode(node);
+
+          // If there is a close button, skip the rest, as this satisfies the rule.
+          if (closeButtonNode) {
+            return;
+          }
 
-        // If there is a close button, skip the rest, as this satisfies the rule.
-        if (closeButtonNode) {
-          return;
           // No close button exists, so check the modal header
-        } else if (modalHeaderNode !== null) {
           var prop = JSXElementHelper.getAttributeByName(modalHeaderNode, PROP_NAME);
 
           // If the prop exists
@@ -171,12 +189,6 @@ var rule = createLintRule({
               }]
             });
           }
-          // No close button or modal header exists
-        } else {
-          return context.report({
-            node: node,
-            messageId: 'noCloseButtonExists'
-          });
         }
       }
     };

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@atlaskit/eslint-plugin-design-system",
 	"description": "The essential plugin for use with the Atlassian Design System.",
-	"version": "13.4.0",
+	"version": "13.4.1",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
 	"publishConfig": {