bard-attachment_field 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f060d98d9b6c3c4e0494845d868b7f702009df53e1cd39ac0d659402a8c28b97
-  data.tar.gz: a2e2afa88506420373c09e818612a037eb111a910370c87a2f41c69968d84151
+  metadata.gz: e7ee47362d9328e10ce601c919f111a0e9ea5fe99545b699dd4bebac3afaeb62
+  data.tar.gz: '0803e538c1fdbb231dee995f69d0bcb071c765e6dfcd52d5e38f237a353bacd1'
 SHA512:
-  metadata.gz: 1480f10a1aaf61dc8f14e7c0e97062b033e85aa8d97d47e6df857cf1d254ad3b3adbee192d3de2156dc19dc3d2de16f244c9b6561933483c70a797ba63a0eecc
-  data.tar.gz: c78324d6d01030eeb10180287c14c6218e122ad865b511c89c7613ce8515b04aa3f138d4cdf8e0aab35216b66443478fafb6e6314955cfe9b01d06b1320493fb
+  metadata.gz: 7f285040a99291e3224ba2c3c8f8259e4a67ff8c6901f15356517752363706271d4f12765680151f523070ebd967429c4940f43d99a04b9d9b09fbf9e7d7be70
+  data.tar.gz: 6f0e372c7eb699efb282e71de7ff8156f7f7615d5cd82bba896697f961a78beeb5b72cf24adaf47ce58598d306879c2ce6c6cf1ca1cf619df16c14299bf2aacf

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

