don't error when no primary buttons in form

signal24 · Aug 19, 2023 · a35b7a0 · a35b7a0
1 parent ee82d2d
commit a35b7a0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@signal24/vue-foundation",
     "type": "module",
-    "version": "4.7.2",
+    "version": "4.7.3",
     "description": "Common components, directives, and helpers for Vue 3 apps",
     "module": "./dist/vue-foundation.es.js",
     "bin": {

diff --git a/src/helpers/mask.ts b/src/helpers/mask.ts
@@ -50,8 +50,8 @@ const FormMaskState = Symbol('FormMaskState');
 interface IFormMaskState {
     [FormMaskState]?: {
         disabledElements: HTMLElement[];
-        waitButton: HTMLElement;
-        buttonHtml: string;
+        waitButton?: HTMLElement;
+        buttonHtml?: string;
     };
 }
 type FormMaskElement = Element & IFormMaskState;
@@ -62,10 +62,13 @@ export function maskForm(formOrCmp: Element | AnyComponentPublicInstance, button
 
     const buttonEl = (
         buttonSelector instanceof Element ? buttonSelector : form.querySelectorAll(buttonSelector ?? 'button:not([disabled]):not([type="button"])')[0]
-    ) as HTMLElement;
-    const originalButtonHtml = buttonEl.tagName === 'INPUT' ? (buttonEl as HTMLInputElement).value : buttonEl.innerHTML;
-    buttonEl.setAttribute('disabled', 'disabled');
-    buttonEl.innerText = buttonText ?? 'Please wait...';
+    ) as HTMLElement | undefined;
+    let originalButtonHtml: string | undefined;
+    if (buttonEl) {
+        originalButtonHtml = buttonEl.tagName === 'INPUT' ? (buttonEl as HTMLInputElement).value : buttonEl.innerHTML;
+        buttonEl.setAttribute('disabled', 'disabled');
+        buttonEl.innerText = buttonText ?? 'Please wait...';
+    }
 
     const inputsQR = form.querySelectorAll('input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled])');
     const inputs = [...inputsQR] as HTMLElement[];
@@ -89,8 +92,11 @@ export function unmaskForm(formOrCmp: Element | AnyComponentPublicInstance) {
     form.classList.remove('vf-masked');
 
     state.disabledElements.forEach(el => el.removeAttribute('disabled'));
-    state.waitButton.innerHTML = state.buttonHtml;
-    state.waitButton.removeAttribute('disabled');
+
+    if (state.waitButton) {
+        state.waitButton.innerHTML = state.buttonHtml!;
+        state.waitButton.removeAttribute('disabled');
+    }
 
     delete (form as FormMaskElement)[FormMaskState];
 }