stimulus_plumbers 0.2.8 → 0.3.0

data/lib/stimulus_plumbers/components/date_picker/navigation.rb

@@ -19,30 +19,22 @@ module StimulusPlumbers
 
         def navigators(stimulus_controller, step)
           [
-            Navigator.new(template).render(
-              icon_options: { name: "arrow-left" },
-              aria:         { label: ["previous", step].join(" ").titleize },
-              data:         { "#{stimulus_controller}-target" => "previous" }
-            ),
-            Navigator.new(template).render(
-              aria: { label: "Day" },
-              data: { "#{stimulus_controller}-target" => "day" }
-            ),
-            Navigator.new(template).render(
-              aria: { label: "Month" },
-              data: { "#{stimulus_controller}-target" => "month" }
-            ),
-            Navigator.new(template).render(
-              aria: { label: "Year" },
-              data: { "#{stimulus_controller}-target" => "year" }
-            ),
-            Navigator.new(template).render(
-              icon_options: { name: "arrow-right" },
-              aria:         { label: ["next", step].join(" ").titleize },
-              data:         { "#{stimulus_controller}-target" => "next" }
-            )
+            navigator(stimulus_controller, target: "previous", icon: "arrow-left", label: ["previous", step].join(" ").titleize),
+            navigator(stimulus_controller, target: "day",      label: "Day"),
+            navigator(stimulus_controller, target: "month",    label: "Month"),
+            navigator(stimulus_controller, target: "year",     label: "Year"),
+            navigator(stimulus_controller, target: "next",     icon: "arrow-right", label: ["next", step].join(" ").titleize)
           ]
         end
+
+        def navigator(stimulus_controller, target:, label:, icon: nil)
+          opts = {
+            aria: { label: label },
+            data: { "#{stimulus_controller}-target" => target }
+          }
+          opts[:icon_options] = { name: icon } if icon
+          Navigator.new(template).render(**opts)
+        end
       end
     end
   end

data/lib/stimulus_plumbers/components/date_picker/navigator.rb

@@ -20,7 +20,7 @@ module StimulusPlumbers
         private
 
         def icon(icon_options)