@@ -5070,9 +5070,6 @@ var FetchResponse = class {
   get isTurboStream() {
     return this.contentType.match(/^text\/vnd\.turbo-stream\.html/);
   }
-  get isScript() {
-    return this.contentType.match(/\b(?:java|ecma)script\b/);
-  }
   async renderTurboStream() {
     if (this.isTurboStream) {
       if (window.Turbo) {
@@ -5084,22 +5081,6 @@ var FetchResponse = class {
       return Promise.reject(new Error(`Expected a Turbo Stream response but got "${this.contentType}" instead`));
     }
   }
-  async activeScript() {
-    if (this.isScript) {
-      const script = document.createElement("script");
-      const metaTag = document.querySelector("meta[name=csp-nonce]");
-      if (metaTag) {
-        const nonce = metaTag.nonce === "" ? metaTag.content : metaTag.nonce;
-        if (nonce) {
-          script.setAttribute("nonce", nonce);
-        }
-      }
-      script.innerHTML = await this.text;
-      document.body.appendChild(script);
-    } else {
-      return Promise.reject(new Error(`Expected a Script response but got "${this.contentType}" instead`));
-    }
-  }
 };
 var RequestInterceptor = class {
   static register(interceptor) {
@@ -5145,7 +5126,7 @@ function stringEntriesFromFormData(formData) {
 function mergeEntries(searchParams, entries) {
   for (const [name, value] of entries) {
     if (value instanceof window.File) continue;
-    if (searchParams.has(name) && !name.includes("[]")) {
+    if (searchParams.has(name)) {
       searchParams.delete(name);
       searchParams.set(name, value);
     } else {
@@ -5168,16 +5149,11 @@ var FetchRequest = class {
     } catch (error) {
       console.error(error);
     }
-    const fetch = window.Turbo ? window.Turbo.fetch : window.fetch;
-    const response = new FetchResponse(await fetch(this.url, this.fetchOptions));
+    const response = new FetchResponse(await window.fetch(this.url, this.fetchOptions));
     if (response.unauthenticated && response.authenticationURL) {
       return Promise.reject(window.location.href = response.authenticationURL);
     }
-    if (response.isScript) {
-      await response.activeScript();
-    }
-    const responseStatusIsTurboStreamable = response.ok || response.unprocessableEntity;
-    if (responseStatusIsTurboStreamable && response.isTurboStream) {
+    if (response.ok && response.isTurboStream) {
       await response.renderTurboStream();
     }
     return response;
@@ -5187,38 +5163,27 @@ var FetchRequest = class {
     headers[key] = value;
     this.options.headers = headers;
   }
-  sameHostname() {
-    if (!this.originalUrl.startsWith("http:") && !this.originalUrl.startsWith("https:")) {
-      return true;
-    }
-    try {
-      return new URL(this.originalUrl).hostname === window.location.hostname;
-    } catch (_) {
-      return true;
-    }
-  }
   get fetchOptions() {
     return {
       method: this.method.toUpperCase(),
       headers: this.headers,
       body: this.formattedBody,
       signal: this.signal,
-      credentials: this.credentials,
-      redirect: this.redirect,
-      keepalive: this.keepalive
+      credentials: "same-origin",
+      redirect: this.redirect
     };
   }
   get headers() {
-    const baseHeaders = {
-      "X-Requested-With": "XMLHttpRequest",
-      "Content-Type": this.contentType,
-      Accept: this.accept
-    };
-    if (this.sameHostname()) {
-      baseHeaders["X-CSRF-Token"] = this.csrfToken;
-    }
     return compact(
-      Object.assign(baseHeaders, this.additionalHeaders)
+      Object.assign(
+        {
+          "X-Requested-With": "XMLHttpRequest",
+          "X-CSRF-Token": this.csrfToken,
+          "Content-Type": this.contentType,
+          Accept: this.accept
+        },
+        this.additionalHeaders
+      )
     );
   }
   get csrfToken() {
@@ -5242,8 +5207,6 @@ var FetchRequest = class {
         return "text/vnd.turbo-stream.html, text/html, application/xhtml+xml";
       case "json":
         return "application/json, application/vnd.api+json";
-      case "script":
-        return "text/javascript, application/javascript";
       default:
         return "*/*";
     }
@@ -5278,12 +5241,6 @@ var FetchRequest = class {
   get redirect() {
     return this.options.redirect || "follow";
   }
-  get credentials() {
-    return this.options.credentials || "same-origin";
-  }
-  get keepalive() {
-    return this.options.keepalive || false;
-  }
   get additionalHeaders() {
     return this.options.headers || {};
   }
@@ -5494,9 +5451,7 @@ var FormController = class _FormController {
       </dialog>`);
     this.dialog = this.element.querySelector("#form-controller-dialog");
     this.progressContainerTarget = this.dialog.querySelector("#progress-container");
-    if (this.element.dataset.remote !== "true" && (this.element.dataset.turbo == "false" || !window.Turbo?.session?.enabled)) {
-      this.element.addEventListener("submit", (event) => this.submit(event));
-    }
+    this.element.addEventListener("submit", (event) => this.submit(event));
     window.addEventListener("beforeunload", (event) => this.beforeUnload(event));
     this.element.addEventListener("direct-upload:initialize", (event) => this.init(event));
     this.element.addEventListener("direct-upload:start", (event) => this.start(event));
@@ -5512,10 +5467,11 @@ var FormController = class _FormController {
     }
   }
   submit(event) {
-    if (this.controllers.length === 0 && !this.hasUploadErrors())
+    if (this.controllers.length === 0 && !this.hasUploadErrors() && !this.processing)
       return;
     event.preventDefault();
     this.submitted = true;
+    this.setInputAttachmentsDisabled(true);
     this.startNextController();
     if (this.processing) {
       this.dialog.showModal();
@@ -5527,10 +5483,18 @@ var FormController = class _FormController {
     const controller = this.controllers.shift();
     if (controller) {
       this.processing = true;
-      this.setInputAttachmentsDisabled(true);
+      if (this.submitted) {
+        this.setInputAttachmentsDisabled(true);
+      } else {
+        this.setControllerInputDisabled(controller, true);
+      }
       controller.start((error) => {
-        if (error) {
-          this.setInputAttachmentsDisabled(false);
+        if (this.submitted) {
+          if (error) {
+            this.setInputAttachmentsDisabled(false);
+          }
+        } else {
+          this.setControllerInputDisabled(controller, false);
         }
         this.processing = false;
         this.startNextController();
@@ -5543,16 +5507,22 @@ var FormController = class _FormController {
     return Array.from(this.element.querySelectorAll("attachment-file")).some((el) => el.state === "error");
   }
   submitForm() {
-    if (this.submitted) {
-      if (this.hasUploadErrors()) {
-        this.dialog.close();
-        this.setInputAttachmentsDisabled(false);
-        return;
-      }
-      this.setInputAttachmentsDisabled(true);
-      window.setTimeout(() => {
-        this.element.submit();
-      }, 10);
+    if (!this.submitted)
+      return;
+    if (this.hasUploadErrors()) {
+      this.dialog.close();
+      this.setInputAttachmentsDisabled(false);
+      return;
+    }
+    this.setInputAttachmentsDisabled(true);
+    requestAnimationFrame(() => {
+      this.element.submit();
+    });
+  }
+  setControllerInputDisabled(controller, disabled) {
+    const inputAttachment = controller.uploadedFile.closest("input-attachment");
+    if (inputAttachment) {
+      inputAttachment.disabled = disabled;
     }
   }
   setInputAttachmentsDisabled(disabled) {

data/input-attachment/package.json

@@ -21,7 +21,10 @@
   },
   "jest": {
     "testEnvironment": "jsdom",
-    "extensionsToTreatAsEsm": [".ts", ".tsx"],
+    "extensionsToTreatAsEsm": [
+      ".ts",
+      ".tsx"
+    ],
     "globals": {
       "ts-jest": {
         "useESM": true
@@ -53,5 +56,8 @@
       "import": "./dist/components/index.js"
     }
   },
-  "license": "MIT"
+  "license": "MIT",
+  "volta": {
+    "node": "22.22.1"
+  }
 }

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

@@ -34,9 +34,7 @@ export default class FormController {
     this.dialog = this.element.querySelector("#form-controller-dialog")
     this.progressContainerTarget = this.dialog.querySelector("#progress-container")
 
-    if(this.element.dataset.remote !== "true" && (this.element.dataset.turbo == "false" || !(window as any).Turbo?.session?.enabled)) {
-      this.element.addEventListener("submit", event => this.submit(event))
-    }
+    this.element.addEventListener("submit", event => this.submit(event))
     window.addEventListener("beforeunload", event => this.beforeUnload(event))
 
     this.element.addEventListener("direct-upload:initialize", event => this.init(event))
@@ -56,9 +54,10 @@ export default class FormController {
   }
 
   submit(event) {
-    if(this.controllers.length === 0 && !this.hasUploadErrors()) return
+    if(this.controllers.length === 0 && !this.hasUploadErrors() && !this.processing) return
     event.preventDefault()
     this.submitted = true
+    this.setInputAttachmentsDisabled(true)
     this.startNextController()
     if(this.processing) {
       this.dialog.showModal()
@@ -71,10 +70,18 @@ export default class FormController {
     const controller = this.controllers.shift()
     if(controller) {
       this.processing = true
-      this.setInputAttachmentsDisabled(true)
+      if (this.submitted) {
+        this.setInputAttachmentsDisabled(true)
+      } else {
+        this.setControllerInputDisabled(controller, true)
+      }
       controller.start(error => {
-        if(error) {
-          this.setInputAttachmentsDisabled(false)
+        if (this.submitted) {
+          if(error) {
+            this.setInputAttachmentsDisabled(false)
+          }
+        } else {
+          this.setControllerInputDisabled(controller, false)
         }
         this.processing = false
         this.startNextController()
@@ -90,16 +97,22 @@ export default class FormController {
   }
 
   submitForm() {
-    if(this.submitted) {
-      if(this.hasUploadErrors()) {
-        this.dialog.close()
-        this.setInputAttachmentsDisabled(false)
-        return
-      }
-      this.setInputAttachmentsDisabled(true)
-      window.setTimeout(() => { // allow other async tasks to complete
-        this.element.submit()
-      }, 10)
+    if(!this.submitted) return
+    if(this.hasUploadErrors()) {
+      this.dialog.close()
+      this.setInputAttachmentsDisabled(false)
+      return
+    }
+    this.setInputAttachmentsDisabled(true)
+    requestAnimationFrame(() => { // run after pending rAF callbacks (e.g. updateFormValue)
+      this.element.submit()
+    })
+  }
+
+  setControllerInputDisabled(controller: DirectUploadController, disabled: boolean) {
+    const inputAttachment = (controller.uploadedFile as any).closest('input-attachment')
+    if (inputAttachment) {
+      inputAttachment.disabled = disabled
     }
   }
 

data/lib/bard/attachment_field/cucumber.rb

@@ -309,6 +309,22 @@ Then "the {string} attachment field should be disabled" do |field|
   expect(is_disabled).to be true
 end
 
+Then "the {string} attachment field should not be disabled" do |field|
+  element = Bard::AttachmentField::TestHelper.find_field(page, field)
+
+  is_disabled = page.evaluate_script(<<~JS)
+    (function() {
+      const element = document.getElementById('#{element[:id]}');
+      if (element.hasAttribute('disabled')) return true;
+      if (element.closest('fieldset[disabled]')) return true;
+      const fileInput = element.shadowRoot?.querySelector('input[type="file"]');
+      return fileInput?.disabled || false;
+    })()
+  JS
+
+  expect(is_disabled).to be false
+end
+
 Then "the {string} attachment field should have a validation error containing {string}" do |field, message|
   element = Bard::AttachmentField::TestHelper.find_field(page, field)
   messages = Bard::AttachmentField::TestHelper.validation_messages(page, element)

data/lib/bard/attachment_field/version.rb

@@ -2,6 +2,6 @@
 
 module Bard
   module AttachmentField
-    VERSION = "0.2.4"
+    VERSION = "0.2.5"
   end
 end

metadata

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