Merge pull request solidusio#6120 from chaimann/fix-select-component-missing-content

Fix missing options in select tags

Author: kennyadsl

admin/app/components/solidus_admin/base_component.rb

@@ -7,6 +7,7 @@ module SolidusAdmin
   # BaseComponent is the base class for all components in Solidus Admin.
   class BaseComponent < ViewComponent::Base
     include SolidusAdmin::ComponentsHelper
+    include SolidusAdmin::VoidElementsHelper
     include Turbo::FramesHelper
 
     def icon_tag(name, **attrs)

admin/app/components/solidus_admin/ui/forms/input/component.rb

@@ -93,24 +93,24 @@ def call
       with_content options_for_select(@attributes.delete(:choices), @attributes.delete(:value))
     end
 
-    options = {
+    build_tag
+  end
+
+  private
+
+  def build_tag
+    args = [@tag]
+    args << content unless void_element?(@tag)
+
+    tag.public_send(*args, **tag_options)
+  end
+
+  def tag_options
+    @tag_options ||= {
       "data-controller": stimulus_id,
       "data-#{stimulus_id}-custom-validity-value": @error.presence,
       "data-action": "#{stimulus_id}#clearCustomValidity",
       **@attributes
     }
-
-    if tag.method(@tag).parameters.any? { |_type, name| name == :content }
-      tag.public_send(
-        @tag,
-        content,
-        **options
-      )
-    else
-      tag.public_send(
-        @tag,
-        **options
-      )
-    end
   end
 end

admin/app/helpers/solidus_admin/void_elements_helper.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module SolidusAdmin
+  module VoidElementsHelper
+    # https://github.com/rails/rails/blob/194d697036c61af0caa66de5659721ded2478ce9/actionview/lib/action_view/helpers/tag_helper.rb#L84
+    HTML_VOID_ELEMENTS = %i(area base br col embed hr img input keygen link meta source track wbr)
+
+    # @param element [Symbol]
+    def void_element?(element)
+      HTML_VOID_ELEMENTS.include?(element)
+    end
+  end
+end

admin/spec/helpers/solidus_admin/void_elements_helper_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe SolidusAdmin::VoidElementsHelper, type: :helper do
+  describe '#void_element?' do
+    subject { helper.void_element?(element) }
+
+    context 'when element is void' do
+      let(:element) { :input }
+
+      it { is_expected.to be true }
+    end
+
+    context 'when element is not void' do
+      let(:element) { :div }
+
+      it { is_expected.to be false }
+    end
+  end
+end