stimulus_plumbers 0.3.2 → 0.3.3

data/lib/stimulus_plumbers/form/fields/inputs/search.rb

@@ -28,7 +28,7 @@ module StimulusPlumbers
                   url:       url,
                   clearable: clearable
                 ) do |combobox_opts, input_id, current_value|
-                  render_search_autocomplete(attribute, input_id, combobox_opts, error, choices, current_value)
+                  render_search_typeahead(attribute, input_id, combobox_opts, error, choices, current_value)
                 end
               end
             end
@@ -37,7 +37,7 @@ module StimulusPlumbers
           private
 
           def render_search_input(html_opts, opts, error, clearable:, &block)
-            data         = clearable ? { data: { input_search_target: "input" } } : {}
+            data         = clearable ? { data: { input_clearable_target: "input" } } : {}
             html_options = merge_html_options(opts, html_opts, field_theme(:form_input, error: error), data)
             input_html   = @template.capture(html_options, &block)
 
@@ -46,16 +46,16 @@ module StimulusPlumbers
             render_input_group(
               trailing: method(:clear_button),
               error:    !!error,
-              **merge_html_options(field_theme(:form_input_search), { data: { controller: "input-search" } })
+              **merge_html_options(field_theme(:form_input_clearable), { data: { controller: "input-clearable" } })
             ) { input_html }
           end
 
           def render_search_combobox(attribute, html_opts, error, url:, clearable:, &block)
             current_value = object.respond_to?(attribute) ? object.public_send(attribute) : nil
             input_id      = html_opts[:id]
-            opts          = Components::Combobox::Autocomplete.default_opts.deep_merge(
+            opts          = Components::Combobox::Typeahead.default_opts.deep_merge(
               input:   { value: current_value },
-              trigger: { data: clearable ? { input_search_target: "input" } : {}, aria: html_opts[:aria] },
+              trigger: { data: clearable ? { input_clearable_target: "input" } : {}, aria: html_opts[:aria] },
               popover: { data: url ? { combobox_dropdown_url_value: url } : {} }
             )
 
@@ -65,11 +65,11 @@ module StimulusPlumbers
             render_input_group(
               trailing: method(:clear_button),
               error:    !!error,
-              **merge_html_options(field_theme(:form_input_search), { data: { controller: "input-search" } })
+              **merge_html_options(field_theme(:form_input_clearable), { data: { controller: "input-clearable" } })
             ) { combobox_html }
           end
 
-          def render_search_autocomplete(attribute, input_id, combobox_opts, error, choices, current_value)
+          def render_search_typeahead(attribute, input_id, combobox_opts, error, choices, current_value)
             render_combobox(
               attribute,
               input_id: input_id,
@@ -79,18 +79,18 @@ module StimulusPlumbers
                 input_combobox_combobox_dropdown_outlet: "##{Components::Combobox.popover_id_for(input_id)}",
                 action:                                  "input->input-combobox#onInput"
               }
-            ) { Components::Combobox::Autocomplete.new(@template).render(options: choices, value: current_value, labelledby: Field.label_id(input_id)) }
+            ) { Components::Combobox::Typeahead.new(@template).render(options: choices, value: current_value, labelledby: Field.label_id(input_id)) }
           end
 
           def clear_button
             Components::Button.new(@template).render(
-              "",
+              icon_leading: "close",
               **merge_html_options(
                 field_theme(:form_button_clear),
                 {
                   aria:   { label: "Clear search" },
                   hidden: true,
-                  data:   { input_search_target: "clear", action: "click->input-search#clear" }
+                  data:   { input_clearable_target: "clear", action: "click->input-clearable#clear" }
                 }
               )
             )

data/lib/stimulus_plumbers/form/fields/inputs/select/grouped.rb

@@ -16,13 +16,11 @@ module StimulusPlumbers
               options = {},
               html_options = {}
             )
