actiontext 7.2.2.1 → 8.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae880abbc66a8b853cce05dc41d2962a78d7ce409fb7329a58f39bb1621cf4b2
-  data.tar.gz: 0eed3fd02e87093e9520e90577fe1fd560e0ef7da9eaa7ccb1e49751d50362ba
+  metadata.gz: 5b092ec1c0802a3bde54aa34e486bc4e943559d80c7a5b848dfef6520886d791
+  data.tar.gz: '08edc788a5dac28c6de1186100be082f6f5b87d641983784fa0635040e8a40bc'
 SHA512:
-  metadata.gz: 9d2628de4f89b6f688536e657b1e89d058ae119b5c4f253b836cf51b96a35949bccc673e9a86f9e1dbc35013d66651534e1bb94460ce7374b88ef6575f22d5fa
-  data.tar.gz: ad9de254ed7ab1ceb550c44fbae23a594e2abbcaf3533460eb9ecb0544eda5024c6f7c7d3d576c13511bfc11ada6b69f5a75bbf3e1c31cd6afcb1d6121733977
+  metadata.gz: 2f8c3814fc94289ccd59710e97b88377845d816f3e5576f9f6f56a270e4d688a09588874b973868502ca77b043e012f84f91ebf55775e3196de585a20976fe95
+  data.tar.gz: ed2d48e94658668d0bbe2b6073e0f23659a79c92c491811975b2b0b6c4275622c0c83f693b4388056a51d026c934f79605e348dc8cbaa0f2b922e7acb6962b24

data/CHANGELOG.md

@@ -1,85 +1,73 @@
-## Rails 7.2.2.1 (December 10, 2024) ##
-
-*   Update vendored trix version to 2.1.10
-
-    *John Hawthorn*
-
-
-## Rails 7.2.2 (October 30, 2024) ##
+## Rails 8.1.2 (January 08, 2026) ##
 
 *   No changes.
 
 
-## Rails 7.2.1.2 (October 23, 2024) ##
+## Rails 8.1.1 (October 28, 2025) ##
 
 *   No changes.
 
 
-## Rails 7.2.1.1 (October 15, 2024) ##
-
-*   Avoid backtracing in plain_text_for_blockquote_node
-
-    [CVE-2024-47888]
+## Rails 8.1.0 (October 22, 2025) ##
 
-    *John Hawthorn*
+*   De-couple `@rails/actiontext/attachment_upload.js` from `Trix.Attachment`
 
-## Rails 7.2.1 (August 22, 2024) ##
+    Implement `@rails/actiontext/index.js` with a `direct-upload:progress` event
+    listeners and `Promise` resolution.
 
-*   Strip `content` attribute if the key is present but the value is empty
-
-    *Jeremy Green*
-
-
-## Rails 7.2.0 (August 09, 2024) ##
-*   Only sanitize `content` attribute when present in attachments.
+    *Sean Doyle*
 
-    *Petrik de Heus*
+*   Capture block content for form helper methods
+
+    ```erb
+    <%= rich_textarea_tag :content, nil do %>
+      <h1>hello world</h1>
+    <% end %>
+    <!-- <input type="hidden" name="content" id="trix_input_1" value="&lt;h1&gt;hello world&lt;/h1&gt;"/><trix-editor … -->
+
+    <%= rich_textarea :message, :content, input: "trix_input_1" do %>
+      <h1>hello world</h1>
+    <% end %>
+    <!-- <input type="hidden" name="message[content]" id="trix_input_1" value="&lt;h1&gt;hello world&lt;/h1&gt;"/><trix-editor … -->
+
+    <%= form_with model: Message.new do |form| %>
+      <%= form.rich_textarea :content do %>
+        <h1>hello world</h1>
+      <% end %>
+    <% end %>
+    <!-- <form action="/messages" accept-charset="UTF-8" method="post"><input type="hidden" name="message[content]" id="message_content_trix_input_message" value="&lt;h1&gt;hello world&lt;/h1&gt;"/><trix-editor … -->
+    ```
 
-*   Sanitize ActionText HTML ContentAttachment in Trix edit view
-    [CVE-2024-32464]
+    *Sean Doyle*
 
-    *Aaron Patterson*, *Zack Deveau*
+*   Generalize `:rich_text_area` Capybara selector
 
-*   Use `includes` instead of `eager_load` for `with_all_rich_text`.
+    Prepare for more Action Text-capable WYSIWYG editors by making
+    `:rich_text_area` rely on the presence of `[role="textbox"]` and
+    `[contenteditable]` HTML attributes rather than a `<trix-editor>` element.
 
-    *Petrik de Heus*
+    *Sean Doyle*
 
-*   Delegate `ActionText::Content#deconstruct` to `Nokogiri::XML::DocumentFragment#elements`.
+*   Forward `fill_in_rich_text_area` options to Capybara
 
     ```ruby
-    content = ActionText::Content.new <<~HTML
-      <h1>Hello, world</h1>
-
-      <div>The body</div>
-    HTML
-
-    content => [h1, div]
-
-    assert_pattern { h1 => { content: "Hello, world" } }
-    assert_pattern { div => { content: "The body" } }
+    fill_in_rich_textarea "Rich text editor", id: "trix_editor_1", with: "Hello world!"
     ```
 
     *Sean Doyle*
 
-*   Fix all Action Text database related models to respect
-    `ActiveRecord::Base.table_name_prefix` configuration.
+*   Attachment upload progress accounts for server processing time.
 
-    *Chedli Bourguiba*
+    *Jeremy Daer*
 
-*   Compile ESM package that can be used directly in the browser as actiontext.esm.js
+*   The Trix dependency is now satisfied by a gem, `action_text-trix`, rather than vendored
+    files. This allows applications to bump Trix versions independently of Rails
+    releases. Effectively this also upgrades Trix to `>= 2.1.15`.
 
-    *Matias Grunberg*
+    *Mike Dalessio*
 
-*   Fix using actiontext.js with Sprockets.
+*   Change `ActionText::RichText#embeds` assignment from `before_save` to `before_validation`
 
-    *Matias Grunberg*
-
-*   Upgrade Trix to 2.0.7
-
-    *Hartley McGuire*
-
-*   Fix using Trix with Sprockets.
-
-    *Hartley McGuire*
+    *Sean Doyle*
 
-Please check [7-1-stable](https://github.com/rails/rails/blob/7-1-stable/actiontext/CHANGELOG.md) for previous changes.
+Please check [8-0-stable](https://github.com/rails/rails/blob/8-0-stable/actiontext/CHANGELOG.md) for previous changes.

data/app/assets/javascripts/actiontext.esm.js

@@ -672,7 +672,7 @@ class DirectUploadController {
     }));
   }
   uploadRequestDidProgress(event) {
-    const progress = event.loaded / event.total * 100;
+    const progress = event.loaded / event.total * 90;
     if (progress) {
       this.dispatch("progress", {
         progress: progress
@@ -707,6 +707,42 @@ class DirectUploadController {
       xhr: xhr
     });
     xhr.upload.addEventListener("progress", (event => this.uploadRequestDidProgress(event)));
+    xhr.upload.addEventListener("loadend", (() => {
+      this.simulateResponseProgress(xhr);
+    }));
+  }
+  simulateResponseProgress(xhr) {
+    let progress = 90;
+    const startTime = Date.now();
+    const updateProgress = () => {
+      const elapsed = Date.now() - startTime;
+      const estimatedResponseTime = this.estimateResponseTime();
+      const responseProgress = Math.min(elapsed / estimatedResponseTime, 1);
+      progress = 90 + responseProgress * 9;
+      this.dispatch("progress", {
+        progress: progress
+      });
+      if (xhr.readyState !== XMLHttpRequest.DONE && progress < 99) {
+        requestAnimationFrame(updateProgress);
+      }
+    };
+    xhr.addEventListener("loadend", (() => {
+      this.dispatch("progress", {
+        progress: 100
+      });
+    }));
+    requestAnimationFrame(updateProgress);
+  }
+  estimateResponseTime() {
+    const fileSize = this.file.size;
+    const MB = 1024 * 1024;
+    if (fileSize < MB) {
+      return 1e3;
+    } else if (fileSize < 10 * MB) {
+      return 2e3;
+    } else {
+      return 3e3 + fileSize / MB * 50;
+    }
   }
 }
 
@@ -846,32 +882,92 @@ function autostart() {
 setTimeout(autostart, 1);
 
 class AttachmentUpload {
-  constructor(attachment, element) {
+  constructor(attachment, element, file = attachment.file) {
     this.attachment = attachment;
     this.element = element;
-    this.directUpload = new DirectUpload(attachment.file, this.directUploadUrl, this);
+    this.directUpload = new DirectUpload(file, this.directUploadUrl, this);
+    this.file = file;
   }
   start() {
-    this.directUpload.create(this.directUploadDidComplete.bind(this));
+    return new Promise(((resolve, reject) => {
+      this.directUpload.create(((error, attributes) => this.directUploadDidComplete(error, attributes, resolve, reject)));
+      this.dispatch("start");
+    }));
   }
   directUploadWillStoreFileWithXHR(xhr) {
     xhr.upload.addEventListener("progress", (event => {
-      const progress = event.loaded / event.total * 100;
-      this.attachment.setUploadProgress(progress);
+      const progress = event.loaded / event.total * 90;
+      if (progress) {
+        this.dispatch("progress", {
+          progress: progress
+        });
+      }
+    }));
+    xhr.upload.addEventListener("loadend", (() => {
+      this.simulateResponseProgress(xhr);
+    }));
+  }
+  simulateResponseProgress(xhr) {
+    let progress = 90;
+    const startTime = Date.now();
+    const updateProgress = () => {
+      const elapsed = Date.now() - startTime;
+      const estimatedResponseTime = this.estimateResponseTime();
+      const responseProgress = Math.min(elapsed / estimatedResponseTime, 1);
+      progress = 90 + responseProgress * 9;
+      this.dispatch("progress", {
+        progress: progress
+      });
+      if (xhr.readyState !== XMLHttpRequest.DONE && progress < 99) {
+        requestAnimationFrame(updateProgress);
+      }
+    };
+    xhr.addEventListener("loadend", (() => {
+      this.dispatch("progress", {
+        progress: 100
+      });
     }));
+    requestAnimationFrame(updateProgress);
+  }
+  estimateResponseTime() {
+    const fileSize = this.file.size;
+    const MB = 1024 * 1024;
+    if (fileSize < MB) {
+      return 1e3;
+    } else if (fileSize < 10 * MB) {
+      return 2e3;
+    } else {
+      return 3e3 + fileSize / MB * 50;
+    }
   }
-  directUploadDidComplete(error, attributes) {
+  directUploadDidComplete(error, attributes, resolve, reject) {
     if (error) {
-      throw new Error(`Direct upload failed: ${error}`);
+      this.dispatchError(error, reject);
+    } else {
+      resolve({
+        sgid: attributes.attachable_sgid,
+        url: this.createBlobUrl(attributes.signed_id, attributes.filename)
+      });
+      this.dispatch("end");
     }
-    this.attachment.setAttributes({
-      sgid: attributes.attachable_sgid,
-      url: this.createBlobUrl(attributes.signed_id, attributes.filename)
-    });
   }
   createBlobUrl(signedId, filename) {
     return this.blobUrlTemplate.replace(":signed_id", signedId).replace(":filename", encodeURIComponent(filename));
   }
+  dispatch(name, detail = {}) {
+    detail.attachment = this.attachment;
+    return dispatchEvent(this.element, `direct-upload:${name}`, {
+      detail: detail
+    });
+  }
+  dispatchError(error, reject) {
+    const event = this.dispatch("error", {
+      error: error
+    });
+    if (!event.defaultPrevented) {
+      reject(error);
+    }
+  }
   get directUploadUrl() {
     return this.element.dataset.directUploadUrl;
   }
@@ -883,7 +979,11 @@ class AttachmentUpload {
 addEventListener("trix-attachment-add", (event => {
   const {attachment: attachment, target: target} = event;
   if (attachment.file) {
-    const upload = new AttachmentUpload(attachment, target);
-    upload.start();
+    const upload = new AttachmentUpload(attachment, target, attachment.file);
+    const onProgress = event => attachment.setUploadProgress(event.detail.progress);
+    target.addEventListener("direct-upload:progress", onProgress);
+    upload.start().then((attributes => attachment.setAttributes(attributes))).catch((error => alert(error))).finally((() => target.removeEventListener("direct-upload:progress", onProgress)));
   }
 }));
+
+export { AttachmentUpload };

data/app/assets/javascripts/actiontext.js

@@ -1,6 +1,7 @@
-(function(factory) {
-  typeof define === "function" && define.amd ? define(factory) : factory();
-})((function() {
+(function(global, factory) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports) : typeof define === "function" && define.amd ? define([ "exports" ], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, 
+  factory(global.ActionText = {}));
+})(this, (function(exports) {
   "use strict";
   var sparkMd5 = {
     exports: {}
@@ -661,7 +662,7 @@
       }));
     }
     uploadRequestDidProgress(event) {
-      const progress = event.loaded / event.total * 100;
+      const progress = event.loaded / event.total * 90;
       if (progress) {
         this.dispatch("progress", {
           progress: progress
@@ -696,6 +697,42 @@
         xhr: xhr
       });
       xhr.upload.addEventListener("progress", (event => this.uploadRequestDidProgress(event)));
+      xhr.upload.addEventListener("loadend", (() => {
+        this.simulateResponseProgress(xhr);
+      }));
+    }
+    simulateResponseProgress(xhr) {
+      let progress = 90;
+      const startTime = Date.now();
+      const updateProgress = () => {
+        const elapsed = Date.now() - startTime;
+        const estimatedResponseTime = this.estimateResponseTime();
+        const responseProgress = Math.min(elapsed / estimatedResponseTime, 1);
+        progress = 90 + responseProgress * 9;
+        this.dispatch("progress", {
+          progress: progress
+        });
+        if (xhr.readyState !== XMLHttpRequest.DONE && progress < 99) {
+          requestAnimationFrame(updateProgress);
+        }
+      };
+      xhr.addEventListener("loadend", (() => {
+        this.dispatch("progress", {
+          progress: 100
+        });
+      }));
+      requestAnimationFrame(updateProgress);
+    }
+    estimateResponseTime() {
+      const fileSize = this.file.size;
+      const MB = 1024 * 1024;
+      if (fileSize < MB) {
+        return 1e3;
+      } else if (fileSize < 10 * MB) {
+        return 2e3;
+      } else {
+        return 3e3 + fileSize / MB * 50;
+      }
     }
   }
   const inputSelector = "input[type=file][data-direct-upload-url]:not([disabled])";
@@ -819,32 +856,92 @@
   }
   setTimeout(autostart, 1);
   class AttachmentUpload {
-    constructor(attachment, element) {
+    constructor(attachment, element, file = attachment.file) {
       this.attachment = attachment;
       this.element = element;
-      this.directUpload = new DirectUpload(attachment.file, this.directUploadUrl, this);
+      this.directUpload = new DirectUpload(file, this.directUploadUrl, this);
+      this.file = file;
     }
     start() {
-      this.directUpload.create(this.directUploadDidComplete.bind(this));
+      return new Promise(((resolve, reject) => {
+        this.directUpload.create(((error, attributes) => this.directUploadDidComplete(error, attributes, resolve, reject)));
+        this.dispatch("start");
+      }));
     }
     directUploadWillStoreFileWithXHR(xhr) {
       xhr.upload.addEventListener("progress", (event => {
-        const progress = event.loaded / event.total * 100;
-        this.attachment.setUploadProgress(progress);
+        const progress = event.loaded / event.total * 90;
+        if (progress) {
+          this.dispatch("progress", {
+            progress: progress
+          });
+        }
+      }));
+      xhr.upload.addEventListener("loadend", (() => {
+        this.simulateResponseProgress(xhr);
       }));
     }
-    directUploadDidComplete(error, attributes) {
+    simulateResponseProgress(xhr) {
+      let progress = 90;
+      const startTime = Date.now();
+      const updateProgress = () => {
+        const elapsed = Date.now() - startTime;
+        const estimatedResponseTime = this.estimateResponseTime();
+        const responseProgress = Math.min(elapsed / estimatedResponseTime, 1);
+        progress = 90 + responseProgress * 9;
+        this.dispatch("progress", {
+          progress: progress
+        });
+        if (xhr.readyState !== XMLHttpRequest.DONE && progress < 99) {
+          requestAnimationFrame(updateProgress);
+        }
+      };
+      xhr.addEventListener("loadend", (() => {
+        this.dispatch("progress", {
+          progress: 100
+        });
+      }));
+      requestAnimationFrame(updateProgress);
+    }
+    estimateResponseTime() {
+      const fileSize = this.file.size;
+      const MB = 1024 * 1024;
+      if (fileSize < MB) {
+        return 1e3;
+      } else if (fileSize < 10 * MB) {
+        return 2e3;
+      } else {
+        return 3e3 + fileSize / MB * 50;
+      }
+    }
+    directUploadDidComplete(error, attributes, resolve, reject) {
       if (error) {
-        throw new Error(`Direct upload failed: ${error}`);
+        this.dispatchError(error, reject);
+      } else {
+        resolve({
+          sgid: attributes.attachable_sgid,
+          url: this.createBlobUrl(attributes.signed_id, attributes.filename)
+        });
+        this.dispatch("end");
       }
-      this.attachment.setAttributes({
-        sgid: attributes.attachable_sgid,
-        url: this.createBlobUrl(attributes.signed_id, attributes.filename)
-      });
     }
     createBlobUrl(signedId, filename) {
       return this.blobUrlTemplate.replace(":signed_id", signedId).replace(":filename", encodeURIComponent(filename));
     }
+    dispatch(name, detail = {}) {
+      detail.attachment = this.attachment;
+      return dispatchEvent(this.element, `direct-upload:${name}`, {
+        detail: detail
+      });
+    }
+    dispatchError(error, reject) {
+      const event = this.dispatch("error", {
+        error: error
+      });
+      if (!event.defaultPrevented) {
+        reject(error);
+      }
+    }
     get directUploadUrl() {
       return this.element.dataset.directUploadUrl;
     }
@@ -855,8 +952,14 @@
   addEventListener("trix-attachment-add", (event => {
     const {attachment: attachment, target: target} = event;
     if (attachment.file) {
-      const upload = new AttachmentUpload(attachment, target);
-      upload.start();
+      const upload = new AttachmentUpload(attachment, target, attachment.file);
+      const onProgress = event => attachment.setUploadProgress(event.detail.progress);
+      target.addEventListener("direct-upload:progress", onProgress);
+      upload.start().then((attributes => attachment.setAttributes(attributes))).catch((error => alert(error))).finally((() => target.removeEventListener("direct-upload:progress", onProgress)));
     }
   }));
+  exports.AttachmentUpload = AttachmentUpload;
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
 }));

data/app/helpers/action_text/tag_helper.rb

@@ -24,10 +24,17 @@ module ActionText
     #
     # #### Example
     #
-    #     rich_text_area_tag "content", message.content
+    #     rich_textarea_tag "content", message.content
     #     # <input type="hidden" name="content" id="trix_input_post_1">
     #     # <trix-editor id="content" input="trix_input_post_1" class="trix-content" ...></trix-editor>
-    def rich_text_area_tag(name, value = nil, options = {})
+    #
+    #     rich_textarea_tag "content", nil do
+    #       "<h1>Default content</h1>"
+    #     end
+    #     # <input type="hidden" name="content" id="trix_input_post_1" value="&lt;h1&gt;Default content&lt;/h1&gt;">
+    #     # <trix-editor id="content" input="trix_input_post_1" class="trix-content" ...></trix-editor>
+    def rich_textarea_tag(name, value = nil, options = {}, &block)
+      value = capture(&block) if value.nil? && block_given?
       options = options.symbolize_keys
       form = options.delete(:form)
 
@@ -43,6 +50,7 @@ module ActionText
 
       input_tag + editor_tag
     end
+    alias_method :rich_text_area_tag, :rich_textarea_tag
   end
 end
 
@@ -52,11 +60,11 @@ module ActionView::Helpers
 
     delegate :dom_id, to: ActionView::RecordIdentifier
 
-    def render
+    def render(&block)
       options = @options.stringify_keys
-      add_default_name_and_id(options)
+      add_default_name_and_field(options)
       options["input"] ||= dom_id(object, [options["id"], :trix_input].compact.join("_")) if object
-      html_tag = @template_object.rich_text_area_tag(options.delete("name"), options.fetch("value") { value }, options.except("value"))
+      html_tag = @template_object.rich_textarea_tag(options.delete("name"), options.fetch("value") { value }, options.except("value"), &block)
       error_wrapping(html_tag)
     end
   end
@@ -76,28 +84,36 @@ module ActionView::Helpers
     #
     #
     # #### Example
-    #     rich_text_area :message, :content
+    #     rich_textarea :message, :content
     #     # <input type="hidden" name="message[content]" id="message_content_trix_input_message_1">
     #     # <trix-editor id="content" input="message_content_trix_input_message_1" class="trix-content" ...></trix-editor>
     #
-    #     rich_text_area :message, :content, value: "<h1>Default message</h1>"
-    #     # <input type="hidden" name="message[content]" id="message_content_trix_input_message_1" value="<h1>Default message</h1>">
+    #     rich_textarea :message, :content, value: "<h1>Default message</h1>"
+    #     # <input type="hidden" name="message[content]" id="message_content_trix_input_message_1" value="&lt;h1&gt;Default message&lt;/h1&gt;">
+    #     # <trix-editor id="content" input="message_content_trix_input_message_1" class="trix-content" ...></trix-editor>
+    #
+    #     rich_textarea :message, :content do
+    #       "<h1>Default message</h1>"
+    #     end
+    #     # <input type="hidden" name="message[content]" id="message_content_trix_input_message_1" value="&lt;h1&gt;Default message&lt;/h1&gt;">
     #     # <trix-editor id="content" input="message_content_trix_input_message_1" class="trix-content" ...></trix-editor>
-    def rich_text_area(object_name, method, options = {})
-      Tags::ActionText.new(object_name, method, self, options).render
+    def rich_textarea(object_name, method, options = {}, &block)
+      Tags::ActionText.new(object_name, method, self, options).render(&block)
     end
+    alias_method :rich_text_area, :rich_textarea
   end
 
   class FormBuilder
-    # Wraps ActionView::Helpers::FormHelper#rich_text_area for form builders:
+    # Wraps ActionView::Helpers::FormHelper#rich_textarea for form builders:
     #
     #     <%= form_with model: @message do |f| %>
-    #       <%= f.rich_text_area :content %>
+    #       <%= f.rich_textarea :content %>
     #     <% end %>
     #
     # Please refer to the documentation of the base helper for details.
-    def rich_text_area(method, options = {})
-      @template.rich_text_area(@object_name, method, objectify_options(options))
+    def rich_textarea(method, options = {}, &block)
+      @template.rich_textarea(@object_name, method, objectify_options(options), &block)
     end
+    alias_method :rich_text_area, :rich_textarea
   end
 end