actiontext 8.0.2 → 8.1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f12a64d23198ac6242c4fd92fe20757abebf75575b1e99ea0ccc03680ebc717
-  data.tar.gz: 208a612df9f46de68fb8eadebc25c213ebb246f8d0a0ec84f70f8d1285469617
+  metadata.gz: 56212aa1ae96d6d13c6ed5e92259b100dcfdf2b8547f224458e7c4dcd763ad49
+  data.tar.gz: 8da839fef7a4ecf0889705929429ab2fc40b89527e5e9a97a7803c8c32806f3b
 SHA512:
-  metadata.gz: 40487286cd2e8d240a60772a4e152c7aab05fffe77e11a5828cc8ea3f5713f6b0375e419a71f6708ff0f06349bbb0259ef3ef7ddae3b8354aa59c53c05be1fbb
-  data.tar.gz: bc5967f47f338bc65962090ef809d77c0b212729490ace65f1924d6ba3059c681a286912173fc3324dbec93397812cf2a36943c11fed954198ad415f452cd1ed
+  metadata.gz: ec1b6d10b4b38e06e0cc36e99ea293b12344233f1d5291eeb0655f1f828726b46ca0d4e4c0cf5dfb27f3f4ba88752d32d197c614ba561b29bdda944174ad93ec
+  data.tar.gz: fdae5de429bea12f1054e08f7c524cd89b1397b03d73d57485f9ec7a1a839bb278b85392b1c6b1961ad23cf08eaa2e1934fd60eea2e473c178cbb896341c0ac9

data/CHANGELOG.md

@@ -1,81 +1,25 @@
-## Rails 8.0.2 (March 12, 2025) ##
+## Rails 8.1.0.beta1 (September 04, 2025) ##
 
-*   No changes.
-
-
-## Rails 8.0.2 (March 12, 2025) ##
-
-*   No changes.
-
-
-## Rails 8.0.1 (December 13, 2024) ##
-
-*   No changes.
-
-
-## Rails 8.0.0.1 (December 10, 2024) ##
-
-*   Update vendored trix version to 2.1.10
-
-    *John Hawthorn*
-
-
-## Rails 8.0.0 (November 07, 2024) ##
-
-*   No changes.
-
-
-## Rails 8.0.0.rc2 (October 30, 2024) ##
-
-*   No changes.
-
-
-## Rails 8.0.0.rc1 (October 19, 2024) ##
-
-*   No changes.
-
-
-## Rails 8.0.0.beta1 (September 26, 2024) ##
-
-*   Dispatch direct-upload events on attachment uploads
-
-    When using Action Text's rich textarea,  it's possible to attach files to the
-    editor. Previously, that action didn't dispatch any events, which made it hard
-    to react to the file uploads. For instance, if an upload failed, there was no
-    way to notify the user about it, or remove the attachment from the editor.
-
-    This commits adds new events - `direct-upload:start`, `direct-upload:progress`,
-    and `direct-upload:end` - similar to how Active Storage's direct uploads work.
-
-    *Matheus Richard*, *Brad Rees*
-
-*   Add `store_if_blank` option to `has_rich_text`
-
-    Pass `store_if_blank: false` to not create `ActionText::RichText` records when saving with a blank attribute, such as from an optional form parameter.
+*   Forward `fill_in_rich_text_area` options to Capybara
 
     ```ruby
-    class Message
-      has_rich_text :content, store_if_blank: false
-    end
-
-    Message.create(content: "hi") # creates an ActionText::RichText
-    Message.create(content: "") # does not create an ActionText::RichText
+    fill_in_rich_textarea "Rich text editor", id: "trix_editor_1", with: "Hello world!"
     ```
 
-    *Alex Ghiculescu*
-
-*   Strip `content` attribute if the key is present but the value is empty
+    *Sean Doyle*
 
-    *Jeremy Green*
+*   Attachment upload progress accounts for server processing time.
 
-*   Rename `rich_text_area` methods into `rich_textarea`
+    *Jeremy Daer*
 
-    Old names are still available as aliases.
+*   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`.
 
-    *Sean Doyle*
+    *Mike Dalessio*
 
-*   Only sanitize `content` attribute when present in attachments.
+*   Change `ActionText::RichText#embeds` assignment from `before_save` to `before_validation`
 
-    *Petrik de Heus*
+    *Sean Doyle*
 
-Please check [7-2-stable](https://github.com/rails/rails/blob/7-2-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;
+    }
   }
 }
 
@@ -857,7 +893,7 @@ class AttachmentUpload {
   }
   directUploadWillStoreFileWithXHR(xhr) {
     xhr.upload.addEventListener("progress", (event => {
-      const progress = event.loaded / event.total * 100;
+      const progress = event.loaded / event.total * 90;
       this.attachment.setUploadProgress(progress);
       if (progress) {
         this.dispatch("progress", {
@@ -865,6 +901,44 @@ class AttachmentUpload {
         });
       }
     }));
+    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.attachment.setUploadProgress(progress);
+      this.dispatch("progress", {
+        progress: progress
+      });
+      if (xhr.readyState !== XMLHttpRequest.DONE && progress < 99) {
+        requestAnimationFrame(updateProgress);
+      }
+    };
+    xhr.addEventListener("loadend", (() => {
+      this.attachment.setUploadProgress(100);
+      this.dispatch("progress", {
+        progress: 100
+      });
+    }));
+    requestAnimationFrame(updateProgress);
+  }
+  estimateResponseTime() {
+    const fileSize = this.attachment.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) {
     if (error) {

data/app/assets/javascripts/actiontext.js

@@ -661,7 +661,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 +696,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])";
@@ -830,7 +866,7 @@
     }
     directUploadWillStoreFileWithXHR(xhr) {
       xhr.upload.addEventListener("progress", (event => {
-        const progress = event.loaded / event.total * 100;
+        const progress = event.loaded / event.total * 90;
         this.attachment.setUploadProgress(progress);
         if (progress) {
           this.dispatch("progress", {
@@ -838,6 +874,44 @@
           });
         }
       }));
+      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.attachment.setUploadProgress(progress);
+        this.dispatch("progress", {
+          progress: progress
+        });
+        if (xhr.readyState !== XMLHttpRequest.DONE && progress < 99) {
+          requestAnimationFrame(updateProgress);
+        }
+      };
+      xhr.addEventListener("loadend", (() => {
+        this.attachment.setUploadProgress(100);
+        this.dispatch("progress", {
+          progress: 100
+        });
+      }));
+      requestAnimationFrame(updateProgress);
+    }
+    estimateResponseTime() {
+      const fileSize = this.attachment.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) {
       if (error) {

data/app/javascript/actiontext/attachment_upload.js

@@ -14,12 +14,61 @@ export class AttachmentUpload {
 
   directUploadWillStoreFileWithXHR(xhr) {
     xhr.upload.addEventListener("progress", event => {
-      const progress = event.loaded / event.total * 100
+      // Scale upload progress to 0-90% range
+      const progress = (event.loaded / event.total) * 90
       this.attachment.setUploadProgress(progress)
       if (progress) {
         this.dispatch("progress", { progress: progress })
       }
     })
+
+    // Start simulating progress after upload completes
+    xhr.upload.addEventListener("loadend", () => {
+      this.simulateResponseProgress(xhr)
+    })
+  }
+
+  simulateResponseProgress(xhr) {
+    let progress = 90
+    const startTime = Date.now()
+
+    const updateProgress = () => {
+      // Simulate progress from 90% to 99% over estimated time
+      const elapsed = Date.now() - startTime
+      const estimatedResponseTime = this.estimateResponseTime()
+      const responseProgress = Math.min(elapsed / estimatedResponseTime, 1)
+      progress = 90 + (responseProgress * 9) // 90% to 99%
+
+      this.attachment.setUploadProgress(progress)
+      this.dispatch("progress", { progress })
+
+      // Continue until response arrives or we hit 99%
+      if (xhr.readyState !== XMLHttpRequest.DONE && progress < 99) {
+        requestAnimationFrame(updateProgress)
+      }
+    }
+
+    // Stop simulation when response arrives
+    xhr.addEventListener("loadend", () => {
+      this.attachment.setUploadProgress(100)
+      this.dispatch("progress", { progress: 100 })
+    })
+
+    requestAnimationFrame(updateProgress)
+  }
+
+  estimateResponseTime() {
+    // Base estimate: 1 second for small files, scaling up for larger files
+    const fileSize = this.attachment.file.size
+    const MB = 1024 * 1024
+
+    if (fileSize < MB) {
+      return 1000 // 1 second for files under 1MB
+    } else if (fileSize < 10 * MB) {
+      return 2000 // 2 seconds for files 1-10MB
+    } else {
+      return 3000 + (fileSize / MB * 50) // 3+ seconds for larger files
+    }
   }
 
   directUploadDidComplete(error, attributes) {

data/app/models/action_text/rich_text.rb

@@ -48,10 +48,13 @@ module ActionText
     ##
     # :method: embeds
     #
-    # Returns the `ActiveStorage::Blob`s of the embedded files.
+    # Returns the ActiveStorage::Attachment records from the embedded files.
+    #
+    # Attached ActiveStorage::Blob records are extracted from the `body`
+    # in a {before_validation}[rdoc-ref:ActiveModel::Validations::Callbacks::ClassMethods#before_validation] callback.
     has_many_attached :embeds
 
-    before_save do
+    before_validation do
       self.embeds = body.attachables.grep(ActiveStorage::Blob).uniq if body.present?
     end
 

data/lib/action_text/content.rb

@@ -56,7 +56,7 @@ module ActionText
       @links ||= fragment.find_all("a[href]").map { |a| a["href"] }.uniq
     end
 
-    # Extracts +ActionText::Attachment+s from the HTML fragment:
+    # Extracts ActionText::Attachment objects from the HTML fragment:
     #
     #     attachable = ActiveStorage::Blob.first
     #     html = %Q(<action-text-attachment sgid="#{attachable.attachable_sgid}" caption="Captioned"></action-text-attachment>)
@@ -78,7 +78,7 @@ module ActionText
       @gallery_attachments ||= attachment_galleries.flat_map(&:attachments)
     end
 
-    # Extracts +ActionText::Attachable+s from the HTML fragment:
+    # Extracts ActionText::Attachable objects from the HTML fragment:
     #
     #     attachable = ActiveStorage::Blob.first
     #     html = %Q(<action-text-attachment sgid="#{attachable.attachable_sgid}" caption="Captioned"></action-text-attachment>)
@@ -123,10 +123,11 @@ module ActionText
     #     content.to_plain_text # => "safeunsafe"
     #
     # NOTE: that the returned string is not HTML safe and should not be rendered in
-    # browsers.
+    # browsers without additional sanitization.
     #
     #     content = ActionText::Content.new("&lt;script&gt;alert()&lt;/script&gt;")
     #     content.to_plain_text # => "<script>alert()</script>"
+    #     ActionText::ContentHelper.sanitizer.sanitize(content.to_plain_text) # => ""
     def to_plain_text
       render_attachments(with_full_attributes: false, &:to_plain_text).fragment.to_plain_text
     end

data/lib/action_text/engine.rb

@@ -8,6 +8,7 @@ require "active_record/railtie"
 require "active_storage/engine"
 
 require "action_text"
+require "action_text/trix"
 
 module ActionText
   class Engine < Rails::Engine
@@ -34,7 +35,7 @@ module ActionText
 
     initializer "action_text.asset" do
       if Rails.application.config.respond_to?(:assets)
-        Rails.application.config.assets.precompile += %w( actiontext.js actiontext.esm.js trix.js trix.css )
+        Rails.application.config.assets.precompile += %w( actiontext.js actiontext.esm.js )
       end
     end
 

data/lib/action_text/fixture_set.rb

@@ -62,7 +62,7 @@ module ActionText
       signed_global_id = ActiveRecord::FixtureSet.signed_global_id fixture_set_name, label,
         column_type: column_type, for: ActionText::Attachable::LOCATOR_NAME
 
-      %(<action-text-attachment sgid="#{signed_global_id}"></action-text-attachment>)
+      %(<#{Attachment.tag_name} sgid="#{signed_global_id}"></#{Attachment.tag_name}>)
     end
   end
 end

data/lib/action_text/gem_version.rb

@@ -10,9 +10,9 @@ module ActionText
 
   module VERSION
     MAJOR = 8
-    MINOR = 0
-    TINY  = 2
-    PRE   = nil
+    MINOR = 1
+    TINY  = 0
+    PRE   = "beta1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_text/plain_text_conversion.rb

@@ -22,11 +22,17 @@ module ActionText
       def plain_text_for_node_children(node)
         texts = []
         node.children.each_with_index do |child, index|
+          next if skippable?(child)
+
           texts << plain_text_for_node(child, index)
         end
         texts.join
       end
 
+      def skippable?(node)
+        node.name == "script" || node.name == "style"
+      end
+
       def plain_text_method_for_node(node)
         :"plain_text_for_#{node.name}_node"
       end

data/lib/action_text/rendering.rb

@@ -2,7 +2,6 @@
 
 # :markup: markdown
 
-require "active_support/concern"
 require "active_support/core_ext/module/attribute_accessors_per_thread"
 
 module ActionText

data/lib/action_text/system_test_helper.rb

@@ -7,12 +7,14 @@ module ActionText
     # Locates a Trix editor and fills it in with the given HTML.
     #
     # The editor can be found by:
+    #
     # *   its `id`
     # *   its `placeholder`
     # *   the text from its `label` element
     # *   its `aria-label`
     # *   the `name` of its input
     #
+    # Additional options are forwarded to Capybara as filters
     #
     # Examples:
     #
@@ -32,8 +34,8 @@ module ActionText
     #     # <input id="trix_input_1" name="message[content]" type="hidden">
     #     # <trix-editor input="trix_input_1"></trix-editor>
     #     fill_in_rich_textarea "message[content]", with: "Hello <em>world!</em>"
-    def fill_in_rich_textarea(locator = nil, with:)
-      find(:rich_textarea, locator).execute_script("this.editor.loadHTML(arguments[0])", with.to_s)
+    def fill_in_rich_textarea(locator = nil, with:, **)
+      find(:rich_textarea, locator, **).execute_script("this.editor.loadHTML(arguments[0])", with.to_s)
     end
     alias_method :fill_in_rich_text_area, :fill_in_rich_textarea
   end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rails/actiontext",
-  "version": "8.0.200",
+  "version": "8.1.0-beta1",
   "description": "Edit and display rich text in Rails applications",
   "module": "app/assets/javascripts/actiontext.esm.js",
   "main": "app/assets/javascripts/actiontext.js",
@@ -22,7 +22,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@rails/activestorage": ">= 8.0.0-alpha"
+    "@rails/activestorage": ">= 8.1.0-alpha"
   },
   "peerDependencies": {
     "trix": "^2.0.0"
@@ -31,6 +31,7 @@
     "@rollup/plugin-commonjs": "^19.0.1",
     "@rollup/plugin-node-resolve": "^11.0.1",
     "rollup": "^2.35.1",
+    "rollup-plugin-terser": "^7.0.2",
     "trix": "^2.0.0"
   },
   "scripts": {