@optionfactory/ful 6.0.0 → 6.0.2

package/dist/ful.mjs

@@ -1,4 +1,4 @@
-import { registry, ParsedElement, Attributes, Fragments, Nodes, Rendering } from '@optionfactory/ftl';
+import { ParsedElement, Attributes, registry, Fragments, Nodes, Rendering } from '@optionfactory/ftl';
 
 class Base64 {
     static encode(arrayBuffer, dialect) {
@@ -1213,14 +1213,18 @@ class Bindings {
     /**
      * 
      * @param {HTMLFormElement} form 
+     * @param {HTMLElement} [submitter]
      * @returns 
      */
-    static extractFrom(form){
+    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){
+                continue;
+            }
             result = Bindings.providePath(result, /** @type {string} */(el.getAttribute('name')), Bindings.extract(el));
         }
         return result;
@@ -1354,7 +1358,7 @@ class Form extends ParsedElement {
         form.addEventListener('submit', async (e) => {
             e.preventDefault();
             e.stopPropagation();
-            await this.submit();
+            await this.submit(e.submitter);
         });
         if (this.hasAttribute("clear-invalid-on-change")) {
             this.addEventListener('change', (/** @type any */evt) => {
@@ -1363,11 +1367,16 @@ class Form extends ParsedElement {
         }
         this.replaceChildren(form);
     }
-    async submit() {
+    /**
+     * 
+     * @param {HTMLElement} [submitter]
+     * @returns 
+     */
+    async submit(submitter) {
         this.spinner(true);
         try {
             const loader = registry.component(this.getAttribute("loader") ?? 'loaders:form').create(this);
-            const values = this.values;
+            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 } });
@@ -1400,8 +1409,11 @@ class Form extends ParsedElement {
             const hel = /** @type HTMLElement */ (el);
             hel.hidden = !spin;
         });
-        this.querySelectorAll('[type=submit],[type=reset]').forEach(el => {
-            const hel = /** @type HTMLButtonElement */ (el);
+        this.querySelectorAll('input,button').forEach(el => {
+            const hel = /** @type HTMLButtonElement|HTMLInputElement */ (el);
+            if(hel.type !== 'submit' && hel.type !== 'reset'){
+                return;
+            }
             hel.disabled = spin;
         });
     }