bard-attachment_field 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edba1eefd3a08f4e68003f8fdb54f1c56d182c7fa7861a3a776a0bc03b144720
-  data.tar.gz: fe58cfe7d8528cb324bcce8b2b5dc5c786a9ab25e8f05cf24673a6f87e6b8542
+  metadata.gz: 97544f73074b88b48df66fd5a7aa865a8b88fd4eb8078bfc11ff605973c312ed
+  data.tar.gz: f29d06de7233f15966ae9b139d10bf0c048fc02aa3c233af72aadcffdd4cf2b6
 SHA512:
-  metadata.gz: d3d9fc5faa9d0d7b195e7c15dce24fc9484644da25df67adb254362927d397ddd409de1a0a8e023f9e91c060633219a9bd3456a20c146973947ebcd38d8deba7
-  data.tar.gz: 134d8975835697d189f17da80a3aaa1832b115b0b7d632245acd5d29f9ae24a05de4cef61110097dae50bbbbee25465ef6aebc89de74b7dbbb784121792a62f3
+  metadata.gz: 118ac9484ef7b4f96a7e2a837fcc38bf3443ca576555ac9d0dcfdab5d16c57074d7927f1e3f454f51c4e2bd83d0fadc60d5810773817825044c7aa5c311dd570
+  data.tar.gz: 708a641e9b386a0e91a80f14046711518ca6a9e19a461f894aadefa949c2c36927479a0774fc882a0fea36dbd678f47fb1d787168618e0da76c5a6d943ecdef2

data/Appraisals

@@ -14,4 +14,5 @@ end
 
 appraise "rails-8.1" do
   gem "rails", "~> 8.1.0"
+  gem "json", "< 3" # ActiveSupport 8.1.3.1 passes JSON.parse options positionally; fixed in 8-1-stable
 end

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

