Skip to content

Commit 463304a

Browse files
committed
Refine component renderer helper usage
1 parent 76fce07 commit 463304a

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

lib/react/rails/railtie.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class Railtie < ::Rails::Railtie
6666
ActionController::Renderers.add :component do |component_name, options|
6767
renderer = ::React::Rails::ControllerRenderer.new(controller: self)
6868
html = renderer.call(component_name, options)
69-
render_options = Railtie.send(:component_render_options, options, html)
69+
render_options = Railtie.component_render_options(options, html)
7070
render(render_options)
7171
end
7272
end
@@ -141,7 +141,7 @@ def self.versioned_assets?(assets)
141141
assets.respond_to?(:version) && assets.respond_to?(:version=)
142142
end
143143

144-
private_class_method :component_render_options, :versioned_assets_for, :versioned_assets?
144+
private_class_method :versioned_assets_for, :versioned_assets?
145145
end
146146
end
147147
end

test/react/rails/railtie_test.rb

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,22 @@ class RailtieTest < ActionDispatch::IntegrationTest
4747
end
4848

4949
test "component render options default to using the current layout" do
50-
render_options = React::Rails::Railtie.send(:component_render_options, { status: :accepted }, "<div>SSR</div>")
50+
render_options = React::Rails::Railtie.component_render_options({ status: :accepted }, "<div>SSR</div>")
5151

5252
assert_equal "<div>SSR</div>", render_options[:inline]
5353
assert render_options[:layout]
5454
assert_equal :accepted, render_options[:status]
5555
end
5656

5757
test "component render options preserve explicit layout overrides" do
58-
render_options = React::Rails::Railtie.send(:component_render_options, { layout: false }, "<div>SSR</div>")
58+
render_options = React::Rails::Railtie.component_render_options({ layout: false }, "<div>SSR</div>")
5959

6060
refute render_options[:layout]
6161
end
62+
63+
test "component render options preserve a named layout override" do
64+
render_options = React::Rails::Railtie.component_render_options({ layout: "admin" }, "<div>SSR</div>")
65+
66+
assert_equal "admin", render_options[:layout]
67+
end
6268
end

0 commit comments

Comments
 (0)