@optionfactory/ful 6.0.1 → 6.0.3

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,12 +1213,14 @@ 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")){
+            // 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));
@@ -1354,7 +1356,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 +1365,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 } });