stimulus_plumbers 0.3.1 → 0.3.3

data/lib/stimulus_plumbers/themes/icons/external.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require "rexml/document"
+require "stimulus_plumbers/themes/schema/icon"
+
+module StimulusPlumbers
+  module Themes
+    module Icons
+      module External
+        SVG_RENAME     = Schema::Icon::SVG_ATTR_NAMES.invert.freeze
+        ELEMENT_RENAME = Schema::Icon::ELEMENT_ATTR_NAMES.invert.freeze
+
+        def include?(key)
+          File.exist?(svg_path(key))
+        end
+
+        def fetch(key)
+          file = svg_path(key)
+          parse_svg(key, File.read(file)) if File.exist?(file)
+        end
+
+        private
+
+        def svg_defaults(_key)
+          {}
+        end
+
+        def parse_svg(key, content)
+          doc  = REXML::Document.new(content)
+          root = doc.root
+
+          result = svg_defaults(key)
+          root.attributes.each_attribute do |attr|
+            result[SVG_RENAME.fetch(attr.name, attr.name.to_sym)] = attr.value
+          end
+
+          elements = parse_elements(root)
+          return if elements.empty?
+
+          result[:elements] = elements
+          result
+        end
+
+        def parse_elements(node)
+          node.elements.flat_map do |el|
+            el.name == "g" ? parse_elements(el) : [parse_element(el)].compact
+          end
+        end
+
+        def parse_element(node)
+          attrs = { tag: node.name.to_sym }
+          node.attributes.each_attribute do |attr|
+            attrs[ELEMENT_RENAME.fetch(attr.name, attr.name.tr("-", "_").to_sym)] = attr.value
+          end
+          attrs if attrs.size > 1
+        end
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/themes/icons/registry.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require "delegate"
+
+module StimulusPlumbers
+  module Themes
+    module Icons
+      class Registry < SimpleDelegator
+        attr_reader :aliases
+
+        def initialize(sources:, aliases: {})
+          @sources = sources
+          @aliases = aliases
+          super(
+            Hash.new do |h, key|
+              resolved = aliases.fetch(key, key)
+              value = nil
+              sources.each { |s| break if (value = s.fetch(resolved)) }
+              h[key] = value if value
+              value
+            end
+          )
+        end
+
+        def key?(name)
+          __getobj__.key?(name) ||
+            aliases.key?(name) ||
+            @sources.any? { |s| s.include?(aliases.fetch(name, name)) }
+        end
+        alias_method :include?, :key?
+        alias_method :has_key?, :key?
+        alias_method :member?, :key?
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/themes/schema/icon.rb

@@ -4,27 +4,69 @@ module StimulusPlumbers
   module Themes
     module Schema
       module Icon
