transfer focus with fee and transaction modals

public-typescript/lotOccupancyEdit.js

@@ -1090,7 +1090,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
         
         "use strict";
         /* eslint-disable @typescript-eslint/indent, unicorn/prefer-module */
-        var _a;
         Object.defineProperty(exports, "__esModule", { value: true });
         let lotOccupancyFees = exports.lotOccupancyFees;
         delete exports.lotOccupancyFees;
@@ -1220,7 +1219,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
             lotOccupancyFeesContainerElement.querySelector('#lotOccupancyFees--grandTotal').textContent = '$' + (feeAmountTotal + taxAmountTotal).toFixed(2);
             renderLotOccupancyTransactions();
         }
-        (_a = document.querySelector('#button--addFee')) === null || _a === void 0 ? void 0 : _a.addEventListener('click', () => {
+        const addFeeButtonElement = document.querySelector('#button--addFee');
+        addFeeButtonElement.addEventListener('click', () => {
             if (los.hasUnsavedChanges()) {
                 bulmaJS.alert({
                     message: 'Please save all unsaved changes before adding fees.',
@@ -1378,6 +1378,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                 },
                 onremoved() {
                     bulmaJS.toggleHtmlClipped();
+                    addFeeButtonElement.focus();
                 }
             });
         });
@@ -1518,9 +1519,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
                     '</div>');
             }
         }
-        document
-            .querySelector('#button--addTransaction')
-            .addEventListener('click', () => {
+        const addTransactionButtonElement = document.querySelector('#button--addTransaction');
+        addTransactionButtonElement.addEventListener('click', () => {
             let transactionAmountElement;
             let externalReceiptNumberElement;
             let addCloseModalFunction;
@@ -1554,8 +1554,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                     .querySelector('.help');
                 if (externalReceiptNumber === '') {
                     helpTextElement.innerHTML = '&nbsp;';
-                    iconElement.innerHTML =
-                        '<i class="fas fa-minus" aria-hidden="true"></i>';
+                    iconElement.innerHTML = '<i class="fas fa-minus" aria-hidden="true"></i>';
                     return;
                 }
                 cityssm.postJSON(los.urlPrefix + '/lotOccupancies/doGetDynamicsGPDocument', {
@@ -1606,6 +1605,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                 },
                 onshown(modalElement, closeModalFunction) {
                     bulmaJS.toggleHtmlClipped();
+                    transactionAmountElement.focus();
                     addCloseModalFunction = closeModalFunction;
                     modalElement
                         .querySelector('form')
@@ -1613,6 +1613,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                 },
                 onremoved() {
                     bulmaJS.toggleHtmlClipped();
+                    addTransactionButtonElement.focus();
                 }
             });
         });

public-typescript/lotOccupancyEdit/lotOccupancyEditFees.js

@@ -1,6 +1,5 @@
 "use strict";
 /* eslint-disable @typescript-eslint/indent, unicorn/prefer-module */
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 let lotOccupancyFees = exports.lotOccupancyFees;
 delete exports.lotOccupancyFees;
@@ -130,7 +129,8 @@ function renderLotOccupancyFees() {
     lotOccupancyFeesContainerElement.querySelector('#lotOccupancyFees--grandTotal').textContent = '$' + (feeAmountTotal + taxAmountTotal).toFixed(2);
     renderLotOccupancyTransactions();
 }
-(_a = document.querySelector('#button--addFee')) === null || _a === void 0 ? void 0 : _a.addEventListener('click', () => {
+const addFeeButtonElement = document.querySelector('#button--addFee');
+addFeeButtonElement.addEventListener('click', () => {
     if (los.hasUnsavedChanges()) {
         bulmaJS.alert({
             message: 'Please save all unsaved changes before adding fees.',
@@ -288,6 +288,7 @@ function renderLotOccupancyFees() {
         },
         onremoved() {
             bulmaJS.toggleHtmlClipped();
+            addFeeButtonElement.focus();
         }
     });
 });
@@ -428,9 +429,8 @@ function renderLotOccupancyTransactions() {
             '</div>');
     }
 }
-document
-    .querySelector('#button--addTransaction')
-    .addEventListener('click', () => {
+const addTransactionButtonElement = document.querySelector('#button--addTransaction');
+addTransactionButtonElement.addEventListener('click', () => {
     let transactionAmountElement;
     let externalReceiptNumberElement;
     let addCloseModalFunction;
@@ -464,8 +464,7 @@ document
             .querySelector('.help');
         if (externalReceiptNumber === '') {
             helpTextElement.innerHTML = '&nbsp;';
-            iconElement.innerHTML =
-                '<i class="fas fa-minus" aria-hidden="true"></i>';
+            iconElement.innerHTML = '<i class="fas fa-minus" aria-hidden="true"></i>';
             return;
         }
         cityssm.postJSON(los.urlPrefix + '/lotOccupancies/doGetDynamicsGPDocument', {
@@ -516,6 +515,7 @@ document
         },
         onshown(modalElement, closeModalFunction) {
             bulmaJS.toggleHtmlClipped();
+            transactionAmountElement.focus();
             addCloseModalFunction = closeModalFunction;
             modalElement
                 .querySelector('form')
@@ -523,6 +523,7 @@ document
         },
         onremoved() {
             bulmaJS.toggleHtmlClipped();
+            addTransactionButtonElement.focus();
         }
     });
 });

public-typescript/lotOccupancyEdit/lotOccupancyEditFees.ts

@@ -185,7 +185,9 @@ function renderLotOccupancyFees(): void {
   renderLotOccupancyTransactions()
 }
 
-document.querySelector('#button--addFee')?.addEventListener('click', () => {
+const addFeeButtonElement = document.querySelector('#button--addFee') as HTMLButtonElement
+
+addFeeButtonElement.addEventListener('click', () => {
   if (los.hasUnsavedChanges()) {
     bulmaJS.alert({
       message: 'Please save all unsaved changes before adding fees.',
@@ -410,6 +412,7 @@ document.querySelector('#button--addFee')?.addEventListener('click', () => {
     },
     onremoved() {
       bulmaJS.toggleHtmlClipped()
+      addFeeButtonElement.focus()
     }
   })
 })
@@ -602,9 +605,11 @@ function renderLotOccupancyTransactions(): void {
   }
 }
 
-document
-  .querySelector('#button--addTransaction')!
-  .addEventListener('click', () => {
+const addTransactionButtonElement = document.querySelector(
+  '#button--addTransaction'
+) as HTMLButtonElement
+
+addTransactionButtonElement.addEventListener('click', () => {
   let transactionAmountElement: HTMLInputElement
   let externalReceiptNumberElement: HTMLInputElement
 
@@ -652,8 +657,7 @@ document
 
     if (externalReceiptNumber === '') {
       helpTextElement.innerHTML = ' '
-        iconElement.innerHTML =
-          '<i class="fas fa-minus" aria-hidden="true"></i>'
+      iconElement.innerHTML = '<i class="fas fa-minus" aria-hidden="true"></i>'
       return
     }
 
@@ -757,6 +761,8 @@ document
     onshown(modalElement, closeModalFunction) {
       bulmaJS.toggleHtmlClipped()
 
+      transactionAmountElement.focus()
+
       addCloseModalFunction = closeModalFunction
 
       modalElement
@@ -765,8 +771,9 @@ document
     },
     onremoved() {
       bulmaJS.toggleHtmlClipped()
+      addTransactionButtonElement.focus()
     }
   })
-  })
+})
 
 renderLotOccupancyFees()