actiontext 7.1.5.2 → 8.1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cb8576fb6dc6ee3f8b1cfff7f3e3973f6eb3fa34e1784c5c912418233b49a54
-  data.tar.gz: 47519302480a37ee21c2841674238431d08aec65e7d4d7b459be4805c1631dfa
+  metadata.gz: 51fa37e47fded8fa624f616edfdfd65929148c6d9a1dae13a5aa9a0a87ff28e0
+  data.tar.gz: 549e8a060b6a447f72d3d5f69fe317bfbeb88627788284133bb8dff358ccd0d6
 SHA512:
-  metadata.gz: 7948ef6965b909773870f725b10732634619221c9cffaeefb7fb6881cf77c44ea2746d7b93f152c6a786c24b328b3f409248ed8193d66e593728b3f5976e16a5
-  data.tar.gz: cc70c65ce97bc493dd9e9cce61fd4fb3026cd4f31c4b5aabeacd01b86858a75df5e2217bf29dbedc983d4b9921692f8736df015ea345954d44f7b61c7b91331d
+  metadata.gz: 4eba1482b7e133fcc07242342de6c8890331a081226a2e7cf157baaa8df29f8c333956be2fbffcbe93ce19662ffcf6e625d5fb9c84ce1c1d964a3625a68d308e
+  data.tar.gz: d22679beecbaf10140153d3d84a6714d0e341a8bca28dba143949a901fbd5a67fffabf701df97f0766f3cb53c7bd518515dd4e7a97009df13a6e4452be577f37

data/CHANGELOG.md

@@ -1,167 +1,78 @@
-## Rails 7.1.5.2 (August 13, 2025) ##
+## Rails 8.1.2.1 (March 23, 2026) ##
 
 *   No changes.
 
 
