bard-attachment_field 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2ae64b317884629f1640e9e60042f4fd6483a5f76aa27a541e8cb090a9ab513
-  data.tar.gz: 18b7d64724a970afb9a8bc9c9dfe63fa07531033929b8ce25f8b8072d3243949
+  metadata.gz: fa5230e35acbf0f53cec473a5f38fe446d61b5bcd53fc3582671ac6cb6eee2d8
+  data.tar.gz: ce72ba7c879890dd9a587e858c4f6e895f961d3adf47353bc9f06a4d301dc441
 SHA512:
-  metadata.gz: e5dba5578a41090328f203826e7032b41557ee5e7d552809c7958d15af8ddecf7c7a7dd3467319ed8aca8ffb31a5487ed76472201d12053832c69fe55165f4f4
-  data.tar.gz: f061a728c792c4f1d42882fdf791617e3fe020461642f8560fe83908a407d565de2e33ba73e8e35488bc9bddb5b22a65d1aaf38ac0f0f72e308aa4e5f2e63e7c
+  metadata.gz: 8a51d0f59a8683147ac2c33f21890a1ecb9663935823a5e61ea93b15f7f5001465e308e4993ee38e89cea814476a75793968bfd571a69ea9759e9fab9b430d47
+  data.tar.gz: ab279c90963b58f1a25389662f6ea49267597ced211b67559278c42e0efda6345f0583a5b365be46d29595cfe0b04f5a3182d490b5019aba33e574a4823f6d6c

data/app/assets/javascripts/input-attachment.js

@@ -5043,15 +5043,16 @@ var o2 = class _o {
   element;
   controllers;
   submitted;
+  submitter;
   processing;
   constructor(t2, { uploadDialog: e3 = true } = {}) {
-    this.element = t2, this.controllers = [], this.submitted = false, this.processing = false, e3 && (this.dialog = document.createElement("upload-dialog"), this.dialog.id = "form-controller-dialog", this.element.appendChild(this.dialog)), this.element.addEventListener("submit", ((t3) => this.submit(t3))), window.addEventListener("beforeunload", ((t3) => this.beforeUnload(t3))), this.element.addEventListener("direct-upload:initialize", ((t3) => this.init(t3))), this.element.addEventListener("direct-upload:start", ((t3) => this.start(t3))), this.element.addEventListener("direct-upload:progress", ((t3) => this.progress(t3))), this.element.addEventListener("direct-upload:error", ((t3) => this.error(t3))), this.element.addEventListener("direct-upload:end", ((t3) => this.end(t3))), this.element.addEventListener("attachment-file:remove", ((t3) => this.removeUploadedFile(t3)));
+    this.element = t2, this.controllers = [], this.submitted = false, this.processing = false, e3 && (this.dialog = document.createElement("upload-dialog"), this.dialog.id = "form-controller-dialog", this.element.appendChild(this.dialog)), this.element.addEventListener("submit", ((t3) => this.submit(t3)), { capture: true }), window.addEventListener("beforeunload", ((t3) => this.beforeUnload(t3))), this.element.addEventListener("direct-upload:initialize", ((t3) => this.init(t3))), this.element.addEventListener("direct-upload:start", ((t3) => this.start(t3))), this.element.addEventListener("direct-upload:progress", ((t3) => this.progress(t3))), this.element.addEventListener("direct-upload:error", ((t3) => this.error(t3))), this.element.addEventListener("direct-upload:end", ((t3) => this.end(t3))), this.element.addEventListener("attachment-file:remove", ((t3) => this.removeUploadedFile(t3)));
   }
   beforeUnload(t2) {
     if (this.processing) return t2.preventDefault(), t2.returnValue = "";
   }
   submit(t2) {
-    (0 !== this.controllers.length || this.hasUploadErrors() || this.processing) && (t2.preventDefault(), this.submitted = true, this.setInputAttachmentsDisabled(true), this.startNextController(), this.processing && this.dialog?.open());
+    (0 !== this.controllers.length || this.hasUploadErrors() || this.processing) && (t2.preventDefault(), t2.stopImmediatePropagation(), this.submitted = true, this.submitter = t2.submitter, this.setInputAttachmentsDisabled(true), this.startNextController(), this.processing && this.dialog?.open());
   }
   startNextController() {
     if (this.processing) return;
@@ -5067,7 +5068,7 @@ var o2 = class _o {
     if (this.submitted) {
       if (this.hasUploadErrors()) return this.dialog?.close(), void this.setInputAttachmentsDisabled(false);
       this.setInputAttachmentsDisabled(true), requestAnimationFrame((() => {
-        this.element.submit();
+        this.submitted = false, this.setInputAttachmentsDisabled(false), this.dialog?.close(), this.element.requestSubmit(this.submitter);
       }));
     }
   }

data/input-attachment/src/components/input-attachment/form-controller.tsx

@@ -11,6 +11,7 @@ export default class FormController {
   element: HTMLFormElement
   controllers: Array<DirectUploadController>
   submitted: boolean
+  submitter: HTMLElement | null
   processing: boolean
 
   constructor(form, { uploadDialog = true } = {}) {
@@ -25,7 +26,7 @@ export default class FormController {
       this.element.appendChild(this.dialog)
     }
 
-    this.element.addEventListener("submit", event => this.submit(event))
+    this.element.addEventListener("submit", event => this.submit(event), { capture: true })
     window.addEventListener("beforeunload", event => this.beforeUnload(event))
 
     this.element.addEventListener("direct-upload:initialize", event => this.init(event))
@@ -47,7 +48,9 @@ export default class FormController {
   submit(event) {
     if(this.controllers.length === 0 && !this.hasUploadErrors() && !this.processing) return
     event.preventDefault()
+    event.stopImmediatePropagation() // the held submit isn't the real one; listeners see the replay instead
     this.submitted = true
+    this.submitter = event.submitter
     this.setInputAttachmentsDisabled(true)
     this.startNextController()
     if(this.processing) {
@@ -96,7 +99,11 @@ export default class FormController {
     }
     this.setInputAttachmentsDisabled(true)
     requestAnimationFrame(() => { // run after pending rAF callbacks (e.g. updateFormValue)
-      this.element.submit()
+      this.submitted = false
+      this.setInputAttachmentsDisabled(false)
+      ;(this.dialog as any)?.close()
+      // replay through the submit event, so Turbo handles it like the original
+      this.element.requestSubmit(this.submitter)
     })
   }
 

data/lib/bard/attachment_field/version.rb

@@ -2,6 +2,6 @@
 
 module Bard
   module AttachmentField
-    VERSION = "0.6.5"
+    VERSION = "0.6.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard-attachment_field
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Micah Geisel
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-05 00:00:00.000000000 Z
+date: 2026-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage