@@ -1,3 +1,11 @@
+*   Support rendering ActionText with locals
+
+        <%= render @post.body, locals: {turbo_frame: :_top} %>
+
+    Attachments receive local variables when their partials are rendered.
+
+    *Chris Oliver*
+
 *   Dispatch all Active Storage `direct-upload:`-prefixed events
 
     Add support for `direct-upload:before-blob-request` and `direct-upload:before-storage-request`.
 
@@ -11,10 +11,6 @@ module ContentHelper
     mattr_accessor(:allowed_attributes)
     mattr_accessor(:scrubber)
 
-    def render_rich_text(rich_text, locals: {})
-      render_action_text_content(rich_text.body, locals: locals)
-    end
-
     def render_action_text_content(content, locals: {})
       self.prefix_partial_path_with_controller_namespace = false
       sanitize_action_text_content(render_action_text_attachments(content, locals: locals))
 
@@ -40,7 +40,7 @@ class RichText < Record
     cattr_accessor :editor, instance_accessor: false
 
     serialize :body, coder: ActionText::Content
-    delegate :to_s, :nil?, to: :body
+    delegate :render_in, :to_s, :nil?, to: :body
 
     ##
     # :method: record
 
@@ -1 +1 @@
-<%= render_action_text_content(content) %>
+<%= render_action_text_content(content, locals: local_assigns.excluding(:content)) %>
@@ -26,7 +26,7 @@ def attachable_markdown_representation(caption, attachment_links: false)
       end
 
       def to_html
-        @to_html ||= content_instance.render(content_instance)
+        @to_html ||= content_instance.render(partial: content_instance.to_partial_path, object: content_instance)
       end
 
       def to_s
 
@@ -34,7 +34,7 @@ def editor_attachment_content
               attachable.try(:to_editor_content_attachment_partial_path) ||
               ActionText.deprecator.silence { attachable.try(:to_trix_content_attachment_partial_path) }
             )
-            ActionText::Content.render(partial: partial_path, formats: :html, object: self, as: model_name.element)
+            ActionText::Content.render(partial: partial_path, formats: :html, object: self, as: model_name.element, locals: { in_editor: true })
           end
         end
     end
 
@@ -170,8 +170,8 @@ def to_html
       fragment.to_html
     end
 
-    def to_rendered_html_with_layout
-      render layout: "action_text/contents/content", partial: to_partial_path, formats: :html, locals: { content: self }
+    def to_rendered_html_with_layout(locals: {})
+      render layout: "action_text/contents/content", partial: to_partial_path, formats: :html, locals: locals.merge(content: self)
     end
 
     def to_partial_path
@@ -189,6 +189,13 @@ def to_s
       to_rendered_html_with_layout
     end
 
+    # Safely transforms Content into an HTML String with optional locals.
+    #
+    #     render @post.body, turbo_frame: "_top"
+    def render_in(view_context, locals: {}, **options)
+      to_rendered_html_with_layout(locals: locals)
+    end
+
     def as_json(*)
       to_html
     end
 
@@ -1 +1 @@
-<span class="mentioned-person"><%= person.name %></span>
+<span class="mentioned-person"><%= person.name %><%= " (#{local_assigns[:role]})" if local_assigns[:role] %></span>
@@ -151,6 +151,24 @@ class ActionText::ContentTest < ActiveSupport::TestCase
     assert_not defined?(::ApplicationController)
   end
 
+  test "renders via render_in" do
+    html = "<h1>Hello world</h1>"
+    rendered = content_from_html(html).render_in(ActionController::Base.new.view_context)
+
+    assert_includes rendered, html
+    assert_match %r/\A#{Regexp.escape '<div class="trix-content">'}/, rendered
+  end
+
+  test "render_in passes locals through to attachment partials" do
+    alice = people(:alice)
+    html = %Q(<action-text-attachment sgid="#{alice.attachable_sgid}"></action-text-attachment>)
+
+    ActionText::Content.with_renderer MessagesController.renderer do
+      rendered = content_from_html(html).render_in(ActionController::Base.new.view_context, locals: { role: "admin" })
+      assert_includes rendered, "Alice (admin)"
+    end
+  end
+
   test "does basic sanitization" do
     html = "<div onclick='action()'>safe<script>unsafe</script></div>"
     rendered = content_from_html(html).to_rendered_html_with_layout
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<%= render_action_text_content(content) %>`
	`1`	`+<%= render_action_text_content(content, locals: local_assigns.excluding(:content)) %>`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ def editor_attachment_content`
`34`	`34`	`attachable.try(:to_editor_content_attachment_partial_path) \|\|`
`35`	`35`	`ActionText.deprecator.silence { attachable.try(:to_trix_content_attachment_partial_path) }`
`36`	`36`	`)`
`37`		`- ActionText::Content.render(partial: partial_path, formats: :html, object: self, as: model_name.element)`
	`37`	`+ ActionText::Content.render(partial: partial_path, formats: :html, object: self, as: model_name.element, locals: { in_editor: true })`
`38`	`38`	`end`
`39`	`39`	`end`
`40`	`40`	`end`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<span class="mentioned-person"><%= person.name %></span>`
	`1`	`+<span class="mentioned-person"><%= person.name %><%= " (#{local_assigns[:role]})" if local_assigns[:role] %></span>`