-## Rails 7.1.5.1 (December 10, 2024) ##
-
-*   Update vendored trix version to 2.1.10
-
-    *John Hawthorn*
-
-
-## Rails 7.1.5 (October 30, 2024) ##
-
-*   No changes.
-
-
-## Rails 7.1.4.2 (October 23, 2024) ##
-
-*   No changes.
-
-
-## Rails 7.1.4.1 (October 15, 2024) ##
-
-*   Avoid backtracing in plain_text_for_blockquote_node
-
-    [CVE-2024-47888]
-
-    *John Hawthorn*
-
-## Rails 7.1.4 (August 22, 2024) ##
-
-*   Strip `content` attribute if the key is present but the value is empty
-
-    *Jeremy Green*
-
-*   Only sanitize `content` attribute when present in attachments.
-
-    *Petrik de Heus*
-
-
-## Rails 7.1.3.4 (June 04, 2024) ##
-
-*   Sanitize ActionText HTML ContentAttachment in Trix edit view
-    [CVE-2024-32464]
-
-    *Aaron Patterson*
-
-## Rails 7.1.3.3 (May 16, 2024) ##
-
-*   Upgrade Trix to 2.1.1 to fix [CVE-2024-34341](https://github.com/basecamp/trix/security/advisories/GHSA-qjqp-xr96-cj99).
-
-    *Rafael Mendonça França*
-
-
-## Rails 7.1.3.2 (February 21, 2024) ##
+## Rails 8.1.2 (January 08, 2026) ##
 
 *   No changes.
 
 
-## Rails 7.1.3.1 (February 21, 2024) ##
+## Rails 8.1.1 (October 28, 2025) ##
 
 *   No changes.
 
 
-## Rails 7.1.3 (January 16, 2024) ##
-
-*   No changes.
-
+## Rails 8.1.0 (October 22, 2025) ##
 
-## Rails 7.1.2 (November 10, 2023) ##
+*   De-couple `@rails/actiontext/attachment_upload.js` from `Trix.Attachment`
 
-*   Compile ESM package that can be used directly in the browser as `actiontext.esm.js`.
-
-    *Matias Grunberg*
-
-*   Fix using actiontext.js with Sprockets.
-
-    *Matias Grunberg*
-
-*   Upgrade Trix to 2.0.7.
-
-    *Hartley McGuire*
-
-*   Fix using Trix with Sprockets.
-
-    *Hartley McGuire*
-
-
-## Rails 7.1.1 (October 11, 2023) ##
-
-*   No changes.
+    Implement `@rails/actiontext/index.js` with a `direct-upload:progress` event
+    listeners and `Promise` resolution.
 
+    *Sean Doyle*
 
-## Rails 7.1.0 (October 05, 2023) ##
+*   Capture block content for form helper methods
 
-*   No changes.
+    ```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 … -->
 
-## Rails 7.1.0.rc2 (October 01, 2023) ##
+    <%= 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 … -->
+    ```
 
-*   No changes.
+    *Sean Doyle*
 
+*   Generalize `:rich_text_area` Capybara selector
 
-## Rails 7.1.0.rc1 (September 27, 2023) ##
+    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.
 
-*   No changes.
+    *Sean Doyle*
 
+*   Forward `fill_in_rich_text_area` options to Capybara
 
-## Rails 7.1.0.beta1 (September 13, 2023) ##
+    ```ruby
+    fill_in_rich_textarea "Rich text editor", id: "trix_editor_1", with: "Hello world!"
+    ```
 
-*   Use `Rails::HTML5::SafeListSanitizer` by default in the Rails 7.1 configuration if it is
-    supported.
+    *Sean Doyle*
 
-    Action Text's sanitizer can be configured by setting
-    `config.action_text.sanitizer_vendor`. Supported values are `Rails::HTML4::Sanitizer` or
-    `Rails::HTML5::Sanitizer`.
+*   Attachment upload progress accounts for server processing time.
 
-    The Rails 7.1 configuration will set this to `Rails::HTML5::Sanitizer` when it is supported, and
-    fall back to `Rails::HTML4::Sanitizer`. Previous configurations default to
-    `Rails::HTML4::Sanitizer`.
+    *Jeremy Daer*
 
-    As a result of this change, the defaults for `ActionText::ContentHelper.allowed_tags` and
-    `.allowed_attributes` are applied at runtime, so the value of these attributes is now 'nil'
-    unless set by the application. You may call `sanitizer_allowed_tags` or
-    `sanitizer_allowed_attributes` to inspect the tags and attributes being allowed by the
-    sanitizer.
+*   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`.
 
     *Mike Dalessio*
 
-*   Attachables now can override default attachment missing template.
-
-    When rendering Action Text attachments where the underlying attachable model has
-    been removed, a fallback template is used. You now can override this template on
-    a per-model basis. For example, you could render a placeholder image for a file
-    attachment or the text "Deleted User" for a User attachment.
-
-    *Matt Swanson*, *Joel Drapper*
-
-*   Update bundled Trix version from `1.3.1` to `2.0.4`.
-
-    *Sarah Ridge*, *Sean Doyle*
-
-*   Apply `field_error_proc` to `rich_text_area` form fields.
-
-    *Kaíque Kandy Koga*
-
-*   Action Text attachment URLs rendered in a background job (a la Turbo
-    Streams) now use `Rails.application.default_url_options` and
-    `Rails.application.config.force_ssl` instead of `http://example.org`.
-
-    *Jonathan Hefner*
-
-*   Support `strict_loading:` option for `has_rich_text` declaration
+*   Change `ActionText::RichText#embeds` assignment from `before_save` to `before_validation`
 
     *Sean Doyle*
 
-*   Update ContentAttachment so that it can encapsulate arbitrary HTML content in a document.
-
-    *Jamis Buck*
-
-*   Fix an issue that caused the content layout to render multiple times when a
-    rich_text field was updated.
-
-    *Jacob Herrington*
-
-Please check [7-0-stable](https://github.com/rails/rails/blob/7-0-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/content_helper.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# :markup: markdown
+
 require "rails-html-sanitizer"
 
 module ActionText