-              html_native = options.delete(:html_native) { false }
-              Field.new(@template, **options).render(
-                object,
-                attribute,
-                input_id: field_id(attribute)
-              ) do |html_opts, opts, error|
-                merged_html_opts = merge_html_options(html_options, html_opts, field_theme(:form_select, error: error))
+              html_native   = options.delete(:html_native) { false }
+              icon_leading  = options.delete(:icon_leading)
+              icon_trailing = options.delete(:icon_trailing) { "chevron-down" }
+              icons         = { icon_leading: icon_leading, icon_trailing: icon_trailing }
+              with_select_field(attribute, options, html_options) do |opts, merged, error|
                 if html_native
                   super(
                     attribute,
@@ -32,23 +30,29 @@ module StimulusPlumbers
                     option_key_method,
                     option_value_method,
                     opts,
-                    merged_html_opts
+                    merged
                   )
                 else
-                  render_select_dropdown(attribute, opts, merged_html_opts, err: error) do
-                    collection.map do |group|
-                      {
-                        label:   group.public_send(group_label_method),
-                        options: group.public_send(group_method).map do |item|
-                          [item.public_send(option_value_method), item.public_send(option_key_method)]
-                        end
-                      }
-                    end
+                  render_select_dropdown(attribute, opts, merged, err: error, **icons) do
+                    build_grouped_choices(collection, group_label_method, group_method, option_key_method, option_value_method)
                   end
                 end
               end
             end
           end
+
+          private
+
+          def build_grouped_choices(collection, group_label_method, group_method, option_key_method, option_value_method)
+            collection.map do |group|
+              {
+                label:   group.public_send(group_label_method),
+                options: group.public_send(group_method).map do |item|
+                  [item.public_send(option_value_method), item.public_send(option_key_method)]
+                end
+              }
+            end
+          end
         end
       end
     end

data/lib/stimulus_plumbers/form/fields/inputs/select/timezone.rb

@@ -7,13 +7,15 @@ module StimulusPlumbers
         module Select
           module Timezone
             def time_zone_select(attribute, priority_zones = nil, options = {}, html_options = {})
-              html_native = options.delete(:html_native) { false }
-              Field.new(@template, **options).render(object, attribute, input_id: field_id(attribute)) do |html_opts, opts, error|
-                merged_html_opts = merge_html_options(html_options, html_opts, field_theme(:form_select, error: error))
+              html_native   = options.delete(:html_native) { false }
+              icon_leading  = options.delete(:icon_leading)
+              icon_trailing = options.delete(:icon_trailing) { "chevron-down" }
+              icons         = { icon_leading: icon_leading, icon_trailing: icon_trailing }
+              with_select_field(attribute, options, html_options) do |opts, merged, error|
                 if html_native
-                  super(attribute, priority_zones, opts, merged_html_opts)
+                  super(attribute, priority_zones, opts, merged)
                 else
-                  render_select_dropdown(attribute, opts, merged_html_opts, err: error) do
+                  render_select_dropdown(attribute, opts, merged, err: error, **icons) do
                     model = opts.delete(:model) { ActiveSupport::TimeZone }
                     build_zone_choices(priority_zones, model.all)
                   end

data/lib/stimulus_plumbers/form/fields/inputs/select/weekday.rb

@@ -8,17 +8,15 @@ module StimulusPlumbers
           module Weekday
             if ActionView.version >= Gem::Version.new("7.1")
               def weekday_select(attribute, options = {}, html_options = {})
-                html_native = options.delete(:html_native) { false }
-                Field.new(@template, **options).render(
-                  object,
-                  attribute,
-                  input_id: field_id(attribute)
-                ) do |html_opts, opts, error|
-                  merged_html_opts = merge_html_options(html_options, html_opts, field_theme(:form_select, error: error))
+                html_native   = options.delete(:html_native) { false }
+                icon_leading  = options.delete(:icon_leading)
+                icon_trailing = options.delete(:icon_trailing) { "chevron-down" }
+                icons         = { icon_leading: icon_leading, icon_trailing: icon_trailing }
+                with_select_field(attribute, options, html_options) do |opts, merged, error|
                   if html_native
-                    super(attribute, opts, merged_html_opts)
+                    super(attribute, opts, merged)
                   else
-                    render_select_dropdown(attribute, opts, merged_html_opts, err: error) do
+                    render_select_dropdown(attribute, opts, merged, err: error, **icons) do
                       build_weekday_choices(opts)
                     end
                   end

