actiontext 8.1.0.beta1 → 8.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56212aa1ae96d6d13c6ed5e92259b100dcfdf2b8547f224458e7c4dcd763ad49
-  data.tar.gz: 8da839fef7a4ecf0889705929429ab2fc40b89527e5e9a97a7803c8c32806f3b
+  metadata.gz: 8f8a237e651fd987b5cd33e599577648aedf8a2ff14decaee0b2a3c2b2c6ab1c
+  data.tar.gz: 9a84f4bb3bc90cddc9c651e3571ee872a87add9150b33e28d3eef50e728493f3
 SHA512:
-  metadata.gz: ec1b6d10b4b38e06e0cc36e99ea293b12344233f1d5291eeb0655f1f828726b46ca0d4e4c0cf5dfb27f3f4ba88752d32d197c614ba561b29bdda944174ad93ec
-  data.tar.gz: fdae5de429bea12f1054e08f7c524cd89b1397b03d73d57485f9ec7a1a839bb278b85392b1c6b1961ad23cf08eaa2e1934fd60eea2e473c178cbb896341c0ac9
+  metadata.gz: c3fb8c1e86cd5017a454ba8615db889b4775ea0afe9f276fcfb46ed2b82583a85a6a11daf097624104a1600753b9c995c5dd7720ce289499fab9d7e57814ab22
+  data.tar.gz: 340ac8fc6e495d800d75ba68c205b9213d34e2cc925b542e4f46eb32fcdebda2fe4d439125219bc6d1cab4b3b01789034e0c163e23868c51c5293c294db06d31

data/CHANGELOG.md

@@ -1,3 +1,43 @@
+## Rails 8.1.0.rc1 (October 15, 2025) ##
+
+*   De-couple `@rails/actiontext/attachment_upload.js` from `Trix.Attachment`
+
+    Implement `@rails/actiontext/index.js` with a `direct-upload:progress` event
+    listeners and `Promise` resolution.
+
+    *Sean Doyle*
+
+*   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 … -->
+    ```
+
+    *Sean Doyle*
+
+*   Generalize `:rich_text_area` Capybara selector
+
+    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.
+
+    *Sean Doyle*
+
 ## Rails 8.1.0.beta1 (September 04, 2025) ##
 
 *   Forward `fill_in_rich_text_area` options to Capybara

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

@@ -882,19 +882,21 @@ 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));
-    this.dispatch("start");
+    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 * 90;
-      this.attachment.setUploadProgress(progress);
       if (progress) {
         this.dispatch("progress", {
           progress: progress
@@ -913,7 +915,6 @@ class AttachmentUpload {
       const estimatedResponseTime = this.estimateResponseTime();
       const responseProgress = Math.min(elapsed / estimatedResponseTime, 1);
       progress = 90 + responseProgress * 9;
-      this.attachment.setUploadProgress(progress);
       this.dispatch("progress", {
         progress: progress
       });
@@ -922,7 +923,6 @@ class AttachmentUpload {
       }
     };
     xhr.addEventListener("loadend", (() => {
-      this.attachment.setUploadProgress(100);
       this.dispatch("progress", {
         progress: 100
       });
@@ -930,7 +930,7 @@ class AttachmentUpload {
     requestAnimationFrame(updateProgress);
   }
   estimateResponseTime() {
-    const fileSize = this.attachment.file.size;
+    const fileSize = this.file.size;
     const MB = 1024 * 1024;
     if (fileSize < MB) {
       return 1e3;
@@ -940,11 +940,11 @@ class AttachmentUpload {
       return 3e3 + fileSize / MB * 50;
     }
   }
-  directUploadDidComplete(error, attributes) {
+  directUploadDidComplete(error, attributes, resolve, reject) {
     if (error) {
-      this.dispatchError(error);
+      this.dispatchError(error, reject);
     } else {
-      this.attachment.setAttributes({
+      resolve({
         sgid: attributes.attachable_sgid,
         url: this.createBlobUrl(attributes.signed_id, attributes.filename)
       });
@@ -960,12 +960,12 @@ class AttachmentUpload {
       detail: detail
     });
   }
-  dispatchError(error) {
+  dispatchError(error, reject) {
     const event = this.dispatch("error", {
       error: error
     });
     if (!event.defaultPrevented) {
-      alert(error);
+      reject(error);
     }
   }
   get directUploadUrl() {
@@ -979,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: {}
@@ -855,19 +856,21 @@
   }
   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));
-      this.dispatch("start");
+      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 * 90;
-        this.attachment.setUploadProgress(progress);
         if (progress) {
           this.dispatch("progress", {
             progress: progress
@@ -886,7 +889,6 @@
         const estimatedResponseTime = this.estimateResponseTime();
         const responseProgress = Math.min(elapsed / estimatedResponseTime, 1);
         progress = 90 + responseProgress * 9;
-        this.attachment.setUploadProgress(progress);
         this.dispatch("progress", {
           progress: progress
         });
@@ -895,7 +897,6 @@
         }
       };
       xhr.addEventListener("loadend", (() => {
-        this.attachment.setUploadProgress(100);
         this.dispatch("progress", {
           progress: 100
         });
@@ -903,7 +904,7 @@
       requestAnimationFrame(updateProgress);
     }
     estimateResponseTime() {
-      const fileSize = this.attachment.file.size;
+      const fileSize = this.file.size;
       const MB = 1024 * 1024;
       if (fileSize < MB) {
         return 1e3;
@@ -913,11 +914,11 @@
         return 3e3 + fileSize / MB * 50;
       }
     }
-    directUploadDidComplete(error, attributes) {
+    directUploadDidComplete(error, attributes, resolve, reject) {
       if (error) {
-        this.dispatchError(error);
+        this.dispatchError(error, reject);
       } else {
-        this.attachment.setAttributes({
+        resolve({
           sgid: attributes.attachable_sgid,
           url: this.createBlobUrl(attributes.signed_id, attributes.filename)
         });
@@ -933,12 +934,12 @@
         detail: detail
       });
     }
-    dispatchError(error) {
+    dispatchError(error, reject) {
       const event = this.dispatch("error", {
         error: error
       });
       if (!event.defaultPrevented) {
-        alert(error);
+        reject(error);
       }
     }
     get directUploadUrl() {
@@ -951,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

@@ -27,7 +27,14 @@ module ActionText
     #     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_textarea_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)
 
@@ -53,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_textarea_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
@@ -82,10 +89,16 @@ module ActionView::Helpers
     #     # <trix-editor id="content" input="message_content_trix_input_message_1" class="trix-content" ...></trix-editor>
     #
     #     rich_textarea :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>">
+    #     # <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_textarea(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
@@ -98,8 +111,8 @@ module ActionView::Helpers
     #     <% end %>
     #
     # Please refer to the documentation of the base helper for details.
-    def rich_textarea(method, options = {})
-      @template.rich_textarea(@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

data/app/javascript/actiontext/attachment_upload.js

@@ -1,22 +1,24 @@
 import { DirectUpload, dispatchEvent } from "@rails/activestorage"
 
 export 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))
-    this.dispatch("start")
+    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 => {
       // 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 })
       }
@@ -39,7 +41,6 @@ export class AttachmentUpload {
       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%
@@ -50,7 +51,6 @@ export class AttachmentUpload {
 
     // Stop simulation when response arrives
     xhr.addEventListener("loadend", () => {
-      this.attachment.setUploadProgress(100)
       this.dispatch("progress", { progress: 100 })
     })
 
@@ -59,7 +59,7 @@ export class AttachmentUpload {
 
   estimateResponseTime() {
     // Base estimate: 1 second for small files, scaling up for larger files
-    const fileSize = this.attachment.file.size
+    const fileSize = this.file.size
     const MB = 1024 * 1024
 
     if (fileSize < MB) {
@@ -71,11 +71,11 @@ export class AttachmentUpload {
     }
   }
 
-  directUploadDidComplete(error, attributes) {
+  directUploadDidComplete(error, attributes, resolve, reject) {
     if (error) {
-      this.dispatchError(error)
+      this.dispatchError(error, reject)
     } else {
-      this.attachment.setAttributes({
+      resolve({
         sgid: attributes.attachable_sgid,
         url: this.createBlobUrl(attributes.signed_id, attributes.filename)
       })
@@ -94,10 +94,10 @@ export class AttachmentUpload {
     return dispatchEvent(this.element, `direct-upload:${name}`, { detail })
   }
 
-  dispatchError(error) {
+  dispatchError(error, reject) {
     const event = this.dispatch("error", { error })
     if (!event.defaultPrevented) {
-      alert(error);
+      reject(error)
     }
   }
 

data/app/javascript/actiontext/index.js

@@ -4,7 +4,16 @@ addEventListener("trix-attachment-add", event => {
   const { attachment, target } = event
 
   if (attachment.file) {
-    const upload = new AttachmentUpload(attachment, target)
+    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/lib/action_text/gem_version.rb

@@ -12,7 +12,7 @@ module ActionText
     MAJOR = 8
     MINOR = 1
     TINY  = 0
-    PRE   = "beta1"
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_text/plain_text_conversion.rb

@@ -7,70 +7,70 @@ module ActionText
     extend self
 
     def node_to_plain_text(node)
-      remove_trailing_newlines(plain_text_for_node(node))
+      BottomUpReducer.new(node).reduce do |n, child_values|
+        plain_text_for_node(n, child_values)
+      end.then(&method(:remove_trailing_newlines))
     end
 
     private
-      def plain_text_for_node(node, index = 0)
+      def plain_text_for_node(node, child_values)
         if respond_to?(plain_text_method_for_node(node), true)
-          send(plain_text_method_for_node(node), node, index)
+          send(plain_text_method_for_node(node), node, child_values)
         else
-          plain_text_for_node_children(node)
+          plain_text_for_child_values(child_values)
         end
       end
 
-      def plain_text_for_node_children(node)
-        texts = []
-        node.children.each_with_index do |child, index|
-          next if skippable?(child)
+      def plain_text_method_for_node(node)
+        :"plain_text_for_#{node.name}_node"
+      end
 
-          texts << plain_text_for_node(child, index)
-        end
-        texts.join
+      def plain_text_for_child_values(child_values)
+        child_values.join
       end
 
-      def skippable?(node)
-        node.name == "script" || node.name == "style"
+      def plain_text_for_unsupported_node(node, _child_values)
+        ""
       end
 
-      def plain_text_method_for_node(node)
-        :"plain_text_for_#{node.name}_node"
+      %i[ script style].each do |element|
+        alias_method :"plain_text_for_#{element}_node", :plain_text_for_unsupported_node
       end
 
-      def plain_text_for_block(node, index = 0)
-        "#{remove_trailing_newlines(plain_text_for_node_children(node))}\n\n"
+      def plain_text_for_block(node, child_values)
+        "#{remove_trailing_newlines(plain_text_for_child_values(child_values))}\n\n"
       end
 
       %i[ h1 p ].each do |element|
         alias_method :"plain_text_for_#{element}_node", :plain_text_for_block
       end
 
-      def plain_text_for_list(node, index)
-        "#{break_if_nested_list(node, plain_text_for_block(node))}"
+      def plain_text_for_list(node, child_values)
+        "#{break_if_nested_list(node, plain_text_for_block(node, child_values))}"
       end
 
       %i[ ul ol ].each do |element|
         alias_method :"plain_text_for_#{element}_node", :plain_text_for_list
       end
 
-      def plain_text_for_br_node(node, index)
+      def plain_text_for_br_node(node, _child_values)
         "\n"
       end
 
-      def plain_text_for_text_node(node, index)
+      def plain_text_for_text_node(node, _child_values)
         remove_trailing_newlines(node.text)
       end
 
-      def plain_text_for_div_node(node, index)
-        "#{remove_trailing_newlines(plain_text_for_node_children(node))}\n"
+      def plain_text_for_div_node(node, child_values)
+        "#{remove_trailing_newlines(plain_text_for_child_values(child_values))}\n"
       end
 
-      def plain_text_for_figcaption_node(node, index)
-        "[#{remove_trailing_newlines(plain_text_for_node_children(node))}]"
+      def plain_text_for_figcaption_node(node, child_values)
+        "[#{remove_trailing_newlines(plain_text_for_child_values(child_values))}]"
       end
 
-      def plain_text_for_blockquote_node(node, index)
-        text = plain_text_for_block(node)
+      def plain_text_for_blockquote_node(node, child_values)
+        text = plain_text_for_block(node, child_values)
         return "“”" if text.blank?
 
         text = text.dup
@@ -79,9 +79,9 @@ module ActionText
         text
       end
 
-      def plain_text_for_li_node(node, index)
-        bullet = bullet_for_li_node(node, index)
-        text = remove_trailing_newlines(plain_text_for_node_children(node))
+      def plain_text_for_li_node(node, child_values)
+        bullet = bullet_for_li_node(node)
+        text = remove_trailing_newlines(plain_text_for_child_values(child_values))
         indentation = indentation_for_li_node(node)
 
         "#{indentation}#{bullet} #{text}\n"
@@ -91,8 +91,9 @@ module ActionText
         text.chomp("")
       end
 
-      def bullet_for_li_node(node, index)
+      def bullet_for_li_node(node)
         if list_node_name_for_li_node(node) == "ol"
+          index = node.parent.elements.index(node)
           "#{index + 1}."
         else
           "•"
@@ -121,5 +122,33 @@ module ActionText
           text
         end
       end
+
+      class BottomUpReducer # :nodoc:
+        def initialize(node)
+          @node = node
+          @values = {}
+        end
+
+        def reduce(&block)
+          traverse_bottom_up(@node) do |n|
+            child_values = @values.values_at(*n.children)
+            @values[n] = block.call(n, child_values)
+          end
+          @values[@node]
+        end
+
+        private
+          def traverse_bottom_up(node, &block)
+            call_stack, processing_stack = [ node ], []
+
+            until call_stack.empty?
+              node = call_stack.pop
+              processing_stack.push(node)
+              call_stack.concat node.children
+            end
+
+            processing_stack.reverse_each(&block)
+          end
+      end
   end
 end

data/lib/action_text/system_test_helper.rb

@@ -35,7 +35,13 @@ module ActionText
     #     # <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)
+      find(:rich_textarea, locator, **).execute_script(<<~JS, with.to_s)
+        if ("value" in this) {
+          this.value = arguments[0]
+        } else {
+          this.editor.loadHTML(arguments[0])
+        }
+      JS
     end
     alias_method :fill_in_rich_text_area, :fill_in_rich_textarea
   end
@@ -45,13 +51,18 @@ end
   Capybara.add_selector rich_textarea do
     label "rich-text area"
     xpath do |locator|
+      xpath = XPath.descendant[[
+        XPath.attribute(:role) == "textbox",
+        (XPath.attribute(:contenteditable) == "") | (XPath.attribute(:contenteditable) == "true")
+      ].reduce(:&)]
+
       if locator.nil?
-        XPath.descendant(:"trix-editor")
+        xpath
       else
         input_located_by_name = XPath.anywhere(:input).where(XPath.attr(:name) == locator).attr(:id)
         input_located_by_label = XPath.anywhere(:label).where(XPath.string.n.is(locator)).attr(:for)
 
-        XPath.descendant(:"trix-editor").where \
+        xpath.where \
           XPath.attr(:id).equals(locator) |
           XPath.attr(:placeholder).equals(locator) |
           XPath.attr(:"aria-label").equals(locator) |

data/lib/generators/action_text/install/install_generator.rb

@@ -47,18 +47,6 @@ module ActionText
           "app/views/layouts/action_text/contents/_content.html.erb"
       end
 
-      def enable_image_processing_gem
-        if (gemfile_path = Pathname(destination_root).join("Gemfile")).exist?
-          say "Ensure image_processing gem has been enabled so image uploads will work (remember to bundle!)"
-          image_processing_regex = /gem ["']image_processing["']/
-          if File.readlines(gemfile_path).grep(image_processing_regex).any?
-            uncomment_lines gemfile_path, image_processing_regex
-          else
-            run "bundle add --skip-install image_processing"
-          end
-        end
-      end
-
       def create_migrations
         rails_command "railties:install:migrations FROM=active_storage,action_text", inline: true
       end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rails/actiontext",
-  "version": "8.1.0-beta1",
+  "version": "8.1.0-rc1",
   "description": "Edit and display rich text in Rails applications",
   "module": "app/assets/javascripts/actiontext.esm.js",
   "main": "app/assets/javascripts/actiontext.js",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actiontext
 version: !ruby/object:Gem::Version
-  version: 8.1.0.beta1
+  version: 8.1.0.rc1
 platform: ruby
 authors:
 - Javan Makhmali
@@ -17,56 +17,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.1.0.beta1
+        version: 8.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.1.0.beta1
+        version: 8.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.1.0.beta1
+        version: 8.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.1.0.beta1
+        version: 8.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.1.0.beta1
+        version: 8.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.1.0.beta1
+        version: 8.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.1.0.beta1
+        version: 8.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.1.0.beta1
+        version: 8.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -174,10 +174,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v8.1.0.beta1/actiontext/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v8.1.0.beta1/
+  changelog_uri: https://github.com/rails/rails/blob/v8.1.0.rc1/actiontext/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v8.1.0.rc1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v8.1.0.beta1/actiontext
+  source_code_uri: https://github.com/rails/rails/tree/v8.1.0.rc1/actiontext
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: