hotwire_combobox 0.1.43 → 0.2.1

data/app/presenters/hotwire_combobox/listbox/item.rb

@@ -0,0 +1,111 @@
+class HotwireCombobox::Listbox::Item
+  class << self
+    def collection_for(view, options, render_in:, include_blank:, **custom_methods)
+      new(view, options, render_in: render_in, include_blank: include_blank, **custom_methods).collection
+    end
+  end
+
+  def initialize(view, options, render_in:, include_blank:, **custom_methods)
+    @view = view
+    @options = options
+    @render_in = render_in
+    @include_blank = include_blank
+    @custom_methods = custom_methods
+  end
+
+  def collection
+    items = groups_or_options
+    items.unshift(blank_option) if include_blank.present?
+    Collection.new items
+  end
+
+  private
+    attr_reader :view, :options, :render_in, :include_blank, :custom_methods
+
+    def groups_or_options
+      if grouped?
+        create_listbox_group options
+      else
+        create_listbox_options options
+      end
+    end
+
+    def grouped?
+      _key, value = options.to_a.first
+      value.is_a? Array
+    end
+
+    def create_listbox_group(options)
+      options.map do |group_name, group_options|
+        HotwireCombobox::Listbox::Group.new group_name,
+          options: create_listbox_options(group_options)
+      end
+    end
+
+    def create_listbox_options(options)
+      if options.first.is_a? HotwireCombobox::Listbox::Option
+        options
+      else
+        options.map do |option|
+          HotwireCombobox::Listbox::Option.new **option_attrs(option)
+        end
+      end
+    end
+
+    def option_attrs(option)
+      case option
+      when Hash
+        option.tap do |attrs|
+          attrs[:content] = render_content(object: attrs[:display], attrs: attrs) if render_in.present?
+        end
+      when String
+        {}.tap do |attrs|
+          attrs[:display] = option
+          attrs[:value] = option
+          attrs[:content] = render_content(object: attrs[:display], attrs: attrs) if render_in.present?
+        end
+      when Array
+        {}.tap do |attrs|
+          attrs[:display] = option.first
+          attrs[:value] = option.last
+          attrs[:content] = render_content(object: attrs[:display], attrs: attrs) if render_in.present?
+        end
+      else
+        {}.tap do |attrs|
+          attrs[:id] = view.hw_call_method_or_proc(option, custom_methods[:id]) if custom_methods[:id]
+          attrs[:display] = view.hw_call_method_or_proc(option, custom_methods[:display]) if custom_methods[:display]
+          attrs[:value] = view.hw_call_method_or_proc(option, custom_methods[:value] || :id)
+
+          if render_in.present?
+            attrs[:content] = render_content(object: option, attrs: attrs)
+          elsif custom_methods[:content]
+            attrs[:content] = view.hw_call_method_or_proc(option, custom_methods[:content])
+          end
+        end
+      end
+    end
+
+    def render_content(render_opts: render_in, object:, attrs:)
+      view.render **render_opts.reverse_merge(
+        object: object,
+        locals: { combobox_display: attrs[:display], combobox_value: attrs[:value] })
+    end
+
+    def blank_option
+      display, content = extract_blank_display_and_content
+      HotwireCombobox::Listbox::Option.new display: display, content: content, value: "", blank: true
+    end
+
+    def extract_blank_display_and_content
+      case include_blank
+      when Hash
+        text = include_blank.delete(:text)
+
+        [ text, render_content(render_opts: include_blank, object: text, attrs: { display: text, value: "" }) ]
+      when String
+        [ include_blank, include_blank ]
+      else
+        [ "", "&nbsp;".html_safe ]
+      end
+    end
+end

data/app/presenters/hotwire_combobox/listbox/option.rb

@@ -27,7 +27,8 @@ class HotwireCombobox::Listbox::Option
         id: id,
         role: :option,
         class: [ "hw-combobox__option", { "hw-combobox__option--blank": blank? } ],
-        data: data
+        data: data,
+        aria: aria
       }
     end
 
@@ -37,21 +38,25 @@ class HotwireCombobox::Listbox::Option
 
     def data
       {
-        action: "click->hw-combobox#selectOptionOnClick",
+        action: "click->hw-combobox#selectOnClick",
         filterable_as: filterable_as,
         autocompletable_as: autocompletable_as,
         value: value
       }
     end
 
-    def content
-      option.try(:content) || option.try(:display)
+    def aria
+      { selected: false }
     end
 
     def filterable_as
       option.try(:filterable_as) || option.try(:display)
     end
 
+    def content
+      option.try(:content) || option.try(:display)
+    end
+
     def blank?
       option.try(:blank).present?
     end

