Manually merging

Author: lcreid

lib/bootstrap_form/components/labels.rb

@@ -10,17 +10,8 @@ module Labels
       def generate_label(id, name, options, custom_label_col, group_layout)
         return if options.blank?
 
-        # id is the caller's options[:id] at the only place this method is called.
-        # The options argument is a small subset of the options that might have
-        # been passed to generate_label's caller, and definitely doesn't include
-        # :id.
-        options[:for] = id if acts_like_form_tag
-
-        options[:class] = label_classes(name, options, custom_label_col, group_layout)
-        options.delete(:class) if options[:class].none?
-        options[:id] = id.present? ? "#{id}_feedback" : field_id(name, :feedback) if error?(name) && label_errors
-
-        label(name, label_text(name, options), options.except(:text))
+        prepare_label_options(id, name, options, custom_label_col, group_layout)
+        label(name, label_text(name, options[:text]), options.except(:text))
       end
 
       def label_classes(name, options, custom_label_col, group_layout)
@@ -43,14 +34,26 @@ def label_layout_classes(custom_label_col, group_layout)
         end
       end
 
-      def label_text(name, options)
-        label = options[:text] || object&.class&.try(:human_attribute_name, name)&.html_safe # rubocop:disable Rails/OutputSafety, Style/SafeNavigationChainLength
+      def label_text(name, text)
+        label = text || object&.class&.try(:human_attribute_name, name)&.html_safe # rubocop:disable Rails/OutputSafety, Style/SafeNavigationChainLength
         if label_errors && error?(name)
           (" ".html_safe + get_error_messages(name)).prepend(label)
         else
           label
         end
       end
+
+      def prepare_label_options(id, name, options, custom_label_col, group_layout)
+        # id is the caller's options[:id] at the only place this method is called.
+        # The options argument is a small subset of the options that might have
+        # been passed to generate_label's caller, and definitely doesn't include
+        # :id.
+        options[:for] = id if acts_like_form_tag
+
+        options[:class] = label_classes(name, options, custom_label_col, group_layout)
+        options.delete(:class) if options[:class].none?
+        options[:id] = id.present? ? "#{id}_feedback" : field_id(name, :feedback) if error?(name) && label_errors
+      end
     end
   end
 end

lib/bootstrap_form/form_group_builder.rb

@@ -7,6 +7,16 @@ module FormGroupBuilder
     private
 
     def form_group_builder(method, options, html_options=nil, &)
+      form_group_builder_wrapper(method, options, html_options) do |form_group_options, no_wrapper|
+        if no_wrapper
+          yield
+        else
+          form_group(method, form_group_options, &)
+        end
+      end
+    end
+
+    def form_group_builder_wrapper(method, options, html_options=nil)
       no_wrapper = options[:wrapper] == false
 
       options = form_group_builder_options(options, method)
@@ -18,11 +28,7 @@ def form_group_builder(method, options, html_options=nil, &)
         :hide_label, :skip_required, :label_as_placeholder, :wrapper_class, :wrapper
       )
 
-      if no_wrapper
-        yield
-      else
-        form_group(method, form_group_options, &)
-      end
+      yield(form_group_options, no_wrapper)
     end
 
     def form_group_builder_options(options, method)

lib/bootstrap_form/inputs/inputs_collection.rb

@@ -7,10 +7,12 @@ module InputsCollection
 
       private
 
-      def inputs_collection(name, collection, value, text, options={})
+      def inputs_collection(name, collection, value, text, options={}, &)
         options[:label] ||= { class: group_label_class(field_layout(options)) }
         options[:inline] ||= layout_inline?(options[:layout])
 
+        return group_inputs_collection(name, collection, value, text, options, &) if BootstrapForm.config.group_around_collections
+
         form_group_builder(name, options) do
           inputs = ActiveSupport::SafeBuffer.new
 
@@ -56,6 +58,63 @@ def form_group_collection_input_checked?(checked, obj, input_value)
         checked == input_value || Array(checked).try(:include?, input_value) ||
           checked == obj || Array(checked).try(:include?, obj)
       end
+
+      def group_inputs_collection(name, collection, value, text, options={}, &)
+        group_builder(name, options) do
+          render_collection(name, collection, value, text, options, &)
+        end
+      end
+
+      def render_collection(name, collection, value, text, options={}, &)
+        inputs = ActiveSupport::SafeBuffer.new
+
+        collection.each_with_index do |obj, i|
+          input_value = value.respond_to?(:call) ? value.call(obj) : obj.send(value)
+          input_options = form_group_collection_input_options(options, text, obj, i, input_value, collection)
+          inputs << yield(name, input_value, input_options)
+        end
+
+        inputs
+      end
+
+      def group_builder(method, options, html_options=nil, &)
+        form_group_builder_wrapper(method, options, html_options) do |form_group_options, no_wrapper|
+          if no_wrapper
+            yield
+          else
+            field_group(method, form_group_options, &)
+          end
+        end
+      end
+
+      def field_group(name, options, &)
+        options[:class] = form_group_classes(options)
+
+        tag.div(
+          **options.except(
+            :add_control_col_class, :append, :control_col, :floating, :help, :icon, :id,
+            :input_group_class, :label, :label_col, :layout, :prepend
+          ),
+          aria: { labelledby: options[:id] || default_id(name) },
+          role: :group
+        ) do
+          group_label_div = generate_group_label_div(name, options)
+          prepare_label_options(options[:id], name, options[:label], options[:label_col], options[:layout])
+          form_group_content(group_label_div, generate_help(name, options[:help]), options, &)
+        end
+      end
+
+      def generate_group_label_div(name, options)
+        group_label_div_class = options.dig(:label, :class) || "form-label"
+        id = options[:id] || default_id(name)
+
+        tag.div(
+          **{ class: group_label_div_class }.compact,
+          id:
+        ) { label_text(name, options.dig(:label, :text)) }
+      end
+
+      def default_id(name) = raw("#{object_name}_#{name}") # rubocop:disable Rails/OutputSafety
     end
   end
 end