-        DEFAULTS = {
-          fill:            "none",
-          view_box:        "0 0 24 24",
-          width:           "24",
-          height:          "24",
-          stroke:          "currentColor",
-          stroke_width:    1.5,
-          stroke_linecap:  :round,
-          stroke_linejoin: :round
+        extend self
+
+        SVG_ATTR_DEFAULTS = {
+          xmlns:        "http://www.w3.org/2000/svg",
+          fill:         "none",
+          view_box:     "0 0 24 24",
+          width:        "24",
+          height:       "24",
+          stroke:       "currentColor",
+          stroke_width: 1.5
+        }.freeze
+
+        SVG_ATTR_NAMES = {
+          view_box:     "viewBox",
+          stroke_width: "stroke-width"
         }.freeze
 
-        ATTRS = ([:d] + DEFAULTS.keys).freeze
+        ELEMENT_ATTRS = {
+          path:     %i[d fill fill_rule clip_rule stroke_linecap stroke_linejoin opacity].freeze,
+          circle:   %i[cx cy r].freeze,
+          ellipse:  %i[cx cy rx ry].freeze,
+          rect:     %i[x y width height rx ry].freeze,
+          line:     %i[x1 y1 x2 y2].freeze,
+          polyline: %i[points].freeze,
+          polygon:  %i[points].freeze
+        }.freeze
+
+        ELEMENT_ATTR_NAMES = {
+          fill_rule:       "fill-rule",
+          clip_rule:       "clip-rule",
+          stroke_width:    "stroke-width",
+          stroke_linecap:  "stroke-linecap",
+          stroke_linejoin: "stroke-linejoin"
+        }.freeze
 
-        def self.resolve(icon_data)
+        def resolve(icon_data)
           return unless icon_data.is_a?(Hash)
 
-          merged = DEFAULTS.merge(icon_data.slice(*ATTRS)).transform_values(&:to_s)
-          return merged if merged[:d].present?
+          elements = Array(icon_data[:elements]).filter_map do |element|
+            next unless element.is_a?(Hash) && ELEMENT_ATTRS.key?(element[:tag])
+
+            { tag: element[:tag] }.merge(resolve_element_attrs(element))
+          end
+          return if elements.empty?
+
+          resolve_svg_attrs(icon_data).tap do |attrs|
+            attrs[:elements] = elements
+          end
+        end
+
+        private
+
+        def resolve_svg_attrs(svg_data)
+          SVG_ATTR_DEFAULTS
+            .merge(svg_data.slice(*SVG_ATTR_DEFAULTS.keys))
+            .transform_keys { |key| SVG_ATTR_NAMES.fetch(key, key.to_s) }
+            .transform_values(&:to_s)
+        end
 
-          StimulusPlumbers::Logger.warn("Icon missing required :d attribute")
-          nil
+        def resolve_element_attrs(element_data)
+          element_data.slice(*ELEMENT_ATTRS[element_data[:tag]])
+                      .transform_keys { |key| ELEMENT_ATTR_NAMES.fetch(key, key.to_s) }
+                      .transform_values(&:to_s)
         end
       end
     end

data/lib/stimulus_plumbers/themes/schema/ranges.rb

@@ -5,10 +5,10 @@ module StimulusPlumbers
     module Schema
       module Ranges
         BOOL           = [true, false].freeze
-        SIZE           = %i[sm md lg].freeze
+        SIZE           = %i[xs sm md lg xl].freeze
         FLEX_ALIGN     = %i[left center right top bottom].freeze
         FLEX_DIRECTION = %i[row col].freeze
-        BUTTON_VARIANT = %i[primary secondary outline destructive ghost link].freeze
+        BUTTON_VARIANT = %i[primary secondary outline destructive ghost link fab dashed].freeze
       end
     end
   end

data/lib/stimulus_plumbers/themes/schema.rb

@@ -9,44 +9,42 @@ module StimulusPlumbers
     module Schema
       ACTION_LIST = {
         action_list_item: {
-          active: { default: false, range: Ranges::BOOL }
+          active: { default: false, validate: Ranges::BOOL }
         }.freeze,
         action_list:      {}.freeze
       }.freeze
 
       AVATAR = {
         avatar: {
-          size:  { default: :md, range: Ranges::SIZE },
-          color: { default: nil, range: :avatar_color_range }
+          size:  { default: :md, validate: Ranges::SIZE },
+          color: { default: nil, validate: :avatar_color_range }
         }.freeze
       }.freeze
 
       BUTTON = {
         button:       {
-          variant: { default: :primary, range: Ranges::BUTTON_VARIANT },
-          size:    { default: :md,      range: Ranges::SIZE }
+          variant: { default: :primary, validate: Ranges::BUTTON_VARIANT },
+          size:    { default: :md,      validate: Ranges::SIZE }
         }.freeze,
         button_group: {
-          alignment: { default: :left, range: Ranges::FLEX_ALIGN },
-          direction: { default: :row,  range: Ranges::FLEX_DIRECTION }
-        }.freeze
+          alignment: { default: :left, validate: Ranges::FLEX_ALIGN },
+          direction: { default: :row,  validate: Ranges::FLEX_DIRECTION }
+        }.freeze,
+        button_icon:  {}.freeze
       }.freeze
 
       CALENDAR = {
-        calendar:                           {}.freeze,
-        calendar_days_of_week:              {}.freeze,
-        calendar_week:                      {}.freeze,
-        calendar_days_of_month:             {}.freeze,
-        calendar_day:                       {
-          today:    { default: false, range: Ranges::BOOL },
-          selected: { default: false, range: Ranges::BOOL },
-          outside:  { default: false, range: Ranges::BOOL }
+        calendar:                      {}.freeze,
+        calendar_days_of_week:         {}.freeze,
+        calendar_week:                 {}.freeze,
+        calendar_days_of_month:        {}.freeze,
+        calendar_day:                  {
+          today:    { default: false, validate: Ranges::BOOL },
+          selected: { default: false, validate: Ranges::BOOL },
+          outside:  { default: false, validate: Ranges::BOOL }
         }.freeze,
-        calendar_navigation:                {}.freeze,
-        calendar_navigation_navigator:      {}.freeze,
-        calendar_navigation_navigator_icon: {
-          name: { default: "arrow-left", range: :icon_range }
-        }.freeze
+        calendar_navigation:           {}.freeze,
+        calendar_navigation_navigator: {}.freeze
       }.freeze
 
       CARD = {
@@ -55,44 +53,44 @@ module StimulusPlumbers
       }.freeze
 
       COMBOBOX = {
-        combobox_trigger:              {}.freeze,
-        combobox_option:               {
-          selected: { default: false, range: Ranges::BOOL },
-          disabled: { default: false, range: Ranges::BOOL }
+        combobox_trigger:           {}.freeze,
+        combobox_trigger_group:     {}.freeze,
+        combobox_option:            {
+          selected: { default: false, validate: Ranges::BOOL },
+          disabled: { default: false, validate: Ranges::BOOL }
         }.freeze,
-        combobox_option_group:         {}.freeze,
-        combobox_listbox:              {}.freeze,
-        combobox_autocomplete_loading: {}.freeze,
-        combobox_autocomplete_empty:   {}.freeze,
-        combobox_time:                 {}.freeze
+        combobox_option_group:      {}.freeze,
+        combobox_listbox:           {}.freeze,
+        combobox_typeahead_loading: {}.freeze,
+        combobox_typeahead_empty:   {}.freeze,
+        combobox_time:              {}.freeze
       }.freeze
 
       FORM = {
-        form_group:         {
-          layout: { default: :stacked, range: Form::Ranges::LAYOUT },
-          error:  { default: false,    range: Ranges::BOOL }
+        form_group:           {
+          layout: { default: :stacked, validate: Form::Ranges::LAYOUT },
+          error:  { default: false,    validate: Ranges::BOOL }
         }.freeze,
-        form_label:         {
-          required: { default: false, range: Ranges::BOOL },
-          hidden:   { default: false, range: Ranges::BOOL }
+        form_label:           {
+          required: { default: false, validate: Ranges::BOOL },
+          hidden:   { default: false, validate: Ranges::BOOL }
         }.freeze,
-        form_required_mark: {}.freeze,
-        form_details:       {}.freeze,
-        form_error:         {}.freeze,
-        form_input:         { error: { default: false, range: Ranges::BOOL } }.freeze,
-        form_textarea:      { error: { default: false, range: Ranges::BOOL } }.freeze,
-        form_file:          { error: { default: false, range: Ranges::BOOL } }.freeze,
-        form_select:        { error: { default: false, range: Ranges::BOOL } }.freeze,
-        form_checkbox:      { error: { default: false, range: Ranges::BOOL } }.freeze,
-        form_radio:         { error: { default: false, range: Ranges::BOOL } }.freeze,
-        form_input_group:   { error: { default: false, range: Ranges::BOOL } }.freeze,
-        form_combobox:      { error: { default: false, range: Ranges::BOOL } }.freeze,
-        form_input_reveal:  { error: { default: false, range: Ranges::BOOL } }.freeze,
-        form_input_search:  {}.freeze,
-        form_button_reveal: {}.freeze,
-        form_button_clear:  {}.freeze,
-        form_submit:        {
-          variant: { default: :default, range: Form::Ranges::SUBMIT_VARIANT }
+        form_required_mark:   {}.freeze,
+        form_details:         {}.freeze,
+        form_error:           {}.freeze,
+        form_input:           { error: { default: false, validate: Ranges::BOOL } }.freeze,
+        form_textarea:        { error: { default: false, validate: Ranges::BOOL } }.freeze,
+        form_file:            { error: { default: false, validate: Ranges::BOOL } }.freeze,
+        form_select:          { error: { default: false, validate: Ranges::BOOL } }.freeze,
+        form_checkbox:        { error: { default: false, validate: Ranges::BOOL } }.freeze,
+        form_radio:           { error: { default: false, validate: Ranges::BOOL } }.freeze,
+        form_combobox:        { error: { default: false, validate: Ranges::BOOL } }.freeze,
+        form_input_reveal:    { error: { default: false, validate: Ranges::BOOL } }.freeze,
+        form_input_clearable: {}.freeze,
+        form_button_reveal:   {}.freeze,
+        form_button_clear:    {}.freeze,
+        form_submit:          {
+          variant: { default: :default, validate: Form::Ranges::SUBMIT_VARIANT }
         }.freeze
       }.freeze
 
@@ -100,9 +98,15 @@ module StimulusPlumbers
         icon: {}.freeze
       }.freeze
 
+      INPUT_GROUP = {
+        input_group: { error: { default: false, validate: Ranges::BOOL } }.freeze
+      }.freeze
+
       LAYOUT = {
-        divider: {}.freeze,
-        popover: {}.freeze
+        divider:           {}.freeze,
+        divider_separator: {}.freeze,
+        divider_label:     {}.freeze,
+        popover:           {}.freeze
       }.freeze
     end
   end

data/lib/stimulus_plumbers/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StimulusPlumbers
-  VERSION = "0.3.1"
+  VERSION = "0.3.3"
 end

data/lib/stimulus_plumbers.rb

@@ -27,6 +27,7 @@ require_relative "stimulus_plumbers/components/action_list"
 require_relative "stimulus_plumbers/components/action_list/section"
 require_relative "stimulus_plumbers/components/action_list/item"
 require_relative "stimulus_plumbers/components/divider"
+require_relative "stimulus_plumbers/components/input_group"
 require_relative "stimulus_plumbers/components/popover"
 require_relative "stimulus_plumbers/components/popover/builder"
 
@@ -49,7 +50,7 @@ require_relative "stimulus_plumbers/components/combobox/options/option"
 require_relative "stimulus_plumbers/components/combobox/options/option_group"
 require_relative "stimulus_plumbers/components/combobox/date"
 require_relative "stimulus_plumbers/components/combobox/dropdown"
-require_relative "stimulus_plumbers/components/combobox/autocomplete"
+require_relative "stimulus_plumbers/components/combobox/typeahead"
 require_relative "stimulus_plumbers/components/combobox/time"
 require_relative "stimulus_plumbers/components/combobox/time/drum"
 
@@ -58,7 +59,6 @@ require_relative "stimulus_plumbers/form/field"
 require_relative "stimulus_plumbers/form/fields/error"
 require_relative "stimulus_plumbers/form/fields/group"
 require_relative "stimulus_plumbers/form/fields/hint"
-require_relative "stimulus_plumbers/form/fields/input_group"
 require_relative "stimulus_plumbers/form/fields/label"
 require_relative "stimulus_plumbers/form/builder"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stimulus_plumbers
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Ryan Chang
@@ -57,7 +57,6 @@ files:
 - lib/stimulus_plumbers/components/card.rb
 - lib/stimulus_plumbers/components/card/section.rb
 - lib/stimulus_plumbers/components/combobox.rb
-- lib/stimulus_plumbers/components/combobox/autocomplete.rb
 - lib/stimulus_plumbers/components/combobox/date.rb
 - lib/stimulus_plumbers/components/combobox/dropdown.rb
 - lib/stimulus_plumbers/components/combobox/options.rb
@@ -67,10 +66,12 @@ files:
 - lib/stimulus_plumbers/components/combobox/time.rb
 - lib/stimulus_plumbers/components/combobox/time/drum.rb
 - lib/stimulus_plumbers/components/combobox/trigger.rb
+- lib/stimulus_plumbers/components/combobox/typeahead.rb
 - lib/stimulus_plumbers/components/date_picker/navigation.rb
 - lib/stimulus_plumbers/components/date_picker/navigator.rb
 - lib/stimulus_plumbers/components/divider.rb
 - lib/stimulus_plumbers/components/icon.rb
+- lib/stimulus_plumbers/components/input_group.rb
 - lib/stimulus_plumbers/components/popover.rb
 - lib/stimulus_plumbers/components/popover/builder.rb
 - lib/stimulus_plumbers/configuration.rb
@@ -81,7 +82,6 @@ files:
 - lib/stimulus_plumbers/form/fields/fieldset.rb
 - lib/stimulus_plumbers/form/fields/group.rb
 - lib/stimulus_plumbers/form/fields/hint.rb
-- lib/stimulus_plumbers/form/fields/input_group.rb
 - lib/stimulus_plumbers/form/fields/inputs/choice.rb
 - lib/stimulus_plumbers/form/fields/inputs/datetime.rb
 - lib/stimulus_plumbers/form/fields/inputs/file.rb
@@ -117,6 +117,8 @@ files:
 - lib/stimulus_plumbers/plumber/renderer.rb
 - lib/stimulus_plumbers/themes/base.rb
 - lib/stimulus_plumbers/themes/configuration.rb
+- lib/stimulus_plumbers/themes/icons/external.rb
+- lib/stimulus_plumbers/themes/icons/registry.rb
 - lib/stimulus_plumbers/themes/schema.rb
 - lib/stimulus_plumbers/themes/schema/form/ranges.rb
 - lib/stimulus_plumbers/themes/schema/icon.rb

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

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module StimulusPlumbers
-  module Form
-    module Fields
-      class InputGroup < Plumber::Base
-        def render(leading: nil, trailing: nil, error: false, **wrapper_opts, &block)
-          html_options = merge_html_options(
-            theme.resolve(:form_input_group, error: error),
-            wrapper_opts
-          )
-          template.content_tag(:div, **html_options) do
-            template.safe_join(
-              [
-                leading.respond_to?(:call) ? leading.call : leading,
-                template.capture(&block),
-                trailing.respond_to?(:call) ? trailing.call : trailing
-              ]
-            )
-          end
-        end
-      end
-    end
-  end
-end