data/app/views/hotwire_combobox/_component.html.erb

@@ -4,6 +4,7 @@
   <%= render "hotwire_combobox/combobox/hidden_field", component: component %>
 
   <%= tag.div **component.main_wrapper_attrs do %>
+    <%= tag.div **component.announcer_attrs %>
     <%= render "hotwire_combobox/combobox/input", component: component %>
     <%= render "hotwire_combobox/combobox/paginated_listbox", component: component %>
     <%= render "hotwire_combobox/combobox/dialog", component: component %>

data/app/views/hotwire_combobox/_selection_chip.turbo_stream.erb

@@ -0,0 +1,8 @@
+<%# locals: (display:, value:, for_id:, remover_attrs:) -%>
+
+<%= within_combobox_selection_chip(for_id: for_id) do %>
+  <%= tag.div class: "hw-combobox__chip" do %>
+    <%= tag.span display %>
+    <%= tag.span **remover_attrs %>
+  <% end %>
+<% end %>

data/app/views/hotwire_combobox/layouts/_selection_chip.turbo_stream.erb

@@ -0,0 +1,7 @@
+<%# locals: (for_id:) -%>
+
+<%= turbo_stream.before for_id do %>
+  <%= tag.div data: { hw_combobox_chip: "" } do %>
+    <%= yield %>
+  <% end %>
+<% end %>

data/lib/hotwire_combobox/helper.rb

@@ -13,38 +13,125 @@ module HotwireCombobox
     def hw_combobox_style_tag(*args, **kwargs)
       stylesheet_link_tag HotwireCombobox.stylesheet_path, *args, **kwargs
     end
-    hw_alias :hw_combobox_style_tag
 
     def hw_combobox_tag(name, options_or_src = [], render_in: {}, include_blank: nil, **kwargs, &block)
-      options, src = hw_extract_options_and_src(options_or_src, render_in, include_blank)
+      options, src = hw_extract_options_and_src options_or_src, render_in, include_blank
       component = HotwireCombobox::Component.new self, name, options: options, async_src: src, **kwargs
       render component, &block
     end
-    hw_alias :hw_combobox_tag
 
-    def hw_combobox_options(options, render_in: {}, include_blank: nil, display: :to_combobox_display, **methods)
-      if options.first.is_a? HotwireCombobox::Listbox::Option
-        options
-      else
-        opts = hw_parse_combobox_options options, render_in_proc: hw_render_in_proc(render_in), **methods.merge(display: display)
-        opts.unshift(hw_blank_option(include_blank)) if include_blank.present?
-        opts
-      end
+    def hw_combobox_options(
+          options,
+          render_in: {},
+          include_blank: nil,
+          display: :to_combobox_display,
+          **custom_methods)
+      HotwireCombobox::Listbox::Item.collection_for \
+        self,
+        options,
+        render_in: render_in,
+        include_blank: include_blank,
+        **custom_methods.merge(display: display)
     end
-    hw_alias :hw_combobox_options
 
-    def hw_paginated_combobox_options(options, for_id: params[:for_id], src: request.path, next_page: nil, render_in: {}, include_blank: {}, **methods)
-      include_blank = params[:page] ? nil : include_blank
-      options = hw_combobox_options options, render_in: render_in, include_blank: include_blank, **methods
+    def hw_paginated_combobox_options(
+          options,
+          for_id: params[:for_id],
+          src: request.path,
+          next_page: nil,
+          render_in: {},
+          include_blank: {},
+          **custom_methods)
+      include_blank = params[:page].to_i > 0 ? nil : include_blank
+      options = hw_combobox_options options, render_in: render_in, include_blank: include_blank, **custom_methods
       this_page = render "hotwire_combobox/paginated_options", for_id: for_id, options: options
       next_page = render "hotwire_combobox/next_page", for_id: for_id, src: src, next_page: next_page
 
       safe_join [ this_page, next_page ]
     end
-    hw_alias :hw_paginated_combobox_options
-
     alias_method :hw_async_combobox_options, :hw_paginated_combobox_options
