From 77f3fc118a211c973bc3ca0b720dcba932474f89 Mon Sep 17 00:00:00 2001
From: pinzonjulian <julianpinzoneslava@gmail.com>
Date: Mon, 26 Jun 2023 09:36:05 +1000
Subject: [PATCH] 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.
---
 actionview/lib/action_view/helpers/tags/base.rb                  | 1 -
 .../lib/action_view/helpers/tags/collection_check_boxes.rb       | 1 +
 .../lib/action_view/helpers/tags/collection_radio_buttons.rb     | 1 +
 actionview/lib/action_view/helpers/tags/collection_select.rb     | 1 +
 .../lib/action_view/helpers/tags/grouped_collection_select.rb    | 1 +
 actionview/lib/action_view/helpers/tags/select.rb                | 1 +
 actionview/lib/action_view/helpers/tags/time_zone_select.rb      | 1 +
 actionview/lib/action_view/helpers/tags/weekday_select.rb        | 1 +
 8 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/actionview/lib/action_view/helpers/tags/base.rb b/actionview/lib/action_view/helpers/tags/base.rb
index 88a8aa71bfb19..02225aad2de22 100644
--- 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
index d058eb2c72bdb..ca4f9788eb9d3 100644
--- 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
index 0c3b899f534e1..865d9247d0b4c 100644
--- 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
index 7251563a74bc2..cd028efee368f 100644
--- 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
index 62cf77680155b..d42ea6b1ce4d1 100644
--- 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
index a586198bde522..542cee96dcf05 100644
--- 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
index 3c1d404e7f4c8..b3cd8148bd0a6 100644
--- 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
index 1b3c58f3ade35..8f0dfdd7e1656 100644
--- 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