data/lib/stimulus_plumbers/form/fields/inputs/select.rb

@@ -6,17 +6,17 @@ module StimulusPlumbers
       module Inputs
         module Select
           def select(attribute, choices = nil, options = {}, html_options = {})
-            html_native = options.delete(:html_native) { false }
-            Field.new(@template, **options).render(
-              object,
-              attribute,
-              input_id: field_id(attribute)
-            ) do |html_opts, opts, error|
-              merged_html_opts = merge_html_options(html_options, html_opts, field_theme(:form_select, error: error))
+            html_native   = options.delete(:html_native) { false }
+            icon_leading  = options.delete(:icon_leading)
+            icon_trailing = options.delete(:icon_trailing) { "chevron-down" }
+            icons         = { icon_leading: icon_leading, icon_trailing: icon_trailing }
+            with_select_field(attribute, options, html_options) do |opts, merged, error|
               if html_native
-                super(attribute, choices, opts, merged_html_opts)
+                super(attribute, choices, opts, merged)
               else
-                render_select_dropdown(attribute, opts, merged_html_opts, err: error) { Array(choices) }
+                render_select_dropdown(attribute, opts, merged, err: error, **icons) do
+                  Array(choices)
+                end
               end
             end
           end
@@ -29,17 +29,15 @@ module StimulusPlumbers
             options = {},
             html_options = {}
           )
-            html_native = options.delete(:html_native) { false }
-            Field.new(@template, **options).render(
-              object,
-              attribute,
-              input_id: field_id(attribute)
-            ) do |html_opts, opts, error|
-              merged_html_opts = merge_html_options(html_options, html_opts, field_theme(:form_select, error: error))
+            html_native   = options.delete(:html_native) { false }
+            icon_leading  = options.delete(:icon_leading)
+            icon_trailing = options.delete(:icon_trailing) { "chevron-down" }
+            icons         = { icon_leading: icon_leading, icon_trailing: icon_trailing }
+            with_select_field(attribute, options, html_options) do |opts, merged, error|
               if html_native
-                super(attribute, collection, value_method, text_method, opts, merged_html_opts)
+                super(attribute, collection, value_method, text_method, opts, merged)
               else
-                render_select_dropdown(attribute, opts, merged_html_opts, err: error) do
+                render_select_dropdown(attribute, opts, merged, err: error, **icons) do
                   collection.map { |item| [item.public_send(text_method), item.public_send(value_method)] }
                 end
               end
@@ -48,26 +46,40 @@ module StimulusPlumbers
 
           private
 
-          def render_select_dropdown(attribute, opts, html_opts, err:)
+          def with_select_field(attribute, options, html_options)
+            Field.new(@template, **options).render(object, attribute, input_id: field_id(attribute)) do |html_opts, opts, error|
+              yield opts, merge_html_options(html_options, html_opts, field_theme(:form_select, error: error)), error
+            end
+          end
+
+          def render_select_dropdown(attribute, opts, html_opts, err:, icon_leading:, icon_trailing:)
             include_blank = opts.delete(:include_blank)
             prompt        = opts.delete(:prompt)
             current_value = opts.delete(:selected) { object.respond_to?(attribute) ? object.public_send(attribute) : nil }
             choices       = build_select_dropdown_choices(yield(current_value), include_blank: include_blank, prompt: prompt)
-
-            combobox_opts = build_select_dropdown_opts(html_opts, current_value)
+            combobox_opts = build_select_dropdown_opts(
+              html_opts,
+              current_value,
+              icon_leading:  icon_leading,
+              icon_trailing: icon_trailing
+            )
             render_combobox(attribute, input_id: html_opts[:id], opts: combobox_opts, err: err) do
-              Components::Combobox::Dropdown.new(@template).render(
-                options:    choices,
-                value:      current_value,
-                labelledby: Field.label_id(html_opts[:id])
-              )
+              render_dropdown_component(choices, current_value, html_opts[:id])
             end
           end
 
