DRY up id generation

Author: lcreid

lib/bootstrap_form/components/labels.rb

@@ -52,7 +52,7 @@ def prepare_label_options(id, name, options, custom_label_col, group_layout)
 
         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
+        options[:id] = aria_feedback_id(name:, id:) if error?(name) && label_errors
       end
     end
   end

lib/bootstrap_form/components/validation.rb

@@ -67,9 +67,8 @@ def generate_error(name, id)
         help_text = get_error_messages(name)
         help_klass = "invalid-feedback"
         help_tag = :div
-        id = id.present? ? "#{id}_feedback" : field_id(name, :feedback)
 
-        content_tag(help_tag, help_text, class: help_klass, id:)
+        content_tag(help_tag, help_text, class: help_klass, id: aria_feedback_id(id:, name:))
       end
 
       def get_error_messages(name)
@@ -85,6 +84,10 @@ def get_error_messages(name)
         safe_join(object.errors[name], ", ")
       end
       # rubocop:enable Metrics/AbcSize
+
+      def aria_feedback_id(name:, id: nil)
+        id.present? ? "#{id}_feedback" : field_id(name, :feedback)
+      end
     end
   end
 end

lib/bootstrap_form/form_group_builder.rb

@@ -100,8 +100,7 @@ def form_group_css_options(method, html_options, options)
       css_options[:class] = safe_join([control_classes, css_options[:class]].compact, " ")
       if error?(method)
         css_options[:class] << " is-invalid"
-        labelledby = options[:id].present? ? "#{options[:id]}_feedback" : field_id(method, :feedback)
-        css_options[:aria] = { labelledby: }
+        css_options[:aria] = { labelledby: aria_feedback_id(id: options[:id], name: method) }
       end
       css_options[:placeholder] = form_group_placeholder(options, method) if options[:label_as_placeholder]
       css_options

lib/bootstrap_form/helpers/bootstrap.rb

@@ -36,7 +36,7 @@ def errors_on(name, options={})
 
         tag.div(
           class: custom_class || "invalid-feedback",
-          id: options[:id].present? ? "#{options[:id]}_feedback" : field_id(name, :feedback)
+          id: aria_feedback_id(id: options[:id], name:)
         ) do
           errors = if hide_attribute_name
                      object.errors[name]

lib/bootstrap_form/inputs/check_box.rb

@@ -41,10 +41,7 @@ def check_box_options(name, options)
                                            :inline, :label, :label_class, :label_col, :layout, :skip_label,
                                            :switch, :wrapper, :wrapper_class)
         check_box_options[:class] = check_box_classes(name, options)
-        if error?(name)
-          labelledby = options[:id].present? ? "#{options[:id]}_feedback" : field_id(name, :feedback)
-          check_box_options[:aria] = { labelledby: }
-        end
+        check_box_options[:aria] = { labelledby: aria_feedback_id(id: options[:id], name:) } if error?(name)
         check_box_options.merge!(required_field_options(options, name))
       end
 

lib/bootstrap_form/inputs/inputs_collection.rb

@@ -89,7 +89,7 @@ def field_group(name, options, &)
             :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) },
+          aria: { labelledby: group_label_div_id(id: options[:id], name:) },
           role: :group
         ) do
           group_label_div = generate_group_label_div(name, options)
@@ -100,15 +100,14 @@ def field_group(name, options, &)
 
       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:
+          id: group_label_div_id(id: options[:id], name:)
         ) { label_text(name, options.dig(:label, :text)) }
       end
 
-      def default_id(name) = raw("#{object_name}_#{name}") # rubocop:disable Rails/OutputSafety
+      def group_label_div_id(id:, name:) = id || field_id(name)
     end
   end
 end

lib/bootstrap_form/inputs/radio_button.rb

@@ -28,10 +28,7 @@ def radio_button_options(name, options)
         radio_button_options = options.except(:class, :label, :label_class, :error_message, :help,
                                               :inline, :hide_label, :skip_label, :wrapper, :wrapper_class)
         radio_button_options[:class] = radio_button_classes(name, options)
-        if error?(name)
-          labelledby = options[:id].present? ? "#{options[:id]}_feedback" : field_id(name, :feedback)
-          radio_button_options[:aria] = { labelledby: }
-        end
+        radio_button_options[:aria] = { labelledby: aria_feedback_id(id: options[:id], name:) } if error?(name)
         radio_button_options.merge!(required_field_options(options, name))
       end