+
+    def hw_within_combobox_selection_chip(for_id: params[:for_id], &block)
+      render layout: "hotwire_combobox/layouts/selection_chip", locals: { for_id: for_id }, &block
+    end
+
+    def hw_combobox_selection_chip(
+          display:,
+          value:,
+          for_id: params[:for_id],
+          remover_attrs: hw_combobox_chip_remover_attrs(display: display, value: value))
+      render "hotwire_combobox/selection_chip",
+        display: display,
+        value: value,
+        for_id: for_id,
+        remover_attrs: remover_attrs
+    end
+
+    def hw_combobox_selection_chips_for(
+          objects,
+          display: :to_combobox_display,
+          value: :id,
+          for_id: params[:for_id])
+      objects.map do |object|
+        hw_combobox_selection_chip \
+          display: hw_call_method(object, display),
+          value: hw_call_method(object, value),
+          for_id: for_id
+      end.then { |chips| safe_join chips }
+    end
+
+    def hw_dismissing_combobox_selection_chip(display:, value:, for_id: params[:for_id])
+      hw_combobox_selection_chip \
+        display: display,
+        value: value,
+        for_id: for_id,
+        remover_attrs: hw_combobox_dismissing_chip_remover_attrs(display, value)
+    end
+
+    def hw_dismissing_combobox_selection_chips_for(
+          objects,
+          display: :to_combobox_display,
+          value: :id,
+          for_id: params[:for_id])
+      objects.map do |object|
+        hw_dismissing_combobox_selection_chip \
+          display: hw_call_method(object, display),
+          value: hw_call_method(object, value),
+          for_id: for_id
+      end.then { |chips| safe_join chips }
+    end
+
+    def hw_combobox_chip_remover_attrs(display:, value:, **kwargs)
+      {
+        tabindex: "0",
+        class: token_list("hw-combobox__chip__remover", kwargs[:class]),
+        aria: { label: "Remove #{display}" },
+        data: {
+          action: "click->hw-combobox#removeChip:stop keydown->hw-combobox#navigateChip",
+          hw_combobox_target: "chipDismisser",
+          hw_combobox_value_param: value
+        }
+      }
+    end
+
+    def hw_combobox_dismissing_chip_remover_attrs(display, value)
+      hw_combobox_chip_remover_attrs(display: display, value: value).tap do |attrs|
+        attrs[:data][:hw_combobox_target] = token_list(attrs[:data][:hw_combobox_target], "closer")
+      end
+    end
+
+    hw_alias :hw_combobox_style_tag
+    hw_alias :hw_combobox_tag
+    hw_alias :hw_combobox_options
+    hw_alias :hw_paginated_combobox_options
     hw_alias :hw_async_combobox_options
+    hw_alias :hw_within_combobox_selection_chip
+    hw_alias :hw_combobox_selection_chip
+    hw_alias :hw_combobox_selection_chips_for
+    hw_alias :hw_dismissing_combobox_selection_chip
+    hw_alias :hw_dismissing_combobox_selection_chips_for
+    hw_alias :hw_combobox_chip_remover_attrs
+    hw_alias :hw_combobox_dismissing_chip_remover_attrs
 
     # private library use only
       def hw_listbox_id(id)
@@ -70,23 +157,7 @@ module HotwireCombobox
       end
 
       def hw_combobox_page_stream_action
-        params[:page] ? :append : :update
-      end
-
-      def hw_blank_option(include_blank)
-        display, content = hw_extract_blank_display_and_content include_blank
-
-        HotwireCombobox::Listbox::Option.new display: display, content: content, value: "", blank: true
-      end
-
-      def hw_extract_blank_display_and_content(include_blank)
-        if include_blank.is_a? Hash
-          text = include_blank.delete(:text)
-
-          [ text, hw_call_render_in_proc(hw_render_in_proc(include_blank), text, display: text, value: "") ]
-        else
-          [ include_blank, include_blank ]
-        end
+        params[:page].to_i > 0 ? :append : :update
       end
 
       def hw_uri_with_params(url_or_path, **params)
@@ -98,73 +169,23 @@ module HotwireCombobox
         url_or_path
       end
 
-    private
-      def hw_render_in_proc(render_in)
-        if render_in.present?
-          ->(object, locals) { render(**render_in.reverse_merge(object: object, locals: locals)) }
+      def hw_call_method_or_proc(object, method_or_proc)
+        if method_or_proc.is_a? Proc
+          method_or_proc.call object
+        else
+          hw_call_method object, method_or_proc
         end
       end
 
+    private
       def hw_extract_options_and_src(options_or_src, render_in, include_blank)
         if options_or_src.is_a? String
-          [ [], options_or_src ]
+          [ hw_combobox_options([]), options_or_src ]
         else
           [ hw_combobox_options(options_or_src, render_in: render_in, include_blank: include_blank), nil ]
         end
       end
 
