dynamic html tag. html_options{tag:span} Wrapper component in SPAN #480…

… (#1208)
shakacode · Apr 23, 2019 · e6c6d0f · e6c6d0f
1 parent 58bdc34
commit e6c6d0f
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,10 @@ Please follow the recommendations outlined at [keepachangelog.com](http://keepac
 Changes since last non-beta release.
 
 *Please add entries here for your pull requests that are not yet released.*
+### [11.3.0] - 2019-04-20
+#### Added
+- html_options can now has option for 'tag' to add dynamically html element. like this : html_options{tag:'span'}.
+[PR 1208](https://github.com/shakacode/react_on_rails/pull/1208) by [tahsin352](https://github.com/tahsin352).
 
 ### [11.2.2] - 2018-12-24
 #### Improved

diff --git a/Gemfile b/Gemfile
@@ -30,11 +30,11 @@ gem "web-console", group: :development
 # below are copied from spec/dummy/Gemfile
 gem "capybara"
 gem "capybara-screenshot"
-gem "chromedriver-helper"
 gem "launchy"
 gem "rspec-rails"
 gem "rspec-retry"
 gem "selenium-webdriver"
+gem "webdrivers", "~> 3.0"
 gem "webpacker"
 
 gem "equivalent-xml", github: "mbklein/equivalent-xml"

diff --git a/lib/react_on_rails/helper.rb b/lib/react_on_rails/helper.rb
@@ -339,9 +339,15 @@ def build_react_component_result_for_server_rendered_string(
       render_options: required("render_options")
     )
       content_tag_options = render_options.html_options
+      if content_tag_options.key?(:tag)
+        content_tag_options_html_tag = content_tag_options[:tag]
+        content_tag_options.delete(:tag)
+      else
+        content_tag_options_html_tag = "div"
+      end
       content_tag_options[:id] = render_options.dom_id
 
-      rendered_output = content_tag(:div,
+      rendered_output = content_tag(content_tag_options_html_tag.to_sym,
                                     server_rendered_html.html_safe,
                                     content_tag_options)
 

diff --git a/spec/dummy/Gemfile b/spec/dummy/Gemfile
@@ -67,11 +67,11 @@ group :test do
   gem "coveralls", require: false
   # install trouble with updated
   # gem "capybara-webkit"
-  gem "chromedriver-helper"
   gem "equivalent-xml", github: "mbklein/equivalent-xml"
   gem "generator_spec"
   gem "launchy"
   gem "rspec-rails"
   gem "rspec-retry"
   gem "selenium-webdriver"
+  gem "webdrivers", "~> 3.0"
 end
diff --git a/spec/dummy/spec/helpers/react_on_rails_helper_spec.rb b/spec/dummy/spec/helpers/react_on_rails_helper_spec.rb
@@ -242,6 +242,20 @@
         expect(result).not_to match(/data-trace=/)
       end
     end
+
+    context "with 'html_options' tag option" do
+      subject { react_component("App", html_options: { tag: "span" }) }
+
+      it { is_expected.to include '<span id="App-react-component-0"></span>' }
+      it { is_expected.not_to include '<div id="App-react-component-0"></div>' }
+    end
+
+    context "without 'html_options' tag option" do
+      subject { react_component("App") }
+
+      it { is_expected.not_to include '<span id="App-react-component-0"></span>' }
+      it { is_expected.to include '<div id="App-react-component-0"></div>' }
+    end
   end
 
   describe "#redux_store" do