@optionfactory/ful 6.0.2 → 6.0.4

package/dist/ful.mjs

@@ -1219,10 +1219,8 @@ class Bindings {
     static extractFrom(form, submitter){
         let result = {};
         for(const el of form.elements){
-            if(!el.hasAttribute("name") || el.matches(":disabled")){
-                continue;
-            }
-            if(submitter && (el.type==='submit' || el.type === 'reset') && el !== submitter){
+            // we are assuming submitters are disabled during submit.
+            if(!el.hasAttribute("name") || (el.matches(":disabled") && el !== submitter)){
                 continue;
             }
             result = Bindings.providePath(result, /** @type {string} */(el.getAttribute('name')), Bindings.extract(el));
@@ -1358,7 +1356,7 @@ class Form extends ParsedElement {
         form.addEventListener('submit', async (e) => {
             e.preventDefault();
             e.stopPropagation();
-            await this.submit(e.submitter);
+            await this.submit(e.submitter ?? undefined);
         });
         if (this.hasAttribute("clear-invalid-on-change")) {
             this.addEventListener('change', (/** @type any */evt) => {
@@ -1379,19 +1377,20 @@ class Form extends ParsedElement {
             const values = Bindings.extractFrom(this.form, submitter);
             let request = await loader.prepare(values, this);
             try {
-                const se = new CustomEvent('submit', { bubbles: true, cancelable: true, detail: { values, request } });
+                const se = new CustomEvent('submit', { bubbles: true, cancelable: true, detail: { submitter, values, request } });
                 if (!this.dispatchEvent(se)) {
                     return;
                 }
-                const sre = new CustomEvent('submit:requested', { bubbles: true, cancelable: false, detail: { values: se.detail.values, request: se.detail.request} });
+                this.errors = [];
+                const sre = new CustomEvent('submit:requested', { bubbles: true, cancelable: false, detail: { submitter, values: se.detail.values, request: se.detail.request} });
                 let response = await AsyncEvents.fireAsync(this, sre);
                 request = sre.detail.request;
 
                 response = await loader.submit(request, this, response);
                 const mapped = await loader.transform(response, this);
-                this.dispatchEvent(new CustomEvent('submit:success', { bubbles: true, cancelable: false, detail: { values, request, response: mapped } }));
+                this.dispatchEvent(new CustomEvent('submit:success', { bubbles: true, cancelable: false, detail: { submitter, values, request, response: mapped } }));
             } catch (e) {
-                this.dispatchEvent(new CustomEvent('submit:failure', { bubbles: true, cancelable: false, detail: { values, request, exception: e } }));
+                this.dispatchEvent(new CustomEvent('submit:failure', { bubbles: true, cancelable: false, detail: { submitter, values, request, exception: e } }));
                 if (e instanceof Failure) {
                     this.errors = e.problems;
                 }
@@ -1472,7 +1471,21 @@ class Input extends ParsedElement {
             this.required = observed.required;
             this.value = observed.value;
         }
-
+        this._input.addEventListener('input', (evt) => {
+            const re = this.getAttribute('mask');
+            if (!re) {
+                return;
+            }
+            const before = evt.target.value;
+            const after = before.replace(new RegExp(re, 'g'), '');
+            if (before === after) {
+                return;
+            }
+            const start = evt.target.selectionStart;
+            const offset = before.length - after.length;
+            evt.target.value = after;
+            evt.target.setSelectionRange(start - offset, start - offset);
+        });
         this._input.addEventListener('change', (evt) => {
             evt.stopPropagation();
             this.dispatchEvent(new CustomEvent('change', {
@@ -1520,7 +1533,7 @@ class Input extends ParsedElement {
         this.reflect(() => {
             Attributes.toggle(this, 'required', d);
         });
-    }    
+    }
     focus(options) {
         this._input.focus(options);
     }