-          Icon::Renderer.new(template).icon(
+          Icon.new(template).render(
             classes: theme.resolve(:calendar_navigation_navigator_icon).fetch(:classes, ""),
             **icon_options
           )

data/lib/stimulus_plumbers/components/icon.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Components
+    class Icon < Plumber::Base
+      def render(name:, **kwargs)
+        html_options = merge_html_options(
+          { classes: theme.resolve(:icon).fetch(:classes, "") },
+          kwargs
+        )
+
+        icon_data = Themes::Schema::Icon.resolve(theme.icons[name])
+        if icon_data
+          svg_icon(icon_data, html_options)
+        else
+          template.tag.span(**html_options)
+        end
+      end
+
+      private
+
+      def svg_icon(icon_data, html_options)
+        template.content_tag(
+          :svg,
+          xmlns:          "http://www.w3.org/2000/svg",
+          fill:           icon_data[:fill],
+          viewBox:        icon_data[:view_box],
+          width:          icon_data[:width],
+          height:         icon_data[:height],
+          stroke:         icon_data[:stroke],
+          "stroke-width": icon_data[:stroke_width],
+          **html_options
+        ) do
+          template.tag.path(
+            "stroke-linecap":  icon_data[:stroke_linecap],
+            "stroke-linejoin": icon_data[:stroke_linejoin],
+            d:                 icon_data[:d]
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Components
+    class Popover
+      class Builder
+        attr_reader :activator_html, :content_html
+
+        def initialize(template)
+          @template = template
+          @activator_html = "".html_safe
+          @content_html   = "".html_safe
+        end
+
+        def activator(&block)
+          @activator_html = @template.capture(&block)
+        end
+
+        def content(&block)
+          @content_html = @template.capture(&block)
+        end
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/components/popover.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Components
+    class Popover < Plumber::Base
+      def render(interactive: true, **kwargs, &block)
+        html_options = merge_html_options(
+          { classes: theme.resolve(:popover).fetch(:classes, "") },
+          kwargs
+        )
+
+        builder = Popover::Builder.new(template)
+        template.capture(builder, &block)
+
+        template.content_tag(:div, **html_options) do
+          template.safe_join([builder.activator_html, wrap_content(interactive, builder)])
+        end
+      end
+
+      private
+
+      def wrap_content(interactive, builder)
+        if interactive
+          template.content_tag(:template, builder.content_html)
+        else
+          builder.content_html
+        end
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/configuration.rb

@@ -1,19 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "themes/base"
-require_relative "themes/tailwind_theme"
+require_relative "themes/configuration"
 
 module StimulusPlumbers
   class Configuration
-    DEFAULT_LOG_FORMATTER  = ->(message) { "[StimulusPlumbers] #{message}" }
-    THEME_KLASS_FORMATTER  = ->(type) { "StimulusPlumbers::Themes::#{type.to_s.classify}Theme" }
+    DEFAULT_LOG_FORMATTER = ->(message) { "[StimulusPlumbers] #{message}" }
 
     def theme
-      @theme ||= build_theme(:tailwind)
-    end
-
-    def theme=(value)
-      @theme = build_theme(value)
+      @theme ||= Themes::Configuration.new
     end
 
     def log_formatter
@@ -25,15 +20,5 @@ module StimulusPlumbers
 
       @log_formatter = callable
     end
-
-    private
-
-    def build_theme(type)
-      return type if type.is_a?(Themes::Base)
-
-      klass_name = THEME_KLASS_FORMATTER.call(type)
-      klass_name.safe_constantize&.new or
-        raise ArgumentError, "Unknown theme #{type.inspect}: #{klass_name} is not defined."
-    end
   end
 end

data/lib/stimulus_plumbers/engine.rb

@@ -8,8 +8,8 @@ module StimulusPlumbers
 
     config.autoload_paths << File.expand_path("../stimulus-plumbers", __dir__)
 
-    initializer "stimulus_plumbers.assets" do |app|
-      app.config.assets.paths << root.join("app/assets/javascripts")
+    initializer "stimulus_plumbers.assets", after: :set_default_precompile do |app|
+      app.config.assets.precompile += %w[stimulus_plumbers/tokens.css] if app.config.respond_to?(:assets)
     end
 
     initializer "stimulus_plumbers.helpers" do

data/lib/stimulus_plumbers/form/builder.rb

@@ -2,7 +2,7 @@
 
 require "action_view/version"
 
-require_relative "field_component"
+require_relative "field"
 require_relative "fields/choice"
 require_relative "fields/combobox"
 require_relative "fields/file"
@@ -12,25 +12,27 @@ require_relative "fields/search"
 require_relative "fields/select"
 require_relative "fields/text"
 require_relative "fields/text_area"
-require_relative "../components/plumber/html_options"
+require_relative "fields/submit"
+require_relative "../plumber/html_options"
 
 module StimulusPlumbers
   module Form
     class Builder < ActionView::Helpers::FormBuilder
-      include Components::Plumber::HtmlOptions
+      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
 
       private
 
       def build_field(attribute, form_field_opts, input_id: field_id(attribute))
-        FieldComponent.new(
+        Field.new(
           object:           object,
           attribute:        attribute,
           input_id:         input_id,
@@ -57,7 +59,7 @@ module StimulusPlumbers
       end
 
       def extract_options(options)
-        [options.except(*FieldComponent::OPTIONS), options.slice(*FieldComponent::OPTIONS)]
+        [options.except(*Field::OPTIONS), options.slice(*Field::OPTIONS)]
       end
 
       def field_theme(key, **variants)
@@ -65,7 +67,7 @@ module StimulusPlumbers
       end
 
       def theme
-        StimulusPlumbers.config.theme
+        StimulusPlumbers.config.theme.current
       end
 
       # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity

data/lib/stimulus_plumbers/form/{field_component.rb → field.rb}

@@ -2,7 +2,7 @@
 
 module StimulusPlumbers
   module Form
-    class FieldComponent
+    class Field
       OPTIONS = %i[label details error required label_visibility layout reveal clearable].freeze
 
       attr_reader :object,

data/lib/stimulus_plumbers/form/fields/combobox.rb

@@ -19,21 +19,24 @@ module StimulusPlumbers
 
           rails_opts, field_opts = extract_options(html_options)
           field         = build_field(attribute, field_opts)
-          base_id       = field_id(attribute)
           current_value = object&.public_send(attribute)
 
+          wrapper = build_combobox_wrapper(klass, attribute, field, current_value, options, rails_opts)
+          render_field(field, wrapper)
+        end
+
+        def build_combobox_wrapper(klass, attribute, field, current_value, options, rails_opts)
           popover = klass.new(@template).render(options: options, value: current_value, **rails_opts)
           opts    = klass.default_opts.deep_merge(
             input:   { name: field_name(attribute), value: current_value },
             popover: { content: popover }
           )
-          wrapper = Components::Combobox::Renderer.new(@template).render(
-            base_id: base_id,
+          Components::Combobox.new(@template).render(
+            base_id: field_id(attribute),
             options: opts,
             **field_theme(:form_combobox, error: field.error?),
             **field.html_opts
           )
-          render_field(field, wrapper)
         end
       end
     end

data/lib/stimulus_plumbers/form/fields/error.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Form
+    module Fields
+      class Error < Plumber::Base
+        def render(message:, id:)
+          klass = theme.resolve(:form_error).fetch(:classes, "")
+          template.content_tag(:p, message, id: id, class: klass.presence, role: "alert")
+        end
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/form/fields/group.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Form
+    module Fields
+      class Group < Plumber::Base
+        def render(layout: :stacked, error: false, &block)
+          klass = theme.resolve(:form_group, layout: layout, error: error).fetch(:classes, "")
+          template.content_tag(:div, class: klass.presence, &block)
+        end
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/form/fields/hint.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Form
+    module Fields
+      class Hint < Plumber::Base
+        def render(text:, id:)
+          klass = theme.resolve(:form_details).fetch(:classes, "")
+          template.content_tag(:p, text, id: id, class: klass.presence)
+        end
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/form/fields/label.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Form
+    module Fields
+      class Label < Plumber::Base
+        def render(text:, for_id:, required: false, hidden: false)
+          klass = theme.resolve(:form_label, required: required, hidden: hidden).fetch(:classes, "")
+
+          inner = text.dup.html_safe
+          if required
+            mark_klass = theme.resolve(:form_required_mark).fetch(:classes, "")
+            inner += template.content_tag(:span, "*", "aria-hidden": "true", class: mark_klass.presence)
+          end
+
+          template.content_tag(:label, inner, for: for_id, class: klass.presence)
+        end
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/form/fields/renderer.rb

@@ -13,43 +13,42 @@ module StimulusPlumbers
         end
 
         def call(input_html)
-          field_klass = theme.resolve(:form_group, layout: field.layout, error: field.error?).fetch(:classes, "")
-
-          template.content_tag(:div, class: field_klass) do
-            label_html + input_html.html_safe + hint_html + errors_html
+          Group.new(template).render(layout: field.layout, error: field.error?) do
+            (field_label + input_html.html_safe + field_hint + field_errors).html_safe
           end
         end
 
         private
 
-        def label_html
-          klass = theme.resolve(:form_label, required: field.required, hidden: field.label_hidden?).fetch(:classes, "")
-
-          inner = field.label_text.dup.html_safe
-          if field.required
-            mark_klass = theme.resolve(:form_required_mark).fetch(:classes, "")
-            inner += template.content_tag(:span, "*", "aria-hidden": "true", class: mark_klass)
-          end
-
-          template.content_tag(:label, inner, for: field.input_id, class: klass)
+        def field_label
+          Label.new(template).render(
+            text:     field.label_text,
+            for_id:   field.input_id,
+            required: field.required,
+            hidden:   field.label_hidden?
+          )
         end
 
-        def hint_html
+        def field_hint
           return "".html_safe unless field.details.present?
 
-          klass = theme.resolve(:form_details).fetch(:classes, "")
-          template.content_tag(:p, field.details, id: field.hint_id, class: klass)
+          Hint.new(template).render(
+            text: field.details,
+            id:   field.hint_id
+          )
         end
 
-        def errors_html
+        def field_errors
           return "".html_safe if field.errors.none?
 
-          klass = theme.resolve(:form_error).fetch(:classes, "")
           field.errors.map.with_index(1) do |message, i|
-            id = field.errors.one? ? field.error_id : "#{field.error_id}_#{i}"
-            template.content_tag(:p, message, id: id, class: klass, role: "alert")
+            Error.new(template).render(message: message, id: error_id_for(i))
           end.join.html_safe
         end
+
+        def error_id_for(index)
+          field.errors.one? ? field.error_id : "#{field.error_id}_#{index}"
+        end
       end
     end
   end

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

@@ -9,14 +9,26 @@ module StimulusPlumbers
           clearable = form_field_opts.delete(:clearable) { false }
           field     = build_field(attribute, form_field_opts)
 
-          html_opts = merge_html_options(
-            rails_opts,
-            field_theme(:form_input, error: field.error?),
-            field.html_opts
-          )
           input_html = if clearable
-                         build_input_group(super(attribute, html_opts), field, trailing: clear_button)
+                         input_opts = merge_html_options(
+                           rails_opts,
+                           field_theme(:form_input, error: field.error?),
+                           field.html_opts,
+                           { "data-input-search-target": "input", inputmode: "search" }
+                         )
+                         build_input_group(
+                           super(attribute, input_opts),
+                           field,
+                           trailing:          clear_button,
+                           "data-controller": "input-search",
+                           role:              "search"
+                         )
                        else
+                         html_opts = merge_html_options(
+                           rails_opts,
+                           field_theme(:form_input, error: field.error?),
+                           field.html_opts
+                         )
                          super(attribute, html_opts)
                        end
 
@@ -29,9 +41,11 @@ module StimulusPlumbers
           @template.content_tag(
             :button,
             "",
-            type:         "button",
-            class:        field_theme(:form_button_reveal)[:class],
-            "aria-label": "Clear search"
+            type:                       "button",
+            class:                      field_theme(:form_button_reveal)[:class],
+            "aria-label":               "Clear search",
+            "data-input-search-target": "clear",
+            "data-action":              "click->input-search#clear"
           )
         end
       end

data/lib/stimulus_plumbers/form/fields/submit.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Form
+    module Fields
+      module Submit
+        def submit(value = nil, options = {})
+          if value.is_a?(Hash)
+            options = value
+            value = nil
+          end
+          value   ||= submit_default_value
+          variant   = options.delete(:variant) { :default }
+          @template.tag.input(
+            type:  "submit",
+            value: value,
+            **merge_html_options(field_theme(:form_submit, variant: variant), options)
+          )
+        end
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/helpers/action_list_helper.rb

@@ -4,7 +4,7 @@ module StimulusPlumbers
   module Helpers
     module ActionListHelper
       def sp_action_list(**html_options, &block)
-        action_list_renderer.list(**html_options, &block)
+        action_list_renderer.render(**html_options, &block)
       end
 
       def sp_action_list_section(title: nil, **html_options, &block)
@@ -18,7 +18,7 @@ module StimulusPlumbers
       private
 
       def action_list_renderer
-        Components::ActionList::Renderer.new(self)
+        Components::ActionList.new(self)
       end
     end
   end

data/lib/stimulus_plumbers/helpers/avatar_helper.rb

@@ -4,13 +4,13 @@ module StimulusPlumbers
   module Helpers
     module AvatarHelper
       def sp_avatar(name: nil, initials: nil, url: nil, color: nil, size: :md, **html_options, &block)
-        avatar_renderer.avatar(name: name, initials: initials, url: url, color: color, size: size, **html_options, &block)
+        avatar_renderer.render(name: name, initials: initials, url: url, color: color, size: size, **html_options, &block)
       end
 
       private
 
       def avatar_renderer
-        Components::Avatar::Renderer.new(self)
+        Components::Avatar.new(self)
       end
     end
   end

data/lib/stimulus_plumbers/helpers/button_helper.rb

@@ -4,7 +4,7 @@ module StimulusPlumbers
   module Helpers
     module ButtonHelper
       def sp_button(content = nil, url: nil, external: false, variant: :primary, size: :md, **html_options, &block)
-        button_renderer.button(
+        button_renderer.render(
           content,
           url: url, external: external, variant: variant, size: size, **html_options,
           &block
@@ -18,7 +18,7 @@ module StimulusPlumbers
       private
 
       def button_renderer
-        Components::Button::Renderer.new(self)
+        Components::Button.new(self)
       end
     end
   end

data/lib/stimulus_plumbers/helpers/calendar_helper.rb

@@ -19,7 +19,7 @@ module StimulusPlumbers
       private
 
       def calendar_renderer
-        Components::Calendar::Renderer.new(self)
+        Components::Calendar.new(self)
       end
     end
   end

data/lib/stimulus_plumbers/helpers/calendar_turbo_helper.rb

@@ -24,7 +24,7 @@ module StimulusPlumbers
       private
 
       def calendar_month_turbo_renderer
-        Components::Calendar::Month::Turbo::Renderer.new(self)
+        Components::Calendar::Month::Turbo.new(self)
       end
     end
   end

data/lib/stimulus_plumbers/helpers/card_helper.rb

@@ -4,7 +4,7 @@ module StimulusPlumbers
   module Helpers
     module CardHelper
       def sp_card(title: nil, **html_options, &block)
-        card_renderer.card(title: title, **html_options, &block)
+        card_renderer.render(title: title, **html_options, &block)
       end
 
       def sp_card_section(title: nil, **html_options, &block)
@@ -14,7 +14,7 @@ module StimulusPlumbers
       private
 
       def card_renderer
-        Components::Card::Renderer.new(self)
+        Components::Card.new(self)
       end
     end
   end

data/lib/stimulus_plumbers/helpers/combobox_helper.rb

@@ -9,7 +9,7 @@ module StimulusPlumbers
           popover: { content: Components::Combobox::Date.new(self).render(value: value) }
         )
         opts = opts.deep_merge(trigger: { aria_label: label }) if label
-        Components::Combobox::Renderer.new(self).render(
+        Components::Combobox.new(self).render(
           base_id: sp_dom_id,
           options: opts,
           data:    { input_format_type_value: "date" },
@@ -23,7 +23,7 @@ module StimulusPlumbers
           popover: { content: Components::Combobox::Dropdown.new(self).render(options: options, value: value, label: label) }
         )
         opts = opts.deep_merge(trigger: { aria_label: label }) if label
-        Components::Combobox::Renderer.new(self).render(
+        Components::Combobox.new(self).render(
           base_id: sp_dom_id,
           options: opts,
           **html_options
@@ -45,12 +45,12 @@ module StimulusPlumbers
           }
         )
         opts = opts.deep_merge(trigger: { aria_label: label }) if label
-        Components::Combobox::Renderer.new(self).render(
+        Components::Combobox.new(self).render(
           base_id: id,
           options: opts,
           data:    {
             input_combobox_combobox_dropdown_outlet: "##{popover_id}",
-            action:                                  "input->input-combobox#filter"
+            action:                                  "input->input-combobox#onInput"
           },
           **html_options
         )
@@ -62,7 +62,7 @@ module StimulusPlumbers
           popover: { content: Components::Combobox::Time.new(self).render(format: format, step: step, value: value) }
         )
         opts = opts.deep_merge(trigger: { aria_label: label }) if label
-        Components::Combobox::Renderer.new(self).render(
+        Components::Combobox.new(self).render(
           base_id: sp_dom_id,
           options: opts,
           data:    { input_format_type_value: "time", input_format_options_value: { format: format }.to_json },

data/lib/stimulus_plumbers/helpers/popover_helper.rb

@@ -4,13 +4,13 @@ module StimulusPlumbers
   module Helpers
     module PopoverHelper
       def sp_popover(interactive: true, **html_options, &block)
-        popover_renderer.popover(interactive: interactive, **html_options, &block)
+        popover_renderer.render(interactive: interactive, **html_options, &block)
       end
 
       private
 
       def popover_renderer
-        Components::Popover::Renderer.new(self)
+        Components::Popover.new(self)
       end
     end
   end