Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/react/rails/controller_renderer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def initialize(options={})
# @return [String] HTML for `component_name` with `options[:props]`
def call(component_name, options, &block)
props = options.fetch(:props, {})
options = default_options.merge(options.slice(:data, :aria, :tag, :class, :id, :prerender))
options = default_options.merge(options.slice(:data, :aria, :tag, :class, :id, :prerender, :camelize_props))
react_component(component_name, props, options, &block)
end

Expand Down
8 changes: 8 additions & 0 deletions test/dummy_sprockets/app/controllers/server_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ def inline_component_prerender_false
render(component_options.merge(prerender: false))
end

def inline_component_with_camelize_props_prerender_true
render component: 'TodoList', props: { test_camelize_props: true, todos: ['dummy'] }, camelize_props: true
end

def inline_component_with_camelize_props_prerender_false
render component: 'TodoList', props: { test_camelize_props: true, todos: ['dummy'] }, camelize_props: true, prerender: false
end

private

def component_options
Expand Down
2 changes: 2 additions & 0 deletions test/dummy_sprockets/config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
get :console_example
get :inline_component_prerender_true
get :inline_component_prerender_false
get :inline_component_with_camelize_props_prerender_true
get :inline_component_with_camelize_props_prerender_false
end
end

Expand Down
8 changes: 8 additions & 0 deletions test/dummy_webpacker1/app/controllers/server_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ def inline_component_prerender_false
render(component_options.merge(prerender: false))
end

def inline_component_with_camelize_props_prerender_true
render component: 'TodoList', props: { test_camelize_props: true, todos: ['dummy'] }, camelize_props: true
end

def inline_component_with_camelize_props_prerender_false
render component: 'TodoList', props: { test_camelize_props: true, todos: ['dummy'] }, camelize_props: true, prerender: false
end

private

def component_options
Expand Down
2 changes: 2 additions & 0 deletions test/dummy_webpacker1/config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
get :console_example
get :inline_component_prerender_true
get :inline_component_prerender_false
get :inline_component_with_camelize_props_prerender_true
get :inline_component_with_camelize_props_prerender_false
end
end

Expand Down
8 changes: 8 additions & 0 deletions test/dummy_webpacker2/app/controllers/server_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ def inline_component_prerender_false
render(component_options.merge(prerender: false))
end

def inline_component_with_camelize_props_prerender_true
render component: 'TodoList', props: { test_camelize_props: true, todos: ['dummy'] }, camelize_props: true
end

def inline_component_with_camelize_props_prerender_false
render component: 'TodoList', props: { test_camelize_props: true, todos: ['dummy'] }, camelize_props: true, prerender: false
end

private

def component_options
Expand Down
2 changes: 2 additions & 0 deletions test/dummy_webpacker2/config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
get :console_example
get :inline_component_prerender_true
get :inline_component_prerender_false
get :inline_component_with_camelize_props_prerender_true
get :inline_component_with_camelize_props_prerender_false
end
end

Expand Down
8 changes: 8 additions & 0 deletions test/dummy_webpacker3/app/controllers/server_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ def inline_component_prerender_false
render(component_options.merge(prerender: false))
end

def inline_component_with_camelize_props_prerender_true
render component: 'TodoList', props: { test_camelize_props: true, todos: ['dummy'] }, camelize_props: true
end

def inline_component_with_camelize_props_prerender_false
render component: 'TodoList', props: { test_camelize_props: true, todos: ['dummy'] }, camelize_props: true, prerender: false
end

private

def component_options
Expand Down
2 changes: 2 additions & 0 deletions test/dummy_webpacker3/config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
get :console_example
get :inline_component_prerender_true
get :inline_component_prerender_false
get :inline_component_with_camelize_props_prerender_true
get :inline_component_with_camelize_props_prerender_false
end
end

Expand Down
12 changes: 12 additions & 0 deletions test/server_rendered_html_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -134,5 +134,17 @@ def wait_to_ensure_asset_pipeline_detects_changes
# make sure the tag closes immediately:
assert_match(/<span.*data-react-class=\"TodoList\"[^<]*><\/span>/, rendered_html)
end

test 'react inline component rendering with camelize_props (pre-rendered)' do
get '/server/inline_component_with_camelize_props_prerender_true'
rendered_html = response.body
assert_match(/data-react-props.*testCamelizeProps.*true/, rendered_html)
end

test 'react inline component rendering with camelize_props (not pre-rendered)' do
get '/server/inline_component_with_camelize_props_prerender_false'
rendered_html = response.body
assert_match(/data-react-props.*testCamelizeProps.*true/, rendered_html)
end
end
end