@@ -5179,7 +5179,7 @@ var c3 = proxyCustomElement(class extends H {
   updateFormValue() {
     if (!this.name || !this.internals?.setFormValue) return;
     const t2 = new FormData(), e3 = this.files.map(((t3) => t3.value)).filter(((t3) => t3 && "string" != typeof t3 ? (console.error("[input-attachment] Non-string value detected on attachment-file:", typeof t3, t3, Error().stack), false) : "string" == typeof t3 && t3.length > 0));
-    if (this.multiple ? (e3.forEach(((e4) => t2.append(this.name, e4))), 0 === e3.length && t2.append(this.name, "")) : t2.set(this.name, e3[0] || ""), this.internals.setFormValue(t2), this.required && 0 === this.files.length) this.internals.setValidity({ valueMissing: true }, "Please select a file.", this.fileInput);
+    if (this.multiple ? (e3.forEach(((e4) => t2.append(this.name, e4))), 0 === e3.length && t2.append(this.name, "")) : t2.set(this.name, e3[0] || ""), this.internals.setFormValue(t2, this.value), this.required && 0 === this.files.length) this.internals.setValidity({ valueMissing: true }, "Please select a file.", this.fileInput);
     else {
       const t3 = this.files.map(((t4) => t4.validationError)).filter(((t4) => t4 && t4.length > 0));
       t3.length > 0 ? this.internals.setValidity({ customError: true }, t3[0], this.fileInput) : this.internals.setValidity({});
@@ -5188,6 +5188,17 @@ var c3 = proxyCustomElement(class extends H {
   reset() {
     this.files = [];
   }
+  formStateRestoreCallback(t2) {
+    this.restorable(t2) ? this.value = t2 : this.updateFormValue();
+  }
+  restorable(t2) {
+    if ("string" != typeof t2) return false;
+    try {
+      return Array.isArray(JSON.parse(t2));
+    } catch {
+      return false;
+    }
+  }
   handleFileInputChange = () => {
     this.fileInput?.files?.length && (this.addFiles(this.fileInput.files), this.fileInput.value = null);
   };
@@ -5215,7 +5226,7 @@ var c3 = proxyCustomElement(class extends H {
     return this.disabled || !!this.el.closest("fieldset[disabled]");
   }
   render() {
-    return h(Host, { key: "09588ce0af3411cc579d7d828c604fcc1fd44825" }, h("input", { key: "1311e26122c5778efc9eb1176c4a4986f1865d7d", ref: (t2) => this.fileInput = t2, type: "file", "aria-label": "Choose " + (this.multiple ? "files" : "file"), multiple: this.multiple, accept: this.accepts, required: this.required && 0 === this.files.length, disabled: this.isDisabled, onChange: () => this.handleFileInputChange() }), h("file-drop", { key: "7adac8601feb97f1123482bde83cf0bb7bd931b7", onClick: () => this.fileInput?.click(), onDrop: this.handleDrop }, h("p", { key: "38faec2ec357d905719948b3f0f46b23abde4c40", part: "title" }, h("strong", { key: "61bd69a635852191f31e4e986f13bbf63e57dfa3" }, "Choose ", this.multiple ? "files" : "file", " "), h("span", { key: "6ac8e031e03ed7d23c83edbacde03c441c4b4df7" }, "or drag ", this.multiple ? "them" : "it", " here.")), h("div", { key: "476bdeafcf7e6211a3feccdc0c275efaf1bff928", class: "media-preview " + (this.multiple ? "-stacked" : "") }, h("slot", { key: "f843426c3a3cef23ccf8d3f1f584075762ecc8b2" }))));
+    return h(Host, { key: "9b1ce57edcd31be2885c5923e65c8f4d0ac31002" }, h("input", { key: "a498cdd103d4b3385bfbfb4c2158ae2c15ed3b55", ref: (t2) => this.fileInput = t2, type: "file", "aria-label": "Choose " + (this.multiple ? "files" : "file"), multiple: this.multiple, accept: this.accepts, required: this.required && 0 === this.files.length, disabled: this.isDisabled, onChange: () => this.handleFileInputChange() }), h("file-drop", { key: "9edc0c1e22d0a6385515f6dff44965c9f3e7a40c", onClick: () => this.fileInput?.click(), onDrop: this.handleDrop }, h("p", { key: "ae06d2f6be38f25eb977e66b1c6c565ca0e3c97d", part: "title" }, h("strong", { key: "c53fc410ec761ca7f044c25cceb1be12c6e37b5c" }, "Choose ", this.multiple ? "files" : "file", " "), h("span", { key: "227a48d7ed21443ec97f646b58611cbf611145bc" }, "or drag ", this.multiple ? "them" : "it", " here.")), h("div", { key: "25fce75fb15b66bd13bea450054d22ddabd05824", class: "media-preview " + (this.multiple ? "-stacked" : "") }, h("slot", { key: "86f6db9bef3f2d6c16a72679ec33b751aef4eec5" }))));
   }
   componentDidRender() {
     if (0 === this.files.length) {

data/gemfiles/rails_8.1.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 8.1.0"
+gem "json", "< 3"
 
 gemspec path: "../"

data/input-attachment/src/components/input-attachment/input-attachment.spec.tsx

@@ -34,4 +34,45 @@ describe('input-attachment', () => {
       </input-attachment>
     `);
   });
+
+  describe('formStateRestoreCallback (Firefox session restore)', () => {
+    async function newPage() {
+      const page = await newSpecPage({
+        components: [InputAttachment],
+        html: `<form><input-attachment name="attachments[]" multiple></input-attachment></form>`,
+      });
+      const instance: any = page.rootInstance;
+      const calls: any[] = [];
+      instance.internals = {
+        setFormValue: (value: any, state: any) => calls.push({ value, state }),
+        setValidity: () => {},
+      };
+      return { page, instance, calls };
+    }
+
+    it('saves the files as a JSON string state, not the FormData Firefox would flatten', async () => {
+      const { instance, calls } = await newPage();
+      instance.files = [{ value: 'signed-one' }, { value: 'signed-two' }];
+      instance.updateFormValue();
+      const last = calls[calls.length - 1];
+      expect(typeof last.state).toBe('string');
+      expect(JSON.parse(last.state).map((f: any) => f.value)).toEqual(['signed-one', 'signed-two']);
+    });
+
+    it('rebuilds the attachments from the restored state string', async () => {
+      const { instance, calls } = await newPage();
+      const state = JSON.stringify([{ value: 'signed-one', filename: 'a.png', state: 'complete' }]);
+      instance.formStateRestoreCallback(state);
+      expect(instance.files.map((f: any) => f.value)).toEqual(['signed-one']);
+      instance.updateFormValue();
+      expect(calls[calls.length - 1].value.getAll('attachments[]')).toEqual(['signed-one']);
+    });
+
+    it('falls back to the current files when the restored state is the coerced "[object Object]"', async () => {
+      const { instance, calls } = await newPage();
+      instance.files = [{ value: 'signed-one' }];
+      instance.formStateRestoreCallback('[object Object]');
+      expect(calls[calls.length - 1].value.getAll('attachments[]')).toEqual(['signed-one']);
+    });
+  });
 });

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

@@ -125,7 +125,9 @@ export class InputAttachment {
       // For has_one_attached: set single value (or empty string if none)
       formData.set(this.name, values[0] || '')
     }
-    this.internals.setFormValue(formData)
+    // State is a JSON string (this.value), not the FormData: Firefox flattens a FormData to {}
+    // in the session store and restores it as "[object Object]", but a string survives intact.
+    this.internals.setFormValue(formData, this.value)
 
     // Update validity state - check for required and child validation errors
     if (this.required && this.files.length === 0) {
@@ -147,6 +149,27 @@ export class InputAttachment {
     this.files = []
   }
 
+  // On session restore Firefox hands back the state we saved (this.value, a JSON string of the
+  // files). Rebuild the attachments from it so they survive a browser restart; fall back to
+  // re-deriving from the current files if the state is missing or malformed (e.g. the coerced
+  // "[object Object]", which is not valid JSON).
+  formStateRestoreCallback(state) {
+    if (this.restorable(state)) {
+      this.value = state
+    } else {
+      this.updateFormValue()
+    }
+  }
+
+  restorable(state): boolean {
+    if (typeof state !== "string") return false
+    try {
+      return Array.isArray(JSON.parse(state))
+    } catch {
+      return false
+    }
+  }
+
   handleFileInputChange = () => {
     if (!this.fileInput?.files?.length) return
     this.addFiles(this.fileInput.files)

data/lib/bard/attachment_field/version.rb

@@ -2,6 +2,6 @@
 
 module Bard
   module AttachmentField
-    VERSION = "0.6.3"
+    VERSION = "0.6.4"
   end
 end

metadata

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