stimulus_plumbers 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24b44f53bd74bf3d60b97cbf5957a3f759f1f67f9e107a0073283c84d042ec4d
-  data.tar.gz: 3a25d7f60c7e1060ad50702ecf1246a92a0c1aff61ece5c3b5d00b4d84e14b02
+  metadata.gz: c557f72e3e2b4e915105a333d712b8427e57ecec626110af9e38f712691c8277
+  data.tar.gz: 42b56777469d4d1a0bf9c92ce40161db2503da7d364e64bd4206ed83c05dc27e
 SHA512:
-  metadata.gz: 1d63614d10f54fe15f692b7047c4ab638151b979fd1e4491fc2d7d9df5f8f2131eb0525e49d57ca482204a2bf3850953f24704a2262afad7c0c45cb6b7b0bdc8
-  data.tar.gz: edbf1b318041423db316becab23d992ae44d215ae0ad4df73fa2953c8f22c2106879d4d6c55d766f3d25c96899a29c1a00104cc10ff95e60615b0061aafd97db
+  metadata.gz: 90f2d539e2fc47ac6859d02b615c5df35ed21317a4cf05543e26a82ebd07aa064a908af93eac974297676f0cb986b09b56aae1cc176fb322c3b79823875166c1
+  data.tar.gz: 48f00840cdc3e721a5ae204891817587c4c505d64b561767b4e906b6d7b899a862d7a4f4a32a09d44e77d6688fccf29838d8a6120c36613a57d4555ff5e907cb

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [conventional commits](https://www.conventionalcommits.org/) for commit guidelines.
 
+---
+## [0.3.1](https://github.com/ryancyq/stimulus-plumbers/compare/stimulus-plumbers-rails/v0.3.0..stimulus-plumbers-rails/v0.3.1) - 2026-05-19
+
+### Features
+
+- form input group + fieldset ([#75](https://github.com/ryancyq/stimulus-plumbers/issues/75)) - ([b18916f](https://github.com/ryancyq/stimulus-plumbers/commit/b18916f2dcf004ae358a598ce54f28231b069af3)) - Ryan Chang
+
 ---
 ## [0.3.0](https://github.com/ryancyq/stimulus-plumbers/compare/stimulus-plumbers-rails/v0.2.9..stimulus-plumbers-rails/v0.3.0) - 2026-05-18
 

data/lib/stimulus_plumbers/components/action_list/section.rb

@@ -5,13 +5,14 @@ module StimulusPlumbers
     class ActionList
       class Section < Plumber::Base
         def render(title: nil, **kwargs, &block)
-          html_options = merge_html_options(kwargs)
-          template.content_tag(:div, **html_options) do
+          template.content_tag(:li, **kwargs) do
+            ul_opts = {}
+            ul_opts[:aria] = { label: title } if title.present?
             template.safe_join(
               [
-                (template.content_tag(:p, title) if title.present?),
-                template.content_tag(:ul, template.capture(&block))
-              ].compact
+                (template.content_tag(:span, title, aria: { hidden: "true" }) if title.present?),
+                template.content_tag(:ul, template.capture(&block), **ul_opts)
+              ]
             )
           end
         end

data/lib/stimulus_plumbers/components/action_list.rb

@@ -3,12 +3,12 @@
 module StimulusPlumbers
   module Components
     class ActionList < Plumber::Base
-      def render(**kwargs, &block)
+      def render(role: "list", **kwargs, &block)
         html_options = merge_html_options(
-          { classes: theme.resolve(:action_list).fetch(:classes, "") },
+          { role: role, classes: theme.resolve(:action_list).fetch(:classes, "") },
           kwargs
         )
-        template.content_tag(:div, template.capture(&block), **html_options)
+        template.content_tag(:ul, template.capture(&block), **html_options)
       end
 
       def section(title: nil, **kwargs, &block)

data/lib/stimulus_plumbers/components/calendar/month/turbo/days_of_month.rb

@@ -115,15 +115,17 @@ module StimulusPlumbers
             def day_cell_html_options(date, today)
               is_today = date == today
               selected = selected_date && date == selected_date
-              {
-                classes:  theme.resolve(:calendar_day, today: is_today, selected: selected).fetch(:classes, ""),
-                role:     "gridcell",
-                tabindex: date == focus_day ? 0 : -1,
-                aria:     {
-                  current:  is_today ? "date" : nil,
-                  selected: if selectable then selected ? "true" : "false" end
+              merge_html_options(
+                { classes: theme.resolve(:calendar_day, today: is_today, selected: selected).fetch(:classes, "") },
+                {
+                  role:     "gridcell",
+                  tabindex: date == focus_day ? 0 : -1,
+                  aria:     {
+                    current:  is_today ? "date" : nil,
+                    selected: if selectable then selected ? "true" : "false" end
+                  }
                 }
-              }
+              )
             end
 
             def other_month_day_cell(date)

data/lib/stimulus_plumbers/components/card/section.rb

@@ -4,7 +4,7 @@ module StimulusPlumbers
   module Components
     class Card
       class Section < Plumber::Base
-        def render(title: nil, **kwargs, &block)
+        def render(title: nil, title_tag: :h3, **kwargs, &block)
           html_options = merge_html_options(
             { classes: theme.resolve(:card_section).fetch(:classes, "") },
             kwargs
@@ -13,9 +13,9 @@ module StimulusPlumbers
           template.content_tag(:div, **html_options) do
             template.safe_join(
               [
-                (template.content_tag(:h3, title) if title.present?),
+                (template.content_tag(title_tag, title) if title.present?),
                 template.capture(&block)
-              ].compact
+              ]
             )
           end
         end

data/lib/stimulus_plumbers/components/card.rb

@@ -3,7 +3,7 @@
 module StimulusPlumbers
   module Components
     class Card < Plumber::Base
-      def render(title: nil, **kwargs, &block)
+      def render(title: nil, title_tag: :h2, **kwargs, &block)
         html_options = merge_html_options(
           { classes: theme.resolve(:card).fetch(:classes, "") },
           kwargs
@@ -12,9 +12,9 @@ module StimulusPlumbers
         template.content_tag(:div, **html_options) do
           template.safe_join(
             [
-              (template.content_tag(:h2, title) if title.present?),
+              (template.content_tag(title_tag, title) if title.present?),
               template.capture(&block)
-            ].compact
+            ]
           )
         end
       end

data/lib/stimulus_plumbers/components/combobox/autocomplete.rb

@@ -10,24 +10,18 @@ module StimulusPlumbers
           )
         end
 
-        def render(options: [], value: nil, label: nil, **_kwargs)
-          template.safe_join([listbox(options, value, label), loading, empty])
+        def render(options: [], value: nil, label: nil, labelledby: nil)
+          template.safe_join(
+            [
+              Dropdown.new(template).render(options: options, value: value, label: label, labelledby: labelledby),
+              loading,
+              empty
+            ]
+          )
         end
 
         private
 
-        def listbox(options, value, label)
-          attrs = merge_html_options(
-            { classes: theme.resolve(:combobox_listbox).fetch(:classes, "") },
-            { role: "listbox", data: { "#{Dropdown::STIMULUS_CONTROLLER}_target": "listbox" } }
-          )
-          attrs[:aria] = { label: label } if label
-
-          template.content_tag(:ul, **attrs) do
-            Options.new(template).render(options, value: value)
-          end
-        end
-
         def loading
           template.content_tag(
             :div,

data/lib/stimulus_plumbers/components/combobox/date.rb

@@ -14,8 +14,12 @@ module StimulusPlumbers
           }
         end
 
-        def render(value: nil, **_kwargs)
-          calendar_id = "combobox_date_#{SecureRandom.hex(8)}_calendar"
+        def self.calendar_id_for(popover_id)
+          [popover_id, "calendar"].compact.join("_")
+        end
+
+        def render(value: nil, popover_id: nil)
+          calendar_id = self.class.calendar_id_for(popover_id)
 
           data = {
             controller:          STIMULUS_CONTROLLER,

data/lib/stimulus_plumbers/components/combobox/dropdown.rb

@@ -21,12 +21,16 @@ module StimulusPlumbers
           }
         end
 
-        def render(options: [], value: nil, label: nil, **_kwargs)
+        def render(options: [], value: nil, label: nil, labelledby: nil)
           listbox_attrs = merge_html_options(
             { classes: theme.resolve(:combobox_listbox).fetch(:classes, "") },
             { role: "listbox", data: { "#{STIMULUS_CONTROLLER}_target": "listbox" } }
           )
-          listbox_attrs[:aria] = { label: label } if label
+          if labelledby
+            listbox_attrs[:aria] = { labelledby: labelledby }
+          elsif label
+            listbox_attrs[:aria] = { label: label }
+          end
 
           template.content_tag(:ul, **listbox_attrs) do
             Options.new(template).render(options, value: value)

data/lib/stimulus_plumbers/components/combobox/popover.rb

@@ -4,14 +4,18 @@ module StimulusPlumbers
   module Components
     class Combobox
       class Popover < Plumber::Base
-        def render(stimulus_controller:, id:, tag: :div, role: nil, label: nil, content: nil, data: {}, **_rest, &block)
-          base_data = { "#{stimulus_controller}_target": "popover" }
+        def render(stimulus_controller:, id:, tag: :div, role: nil, label: nil, labelledby: nil, content: nil, data: {}, &block)
+          stimulus_data = { "#{stimulus_controller}_target": "popover" }
 
-          attrs = { id: id, hidden: "", data: merge_data_options(base_data, data.symbolize_keys) }
+          attrs = { id: id, hidden: "", data: merge_data_options(stimulus_data, data) }
           attrs[:role] = role if role
-          attrs[:aria] = { label: label } if label
+          if labelledby
+            attrs[:aria] = { labelledby: labelledby }
+          elsif label
+            attrs[:aria] = { label: label }
+          end
 
-          html_content = block_given? ? template.capture(&block) : content
+          html_content = block_given? ? template.capture(id, &block) : content
           template.content_tag(tag, **attrs) { html_content }
         end
       end

data/lib/stimulus_plumbers/components/combobox/time.rb

@@ -12,7 +12,7 @@ module StimulusPlumbers
           }
         end
 
-        def render(format: :h12, step: 1, value: nil, **_kwargs)
+        def render(format: :h12, step: 1, value: nil)
           @format = format
           @step   = [1, step.to_i].max
           @time   = parse_time(value)

data/lib/stimulus_plumbers/components/combobox/trigger.rb

@@ -11,26 +11,35 @@ module StimulusPlumbers
           readonly: true,
           aria_autocomplete: nil,
           aria_label: nil,
+          aria: {},
+          id: nil,
           data: {},
-          **_rest
+          **kwargs
         )
-          base_data = {
+          stimulus_data = {
             "#{stimulus_controller}_target": "trigger",
             input_format_target:             "input",
             action:                          "focus->#{stimulus_controller}#open keydown.esc->#{stimulus_controller}#close"
           }
 
-          aria = { haspopup: haspopup, expanded: "false", controls: popover_id }
-          aria[:autocomplete] = aria_autocomplete if aria_autocomplete
-          aria[:label]        = aria_label        if aria_label
+          trigger_aria = { haspopup: haspopup, expanded: "false", controls: popover_id }
+          trigger_aria[:autocomplete] = aria_autocomplete if aria_autocomplete
+          trigger_aria[:label]        = aria_label        if aria_label
 
-          html_options = merge_html_options(
-            { classes: theme.resolve(:combobox_trigger).fetch(:classes, "") },
-            { type: "text", readonly: (readonly ? true : nil), role: "combobox", aria: aria,
-              data: merge_data_options(base_data, data.symbolize_keys)
-}
+          template.tag.input(
+            **merge_html_options(
+              { classes: theme.resolve(:combobox_trigger).fetch(:classes, "") },
+              {
+                id:       id,
+                type:     "text",
+                readonly: (readonly ? true : nil),
+                role:     "combobox",
+                aria:     trigger_aria.deep_merge(aria),
+                data:     merge_data_options(stimulus_data, data)
+              },
+              kwargs
+            )
           )
-          template.tag.input(**html_options)
         end
       end
     end

data/lib/stimulus_plumbers/components/combobox.rb

@@ -7,52 +7,62 @@ module StimulusPlumbers
       FORMAT_CONTROLLER   = "input-format"
       FORMAT_ACTION       = "input-combobox:changed->input-format#format"
 
-      def render(base_id:, options: {}, **kwargs)
-        popover_id    = "#{base_id}_popover"
-        initial_value = options.dig(:input, :value)
-
-        base_data = {
-          controller: "#{STIMULUS_CONTROLLER} #{FORMAT_CONTROLLER}",
-          action:     FORMAT_ACTION
-        }
-        base_data[:input_combobox_value_value] = initial_value if initial_value.present?
+      def self.popover_id_for(trigger_id)
+        [trigger_id, "popover"].compact.join("_")
+      end
 
-        html_options = merge_html_options({ data: base_data }, kwargs)
+      def render(trigger: {}, input: {}, popover: {}, **kwargs, &block)
+        popover_id    = self.class.popover_id_for(trigger[:id])
+        initial_value = input[:value]
+        haspopup      = popover.delete(:haspopup) { popover[:role] || "dialog" }
+        html_options  = merge_html_options({ data: build_stimulus_data(initial_value) }, kwargs)
 
         template.content_tag(:div, **html_options) do
           template.safe_join(
             [
-              trigger(popover_id, options),
-              hidden_input(options.fetch(:input, {})),
-              popover(popover_id, options)
+              combobox_trigger(popover_id, trigger, haspopup),
+              hidden_input(input),
+              combobox_popover(popover_id, popover, &block)
             ]
           )
         end
       end
 
-      def trigger(popover_id, options)
-        haspopup = options.dig(:popover, :haspopup) || options.dig(:popover, :role) || "dialog"
+      private
+
+      def build_stimulus_data(initial_value)
+        {
+          controller: "#{STIMULUS_CONTROLLER} #{FORMAT_CONTROLLER}",
+          action:     FORMAT_ACTION
+        }.tap do |data|
+          data[:input_combobox_value_value] = initial_value if initial_value.present?
+        end
+      end
+
+      def combobox_trigger(popover_id, trigger, haspopup)
         Combobox::Trigger.new(template).render(
           stimulus_controller: STIMULUS_CONTROLLER,
           popover_id:          popover_id,
           haspopup:            haspopup,
-          **options.fetch(:trigger, {})
+          **trigger
         )
       end
 
-      def popover(popover_id, options)
+      def combobox_popover(popover_id, popover, &block)
         Combobox::Popover.new(template).render(
           stimulus_controller: STIMULUS_CONTROLLER,
           id:                  popover_id,
-          **options.fetch(:popover, {})
+          **popover,
+          &block
         )
       end
 
-      private
-
-      def hidden_input(opts)
-        data = { "#{STIMULUS_CONTROLLER}_target": "value" }.merge(opts.fetch(:data, {}))
-        template.tag.input(type: "hidden", name: opts[:name], value: opts[:value], data: data)
+      def hidden_input(input)
+        stimulus_data = merge_html_options(
+          { "#{STIMULUS_CONTROLLER}_target": "value" },
+          input.fetch(:data, {})
+        )
+        template.tag.input(type: "hidden", name: input[:name], value: input[:value], data: stimulus_data)
       end
     end
   end

data/lib/stimulus_plumbers/components/divider.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Components
+    class Divider < Plumber::Base
+      def render(**kwargs)
+        html_options = merge_html_options(
+          { classes: theme.resolve(:divider).fetch(:classes, "") },
+          kwargs
+        )
+
+        template.tag.hr(**html_options)
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/components/popover/builder.rb

@@ -8,8 +8,8 @@ module StimulusPlumbers
 
         def initialize(template)
           @template = template
-          @activator_html = "".html_safe
-          @content_html   = "".html_safe
+          @activator_html = nil
+          @content_html   = nil
         end
 
         def activator(&block)

data/lib/stimulus_plumbers/form/builder.rb

@@ -3,63 +3,59 @@
 require "action_view/version"
 
 require_relative "field"
-require_relative "fields/choice"
-require_relative "fields/combobox"
-require_relative "fields/file"
-require_relative "fields/password"
-require_relative "fields/renderer"
-require_relative "fields/search"
-require_relative "fields/select"
-require_relative "fields/text"
-require_relative "fields/text_area"
-require_relative "fields/submit"
+require_relative "fields/fieldset"
+require_relative "fields/inputs/choice"
+require_relative "fields/inputs/datetime"
+require_relative "fields/inputs/file"
+require_relative "fields/inputs/password"
+require_relative "fields/inputs/search"
+require_relative "fields/inputs/select"
+require_relative "fields/inputs/select/grouped"
+require_relative "fields/inputs/select/timezone"
+require_relative "fields/inputs/select/weekday"
+require_relative "fields/inputs/submit"
+require_relative "fields/inputs/text"
+require_relative "fields/inputs/text_area"
 require_relative "../plumber/html_options"
 
 module StimulusPlumbers
   module Form
     class Builder < ActionView::Helpers::FormBuilder
       include Plumber::HtmlOptions
-      include Fields::Choice
-      include Fields::Combobox
-      include Fields::File
-      include Fields::Password
-      include Fields::Search
-      include Fields::Select
-      include Fields::Submit
-      include Fields::Text
-      include Fields::TextArea
+      include Fields::Inputs::Choice
+      include Fields::Inputs::Datetime
+      include Fields::Inputs::File
+      include Fields::Inputs::Password
+      include Fields::Inputs::Search
+      include Fields::Inputs::Select
+      include Fields::Inputs::Select::Grouped
+      include Fields::Inputs::Select::Timezone
+      include Fields::Inputs::Select::Weekday
+      include Fields::Inputs::Submit
+      include Fields::Inputs::Text
+      include Fields::Inputs::TextArea
 
       private
 
-      def build_field(attribute, form_field_opts, input_id: field_id(attribute))
-        Field.new(
-          object:           object,
-          attribute:        attribute,
-          input_id:         input_id,
-          label:            form_field_opts[:label],
-          details:          form_field_opts[:details],
-          error:            form_field_opts[:error],
-          required:         form_field_opts.fetch(:required, false),
-          label_visibility: form_field_opts.fetch(:label_visibility, :visible),
-          layout:           form_field_opts.fetch(:layout, :stacked)
-        )
+      def render_fieldset(attribute, field, &block)
+        Fields::Fieldset.new(@template).render(object, attribute, field_id(attribute), field, &block)
       end
 
-      def render_field(field, input_html)
-        Fields::Renderer.new(@template, theme, field).call(input_html)
+      def render_input_group(error:, leading: nil, trailing: nil, **wrapper_opts, &block)
+        Fields::InputGroup.new(@template).render(leading: leading, trailing: trailing, error: error, **wrapper_opts, &block)
       end
 
-      def build_input_group(input_tag, field, trailing:, **wrapper_opts)
-        @template.content_tag(
-          :div,
-          input_tag.html_safe + trailing,
-          class: field_theme(:form_input_group, error: field.error?)[:class],
-          **wrapper_opts
+      def render_combobox(attribute, input_id:, opts:, err:, **wrapper_opts, &block)
+        combobox_opts = opts.deep_merge(
+          input:   { name: field_name(attribute) },
+          trigger: { id: input_id }
         )
-      end
 
-      def extract_options(options)
-        [options.except(*Field::OPTIONS), options.slice(*Field::OPTIONS)]
+        Components::Combobox.new(@template).render(
+          **combobox_opts,
+          **merge_html_options(wrapper_opts, field_theme(:form_combobox, error: err)),
+          &block
+        )
       end
 
       def field_theme(key, **variants)
@@ -71,7 +67,7 @@ module StimulusPlumbers
       end
 
       # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
-      if ActionView.version < "7.0"
+      if ActionView.version < Gem::Version.new("7.0")
         # field_id was added in Rails 7.0, backports it to Rails 6.1.
         # https://github.com/rails/rails/blob/2d670320f7b02ae879545d5202f0633841b8f196/actionview/lib/action_view/helpers/form_helper.rb#L1777
         # https://github.com/rails/rails/blob/2d670320f7b02ae879545d5202f0633841b8f196/actionview/lib/action_view/helpers/form_tag_helper.rb#L101