Move Form Options helper into select rendering classes

The FormOptionsHelper is only needed in classes where a <select> tag is rendered. It was previously included in the Tags::Base class which unnecessarily included it every child Tag class.
rails · Jun 25, 2023 · 77f3fc1 · 77f3fc1
1 parent f19f426
commit 77f3fc1
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 1 deletion.
diff --git a/actionview/lib/action_view/helpers/tags/base.rb b/actionview/lib/action_view/helpers/tags/base.rb
@@ -5,7 +5,6 @@ module Helpers
     module Tags # :nodoc:
       class Base # :nodoc:
         include Helpers::ActiveModelInstanceTag, Helpers::TagHelper, Helpers::FormTagHelper
-        include FormOptionsHelper
 
         attr_reader :object
 

diff --git a/actionview/lib/action_view/helpers/tags/collection_check_boxes.rb b/actionview/lib/action_view/helpers/tags/collection_check_boxes.rb
@@ -7,6 +7,7 @@ module Helpers
     module Tags # :nodoc:
       class CollectionCheckBoxes < Base # :nodoc:
         include CollectionHelpers
+        include FormOptionsHelper
 
         class CheckBoxBuilder < Builder # :nodoc:
           def check_box(extra_html_options = {})

diff --git a/actionview/lib/action_view/helpers/tags/collection_radio_buttons.rb b/actionview/lib/action_view/helpers/tags/collection_radio_buttons.rb
@@ -7,6 +7,7 @@ module Helpers
     module Tags # :nodoc:
       class CollectionRadioButtons < Base # :nodoc:
         include CollectionHelpers
+        include FormOptionsHelper
 
         class RadioButtonBuilder < Builder # :nodoc:
           def radio_button(extra_html_options = {})

diff --git a/actionview/lib/action_view/helpers/tags/collection_select.rb b/actionview/lib/action_view/helpers/tags/collection_select.rb
@@ -7,6 +7,7 @@ module Helpers
     module Tags # :nodoc:
       class CollectionSelect < Base # :nodoc:
         include SelectRenderer
+        include FormOptionsHelper
 
         def initialize(object_name, method_name, template_object, collection, value_method, text_method, options, html_options)
           @collection   = collection

diff --git a/actionview/lib/action_view/helpers/tags/grouped_collection_select.rb b/actionview/lib/action_view/helpers/tags/grouped_collection_select.rb
@@ -7,6 +7,7 @@ module Helpers
     module Tags # :nodoc:
       class GroupedCollectionSelect < Base # :nodoc:
         include SelectRenderer
+        include FormOptionsHelper
 
         def initialize(object_name, method_name, template_object, collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
           @collection          = collection

diff --git a/actionview/lib/action_view/helpers/tags/select.rb b/actionview/lib/action_view/helpers/tags/select.rb
@@ -7,6 +7,7 @@ module Helpers
     module Tags # :nodoc:
       class Select < Base # :nodoc:
         include SelectRenderer
+        include FormOptionsHelper
 
         def initialize(object_name, method_name, template_object, choices, options, html_options)
           @choices = block_given? ? template_object.capture { yield || "" } : choices

diff --git a/actionview/lib/action_view/helpers/tags/time_zone_select.rb b/actionview/lib/action_view/helpers/tags/time_zone_select.rb
@@ -7,6 +7,7 @@ module Helpers
     module Tags # :nodoc:
       class TimeZoneSelect < Base # :nodoc:
         include SelectRenderer
+        include FormOptionsHelper
 
         def initialize(object_name, method_name, template_object, priority_zones, options, html_options)
           @priority_zones = priority_zones

diff --git a/actionview/lib/action_view/helpers/tags/weekday_select.rb b/actionview/lib/action_view/helpers/tags/weekday_select.rb
@@ -7,6 +7,7 @@ module Helpers
     module Tags # :nodoc:
       class WeekdaySelect < Base # :nodoc:
         include SelectRenderer
+        include FormOptionsHelper
 
         def initialize(object_name, method_name, template_object, options, html_options)
           @html_options = html_options