Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add skip display none #174

Closed
wants to merge 1 commit into from
Closed
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
3 changes: 1 addition & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Lint/HandleExceptions:

# Offense count: 1
Metrics/AbcSize:
Max: 23
Max: 24

# Offense count: 1
# Configuration parameters: CountComments.
Expand All @@ -67,4 +67,3 @@ Style/GlobalVars:
Exclude:
- 'spec/dummy/config/environments/development.rb'
- 'spec/dummy-react-013/config/environments/development.rb'

Empty file modified README.md
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion app/helpers/react_on_rails_helper.rb
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def react_component(component_name, props = {}, options = {})
content_tag(:div,
"",
class: "js-react-on-rails-component",
style: "display:none",
style: ReactOnRails.configuration.skip_display_none ? nil : "display:none",
data: {
component_name: react_component_name,
props: props,
Expand Down
2 changes: 2 additions & 0 deletions lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,6 @@
config.generator_function = false
# Default is true for development, off otherwise
config.trace = Rails.env.development?
# Default is false, enable if your content security policy doesn't include `style-src: 'unsafe-inline'`
config.skip_display_none = false
end
10 changes: 7 additions & 3 deletions lib/react_on_rails/configuration.rb
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,22 @@ def self.configuration
trace: Rails.env.development?,
development_mode: Rails.env.development?,
server_renderer_pool_size: 1,
server_renderer_timeout: 20)
server_renderer_timeout: 20,
skip_display_none: false)
end

class Configuration
attr_accessor :server_bundle_js_file, :prerender, :replay_console,
:generator_function, :trace, :development_mode,
:logging_on_server, :server_renderer_pool_size,
:server_renderer_timeout, :raise_on_prerender_error
:server_renderer_timeout, :raise_on_prerender_error,
:skip_display_none

def initialize(server_bundle_js_file: nil, prerender: nil, replay_console: nil,
generator_function: nil, trace: nil, development_mode: nil,
logging_on_server: nil, server_renderer_pool_size: nil,
server_renderer_timeout: nil, raise_on_prerender_error: nil)
server_renderer_timeout: nil, raise_on_prerender_error: nil,
skip_display_none: nil)
if File.exist?(server_bundle_js_file)
self.server_bundle_js_file = server_bundle_js_file
else
Expand All @@ -44,6 +47,7 @@ def initialize(server_bundle_js_file: nil, prerender: nil, replay_console: nil,
end
self.trace = trace.nil? ? Rails.env.development? : trace
self.raise_on_prerender_error = raise_on_prerender_error
self.skip_display_none = skip_display_none

# Server rendering:
self.server_renderer_pool_size = self.development_mode ? 1 : server_renderer_pool_size
Expand Down
Empty file modified spec/dummy/spec/helpers/react_on_rails_helper_spec.rb
100644 → 100755
Empty file.