-      def hw_parse_combobox_options(options, render_in_proc: nil, **methods)
-        options.map do |option|
-          HotwireCombobox::Listbox::Option.new \
-            **hw_option_attrs_for(option, render_in_proc: render_in_proc, **methods)
-        end
-      end
-
-      def hw_option_attrs_for(option, render_in_proc: nil, **methods)
-        case option
-        when Hash
-          option.tap do |attrs|
-            attrs[:content] = hw_call_render_in_proc(render_in_proc, attrs[:display], attrs) if render_in_proc
-          end
-        when String
-          {}.tap do |attrs|
-            attrs[:display] = option
-            attrs[:value] = option
-            attrs[:content] = hw_call_render_in_proc(render_in_proc, attrs[:display], attrs) if render_in_proc
-          end
-        when Array
-          {}.tap do |attrs|
-            attrs[:display] = option.first
-            attrs[:value] = option.last
-            attrs[:content] = hw_call_render_in_proc(render_in_proc, attrs[:display], attrs) if render_in_proc
-          end
-        else
-          {}.tap do |attrs|
-            attrs[:id] = hw_call_method_or_proc(option, methods[:id]) if methods[:id]
-            attrs[:display] = hw_call_method_or_proc(option, methods[:display]) if methods[:display]
-            attrs[:value] = hw_call_method_or_proc(option, methods[:value] || :id)
-
-            if render_in_proc
-              attrs[:content] = hw_call_render_in_proc(render_in_proc, option, attrs)
-            elsif methods[:content]
-              attrs[:content] = hw_call_method_or_proc(option, methods[:content])
-            end
-          end
-        end
-      end
-
-      def hw_call_render_in_proc(render_in_proc, object, attrs)
-        render_in_proc.(object, combobox_display: attrs[:display], combobox_value: attrs[:value])
-      end
-
-      def hw_call_method_or_proc(object, method_or_proc)
-        if method_or_proc.is_a? Proc
-          method_or_proc.call object
-        else
-          hw_call_method object, method_or_proc
-        end
-      end
-
       def hw_call_method(object, method)
         if object.respond_to? method
           object.public_send method

data/lib/hotwire_combobox/version.rb

@@ -1,3 +1,3 @@
 module HotwireCombobox
-  VERSION = "0.1.43"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotwire_combobox
 version: !ruby/object:Gem::Version
-  version: 0.1.43
+  version: 0.2.1
 platform: ruby
 authors:
 - Jose Farias
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-15 00:00:00.000000000 Z
+date: 2024-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -69,12 +69,15 @@ files:
 - app/assets/javascripts/hw_combobox/helpers.js
 - app/assets/javascripts/hw_combobox/models/combobox.js
 - app/assets/javascripts/hw_combobox/models/combobox/actors.js
+- app/assets/javascripts/hw_combobox/models/combobox/announcements.js
 - app/assets/javascripts/hw_combobox/models/combobox/async_loading.js
 - app/assets/javascripts/hw_combobox/models/combobox/autocomplete.js
 - app/assets/javascripts/hw_combobox/models/combobox/base.js
 - app/assets/javascripts/hw_combobox/models/combobox/dialog.js
 - app/assets/javascripts/hw_combobox/models/combobox/events.js
 - app/assets/javascripts/hw_combobox/models/combobox/filtering.js
+- app/assets/javascripts/hw_combobox/models/combobox/form_field.js
+- app/assets/javascripts/hw_combobox/models/combobox/multiselect.js
 - app/assets/javascripts/hw_combobox/models/combobox/navigation.js
 - app/assets/javascripts/hw_combobox/models/combobox/new_options.js
 - app/assets/javascripts/hw_combobox/models/combobox/options.js
@@ -86,15 +89,20 @@ files:
 - app/assets/stylesheets/hotwire_combobox.css
 - app/presenters/hotwire_combobox/component.rb
 - app/presenters/hotwire_combobox/component/customizable.rb
+- app/presenters/hotwire_combobox/listbox/group.rb
+- app/presenters/hotwire_combobox/listbox/item.rb
+- app/presenters/hotwire_combobox/listbox/item/collection.rb
 - app/presenters/hotwire_combobox/listbox/option.rb
 - app/views/hotwire_combobox/_component.html.erb
 - app/views/hotwire_combobox/_next_page.turbo_stream.erb
 - app/views/hotwire_combobox/_paginated_options.turbo_stream.erb
 - app/views/hotwire_combobox/_pagination.html.erb
+- app/views/hotwire_combobox/_selection_chip.turbo_stream.erb
 - app/views/hotwire_combobox/combobox/_dialog.html.erb
 - app/views/hotwire_combobox/combobox/_hidden_field.html.erb
 - app/views/hotwire_combobox/combobox/_input.html.erb
 - app/views/hotwire_combobox/combobox/_paginated_listbox.html.erb
+- app/views/hotwire_combobox/layouts/_selection_chip.turbo_stream.erb
 - config/hw_importmap.rb
 - lib/hotwire_combobox.rb
 - lib/hotwire_combobox/engine.rb
@@ -122,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.4.18
 signing_key:
 specification_version: 4
 summary: Accessible Autocomplete for Rails apps