Skip to content

Commit 6b209bd

Browse files
Refactor react_component and react_component_hash methods to streamline Pro license validation
1 parent 56656ce commit 6b209bd

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

lib/react_on_rails/helper.rb

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ module Helper
5454
# random_dom_id can be set to override the default from the config/initializers. That's only
5555
# used if you have multiple instance of the same component on the Rails view.
5656
def react_component(component_name, options = {})
57+
badge = pro_warning_badge_if_needed(render_options.force_load)
58+
render_options.set_option(:force_load, false) unless support_pro_features?
5759
internal_result = internal_react_component(component_name, options)
5860
server_rendered_html = internal_result[:result]["html"]
5961
console_script = internal_result[:result]["consoleReplayScript"]
6062
render_options = internal_result[:render_options]
61-
badge = pro_warning_badge_if_needed(render_options.force_load)
62-
render_options.set_option(:force_load, false) unless support_pro_features?
6363

6464
case server_rendered_html
6565
when String
@@ -211,12 +211,13 @@ def rsc_payload_react_component(component_name, options = {})
211211
#
212212
def react_component_hash(component_name, options = {})
213213
options[:prerender] = true
214+
badge = pro_warning_badge_if_needed(render_options.force_load)
215+
render_options.set_option(:force_load, false) unless support_pro_features?
216+
214217
internal_result = internal_react_component(component_name, options)
215218
server_rendered_html = internal_result[:result]["html"]
216219
console_script = internal_result[:result]["consoleReplayScript"]
217220
render_options = internal_result[:render_options]
218-
badge = pro_warning_badge_if_needed(render_options.force_load)
219-
render_options.set_option(:force_load, false) unless support_pro_features?
220221

221222
if server_rendered_html.is_a?(String) && internal_result[:result]["hasErrors"]
222223
server_rendered_html = { COMPONENT_HTML_KEY => internal_result[:result]["html"] }

0 commit comments

Comments
 (0)