-          def build_select_dropdown_opts(html_opts, current_value)
+          def render_dropdown_component(choices, value, input_id)
+            Components::Combobox::Dropdown.new(@template).render(
+              options:    choices,
+              value:      value,
+              labelledby: Field.label_id(input_id)
+            )
+          end
+
+          def build_select_dropdown_opts(html_opts, current_value, icon_leading:, icon_trailing:)
             Components::Combobox::Dropdown.default_opts.deep_merge(
               input:   { value: current_value },
-              trigger: html_opts
+              trigger: html_opts.merge({ icon_leading: icon_leading, icon_trailing: icon_trailing }.compact)
             )
           end
 

data/lib/stimulus_plumbers/helpers/action_list_helper.rb

@@ -3,16 +3,16 @@
 module StimulusPlumbers
   module Helpers
     module ActionListHelper
-      def sp_action_list(**html_options, &block)
-        action_list_renderer.render(**html_options, &block)
+      def sp_action_list(...)
+        action_list_renderer.render(...)
       end
 
-      def sp_action_list_section(title: nil, **html_options, &block)
-        action_list_renderer.section(title: title, **html_options, &block)
+      def sp_action_list_section(...)
+        action_list_renderer.section(...)
       end
 
-      def sp_action_list_item(content = nil, url: nil, external: false, active: false, **html_options, &block)
-        action_list_renderer.item(content, url: url, external: external, active: active, **html_options, &block)
+      def sp_action_list_item(content = nil, **kwargs, &block)
+        action_list_renderer.item(content, **kwargs, &block)
       end
 
       private

data/lib/stimulus_plumbers/helpers/avatar_helper.rb

@@ -3,8 +3,8 @@
 module StimulusPlumbers
   module Helpers
     module AvatarHelper
-      def sp_avatar(name: nil, initials: nil, url: nil, color: nil, size: :md, **html_options, &block)
-        avatar_renderer.render(name: name, initials: initials, url: url, color: color, size: size, **html_options, &block)
+      def sp_avatar(...)
+        avatar_renderer.render(...)
       end
 
       private

data/lib/stimulus_plumbers/helpers/button_helper.rb

@@ -3,16 +3,12 @@
 module StimulusPlumbers
   module Helpers
     module ButtonHelper
-      def sp_button(content = nil, url: nil, external: false, variant: :primary, size: :md, **html_options, &block)
-        button_renderer.render(
-          content,
-          url: url, external: external, variant: variant, size: size, **html_options,
-          &block
-        )
+      def sp_button(content = nil, **kwargs, &block)
+        button_renderer.render(content, **kwargs, &block)
       end
 
-      def sp_button_group(alignment: :left, direction: :row, **html_options, &block)
-        button_renderer.group(alignment: alignment, direction: direction, **html_options, &block)
+      def sp_button_group(...)
+        button_renderer.group(...)
       end
 
       private

data/lib/stimulus_plumbers/helpers/calendar_helper.rb

@@ -3,16 +3,19 @@
 module StimulusPlumbers
   module Helpers
     module CalendarHelper
-      def sp_calendar_month(date: nil, **html_options, &block)
-        if date
-          html_options = html_options.deep_merge(
-            data: {
-              "calendar-month-year-value":  date.year,
-              "calendar-month-month-value": date.month - 1,
-              "calendar-month-day-value":   date.day
-            }
-          )
-        end
+      def sp_calendar_month(**kwargs, &block)
+        date = kwargs.delete(:date)
+        html_options = if date
+                         kwargs.deep_merge(
+                           data: {
+                             "calendar-month-year-value":  date.year,
+                             "calendar-month-month-value": date.month - 1,
+                             "calendar-month-day-value":   date.day
+                           }
+                         )
+                       else
+                         kwargs
+                       end
         calendar_renderer.month(**html_options, &block)
       end
 

data/lib/stimulus_plumbers/helpers/calendar_turbo_helper.rb

@@ -3,22 +3,8 @@
 module StimulusPlumbers
   module Helpers
     module CalendarTurboHelper
-      def sp_calendar_month_turbo(
-        date: Date.today,
-        today: Date.today,
-        selectable: false,
-        selected_date: nil,
-        show_other_months: false,
-        **html_options
-      )
-        calendar_month_turbo_renderer.render(
-          date:              date,
-          today:             today,
-          selectable:        selectable,
-          selected_date:     selected_date,
-          show_other_months: show_other_months,
-          **html_options
-        )
+      def sp_calendar_month_turbo(**kwargs)
+        calendar_month_turbo_renderer.render(**kwargs)
       end
 
       private

data/lib/stimulus_plumbers/helpers/card_helper.rb

@@ -3,12 +3,12 @@
 module StimulusPlumbers
   module Helpers
     module CardHelper
-      def sp_card(title: nil, **html_options, &block)
-        card_renderer.render(title: title, **html_options, &block)
+      def sp_card(...)
+        card_renderer.render(...)
       end
 
-      def sp_card_section(title: nil, **html_options, &block)
-        card_renderer.section(title: title, **html_options, &block)
+      def sp_card_section(...)
+        card_renderer.section(...)
       end
 
       private

data/lib/stimulus_plumbers/helpers/combobox_helper.rb

@@ -3,37 +3,46 @@
 module StimulusPlumbers
   module Helpers
     module ComboboxHelper
-      def sp_combobox_date(label: nil, value: nil, **html_options)
-        id   = sp_dom_id
-        opts = Components::Combobox::Date.default_opts.deep_merge(
+      def sp_combobox_date(**kwargs)
+        label = kwargs.delete(:label)
+        value = kwargs.delete(:value)
+        id    = sp_dom_id
+        opts  = Components::Combobox::Date.default_opts.deep_merge(
           input:   { value: value },
-          trigger: { id: id, aria_label: label }.compact
+          trigger: { id: id, aria: ({ label: label } if label), icon_trailing: "calendar" }.compact
         )
         Components::Combobox.new(self).render(
           **opts,
-          data: { input_format_type_value: "date" },
-          **html_options
+          data: { input_formatter_format_value: "date" },
+          **kwargs
         ) do |popover_id|
           Components::Combobox::Date.new(self).render(value: value, popover_id: popover_id)
         end
       end
 
-      def sp_combobox_dropdown(label: nil, options: [], value: nil, **html_options)
-        id   = sp_dom_id
-        opts = Components::Combobox::Dropdown.default_opts.deep_merge(
+      def sp_combobox_dropdown(**kwargs)
+        label   = kwargs.delete(:label)
+        value   = kwargs.delete(:value)
+        options = kwargs.delete(:options) { [] }
+        id      = sp_dom_id
+        opts    = Components::Combobox::Dropdown.default_opts.deep_merge(
           input:   { value: value },
-          trigger: { id: id, aria_label: label }.compact
+          trigger: { id: id, aria: ({ label: label } if label), icon_trailing: "chevron-down" }.compact
         )
-        Components::Combobox.new(self).render(**opts, **html_options) do
+        Components::Combobox.new(self).render(**opts, **kwargs) do
           Components::Combobox::Dropdown.new(self).render(options: options, value: value, label: label)
         end
       end
 
-      def sp_combobox_autocomplete(label: nil, options: [], value: nil, url: nil, **html_options)
-        id   = sp_dom_id
-        opts = Components::Combobox::Autocomplete.default_opts.deep_merge(
+      def sp_combobox_typeahead(**kwargs)
+        label   = kwargs.delete(:label)
+        value   = kwargs.delete(:value)
+        options = kwargs.delete(:options) { [] }
+        url     = kwargs.delete(:url)
+        id      = sp_dom_id
+        opts    = Components::Combobox::Typeahead.default_opts.deep_merge(
           input:   { value: value },
-          trigger: { id: id, aria_label: label }.compact,
+          trigger: { id: id, aria: ({ label: label } if label) }.compact,
           popover: { data: url ? { combobox_dropdown_url_value: url } : {} }
         )
         Components::Combobox.new(self).render(
@@ -42,22 +51,26 @@ module StimulusPlumbers
             input_combobox_combobox_dropdown_outlet: "##{Components::Combobox.popover_id_for(id)}",
             action:                                  "input->input-combobox#onInput"
           },
-          **html_options
+          **kwargs
         ) do
-          Components::Combobox::Autocomplete.new(self).render(options: options, value: value, label: label)
+          Components::Combobox::Typeahead.new(self).render(options: options, value: value, label: label)
         end
       end
 
-      def sp_combobox_time(format: :h12, label: nil, step: 1, value: nil, **html_options)
-        id   = sp_dom_id
-        opts = Components::Combobox::Time.default_opts.deep_merge(
+      def sp_combobox_time(**kwargs)
+        format = kwargs.delete(:format) { :h12 }
+        label  = kwargs.delete(:label)
+        step   = kwargs.delete(:step) { 1 }
+        value  = kwargs.delete(:value)
+        id     = sp_dom_id
+        opts   = Components::Combobox::Time.default_opts.deep_merge(
           input:   { value: value },
-          trigger: { id: id, aria_label: label }.compact
+          trigger: { id: id, aria: ({ label: label } if label), icon_trailing: "clock" }.compact
         )
         Components::Combobox.new(self).render(
           **opts,
-          data: { input_format_type_value: "time", input_format_options_value: { format: format }.to_json },
-          **html_options
+          data: { input_formatter_format_value: "time", input_formatter_options_value: { format: format }.to_json },
+          **kwargs
         ) do
           Components::Combobox::Time.new(self).render(format: format, step: step, value: value)
         end

data/lib/stimulus_plumbers/helpers/divider_helper.rb

@@ -3,8 +3,8 @@
 module StimulusPlumbers
   module Helpers
     module DividerHelper
-      def sp_divider(**html_options)
-        Components::Divider.new(self).render(**html_options)
+      def sp_divider(label = nil, **kwargs)
+        Components::Divider.new(self).render(label, **kwargs)
       end
     end
   end

data/lib/stimulus_plumbers/helpers/popover_helper.rb

@@ -3,8 +3,8 @@
 module StimulusPlumbers
   module Helpers
     module PopoverHelper
-      def sp_popover(interactive: true, **html_options, &block)
-        popover_renderer.render(interactive: interactive, **html_options, &block)
+      def sp_popover(...)
+        popover_renderer.render(...)
       end
 
       private

data/lib/stimulus_plumbers/themes/base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "schema"
+require_relative "../plumber/dispatcher"
 
 module StimulusPlumbers
   module Themes
@@ -14,6 +15,7 @@ module StimulusPlumbers
         **Schema::COMBOBOX,
         **Schema::FORM,
         **Schema::ICON,
+        **Schema::INPUT_GROUP,
         **Schema::LAYOUT
       }.freeze
 
@@ -33,10 +35,6 @@ module StimulusPlumbers
         {}
       end
 
-      def icon_range
-        icons.keys
-      end
-
       def attribute_names(component)
         SCHEMA.fetch(component, {}).keys
       end
@@ -51,36 +49,37 @@ module StimulusPlumbers
           return {}
         end
 
-        send(method_name, **validate_args(component.to_sym, args))
+        send(method_name, **validate(component.to_sym, args))
       end
 
       private
 
-      def validate_args(component, args)
+      def validate(component, args)
         schema = SCHEMA.fetch(component, {})
         args.slice(*schema.keys).each_with_object({}) do |(key, value), result|
-          result[key] = coerce_arg(component, key, value, schema[key])
+          result[key] = cast(component, key, value, schema[key])
         end
       end
 
-      def coerce_arg(component, key, value, schema)
+      def cast(component, key, value, schema)
         return value unless schema
-
-        range = range_for(schema)
-        return value if range.empty? || range.include?(value)
+        return value if value.nil? || valid?(schema[:validate], value)
 
         StimulusPlumbers::Logger.warn(
           "#{component}##{key} received unknown value #{value.inspect}. " \
-          "Range: #{schema[:range].inspect}. Falling back to: #{schema[:default].inspect}"
+          "Validator: #{schema[:validate].inspect}. Falling back to: #{schema[:default].inspect}"
         )
         schema[:default]
       end
 
-      def range_for(schema)
-        if schema[:range].is_a?(Symbol)
-          respond_to?(schema[:range], true) ? send(schema[:range]) : []
+      def valid?(validator, value)
+        return true if validator.nil?
+
+        if validator.respond_to?(:include?)
+          validator.include?(value)
         else
-          schema[:range]
+          result = Plumber::Dispatcher.build(validator, value).call(self)
+          result.respond_to?(:include?) ? result.include?(value) : result
         end
       end
     end