tidy web component constructor() funcs

basher · Jan 17, 2025 · e6fb965 · e6fb965
1 parent 6e8e871
commit e6fb965
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/ui/npm-shrinkwrap.json b/ui/npm-shrinkwrap.json
diff --git a/ui/package.json b/ui/package.json
@@ -2,7 +2,7 @@
     "name": "web-ui-boilerplate",
     "description": "UI boilerplate for websites/webapps using vanilla HTML/CSS/JavaScript, powered by Storybook, bundled by Parcel.",
     "author": "basher",
-    "version": "4.0.9",
+    "version": "4.0.10",
     "license": "ISC",
     "repository": {
         "type": "git",

diff --git a/ui/src/javascript/web-components/webui-disclosure.ts b/ui/src/javascript/web-components/webui-disclosure.ts
@@ -16,7 +16,7 @@ export default class WebUIDisclosure extends HTMLElement {
 
         this.setupA11y();
 
-        this.trigger?.addEventListener('click', this);
+        this.trigger.addEventListener('click', this);
     }
 
     private setupA11y(): void {

diff --git a/ui/src/javascript/web-components/webui-modal.ts b/ui/src/javascript/web-components/webui-modal.ts
@@ -18,8 +18,8 @@ export default class WebUIModal extends HTMLElement {
 
         this.setupA11y();
 
-        this.btnModalOpen?.addEventListener('click', this);
-        this.btnModalOpen?.addEventListener('keydown', this);
+        this.btnModalOpen.addEventListener('click', this);
+        this.btnModalOpen.addEventListener('keydown', this);
         this.btnsModalClose.forEach((btnModalClose) => {
             btnModalClose?.addEventListener('click', this);
         });
@@ -71,15 +71,12 @@ export default class WebUIModal extends HTMLElement {
     public handleEvent(e: KeyboardEvent) {
         const target = e.currentTarget as HTMLButtonElement;
 
-        // Ensure <a role="button"> can open modal with ENTER and SPACEBAR.
+        // Ensure button can open modal with ENTER and SPACEBAR.
         if (e.type === 'keydown' && e.code !== 'Enter' && e.code !== 'Space')
             return;
 
         // Click 'open' button.
         if (target?.dataset.open === '') {
-            // Prevent default behaviour on <a role="button">.
-            e.preventDefault();
-
             this.handleOpen();
         }
 

diff --git a/ui/src/javascript/web-components/webui-notify.ts b/ui/src/javascript/web-components/webui-notify.ts
@@ -4,7 +4,10 @@ export default class WebUINotify extends HTMLElement {
     constructor() {
         super();
         this.btnClose = this.querySelector('[data-close]');
-        this.btnClose?.addEventListener('click', this);
+
+        if (!this.btnClose) return;
+
+        this.btnClose.addEventListener('click', this);
     }
 
     // Handle constructor() event listeners.

diff --git a/ui/src/javascript/web-components/webui-share.ts b/ui/src/javascript/web-components/webui-share.ts
@@ -25,7 +25,7 @@ export default class WebUIShare extends HTMLElement {
 
         if (!this.btnShare) return;
 
-        this.btnShare?.addEventListener('click', this);
+        this.btnShare.addEventListener('click', this);
         this.btnCopy?.addEventListener('click', this);
     }