hotwire_combobox 0.1.36 → 0.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 446cd3c4beeb66029cab7cd6b92ac04c2a8c7a1f08ffd874728da2a3e605ead7
-  data.tar.gz: 9783eb83824ebeff3fa55536002c24e129fc66ed0b9d82e33c808a8d65c6c3ee
+  metadata.gz: 85fbe2e5c1b8d503be62eceae58650266582ac3428be6558c0af8bb76ec5f03c
+  data.tar.gz: f13eb27444b1e530391a8058dc6f00a6d46d9df4af75eb2de2cd28a568851f0b
 SHA512:
-  metadata.gz: a4d5e3d5fddd0017fc6bb6e838a60550d0e7dc2da3fac8999befa092ad9a8a7d35753cc785271fdfb8fe43e63edc535dc97f441594c8be2a3eece394622b97d6
-  data.tar.gz: 1d60ba35f6f043b9698d7b9bd48aadd702e67c00cb626068e797890ebcc3cfd370af14c33479da153f57096c1015c062f7539676da55aac559d76b38234a4d24
+  metadata.gz: 207509d422415ad6684e08b09690b2244f6fde41e3a9f92a6e90ddf7808f1d0a43d1966f48847c52e133e48e8d81d8139dd2883053dd7b44ed5739d7ab2d62fc
+  data.tar.gz: 184048c9ec147b4d28abf8a3c0d189fa6b73e72a9ef47c6db4c9cf3a595b880287d4e0ddc985d785a38fbce1b9a58279825c46099f800492368ae2cafe349a30

data/app/assets/javascripts/hw_combobox/models/combobox/actors.js

@@ -6,6 +6,10 @@ Combobox.Actors = Base => class extends Base {
     this._actingCombobox = this.comboboxTarget
   }
 
+  _forAllComboboxes(callback) {
+    this._allComboboxes.forEach(callback)
+  }
+
   get _actingListbox() {
     return this.actingListbox
   }
@@ -21,4 +25,8 @@ Combobox.Actors = Base => class extends Base {
   set _actingCombobox(combobox) {
     this.actingCombobox = combobox
   }
+
+  get _allComboboxes() {
+    return [ this.comboboxTarget, this.dialogComboboxTarget ]
+  }
 }

data/app/assets/javascripts/hw_combobox/models/combobox/selection.js

@@ -41,12 +41,14 @@ Combobox.Selection = Base => class extends Base {
     }
 
     option.setAttribute("aria-selected", selected)
+    this._setActiveDescendant(selected ? option.id : "")
   }
 
   _deselect() {
     const option = this._selectedOptionElement
     if (option) this._commitSelection(option, { selected: false })
     this.hiddenFieldTarget.value = null
+    this._setActiveDescendant("")
   }
 
   _selectNew() {
@@ -77,6 +79,10 @@ Combobox.Selection = Base => class extends Base {
     }
   }
 
+  _setActiveDescendant(id) {
+    this._forAllComboboxes(el => el.setAttribute("aria-activedescendant", id))
+  }
+
   get _hasValueButNoSelection() {
     return this.hiddenFieldTarget.value && !this._selectedOptionElement
   }

data/app/presenters/hotwire_combobox/component.rb

@@ -53,8 +53,9 @@ class HotwireCombobox::Component
       class: "hw-combobox__input",
       type: input_type,
       data: input_data,
-      aria: input_aria
-    }.merge combobox_attrs.except(*nested_attrs)
+      aria: input_aria,
+      autocomplete: :off
+    }.with_indifferent_access.merge combobox_attrs.except(*nested_attrs)
   end
 
 
@@ -77,11 +78,6 @@ class HotwireCombobox::Component
   end
 
 
-  def listbox_options_attrs
-    { id: listbox_options_id }
-  end
-
-
   def dialog_wrapper_attrs
     {
       class: "hw-combobox__dialog__wrapper"
@@ -239,7 +235,8 @@ class HotwireCombobox::Component
         controls: listbox_id,
         owns: listbox_id,
         haspopup: "listbox",
-        autocomplete: autocomplete
+        autocomplete: autocomplete,
+        activedescendant: ""
     end
 
 
@@ -260,11 +257,6 @@ class HotwireCombobox::Component
     end
 
 
-    def listbox_options_id
-      "#{listbox_id}__options"
-    end
-
-
     def dialog_data
       {
         action: "keydown->hw-combobox#navigate",
@@ -290,7 +282,8 @@ class HotwireCombobox::Component
       {
         controls: dialog_listbox_id,
         owns: dialog_listbox_id,
-        autocomplete: autocomplete
+        autocomplete: autocomplete,
+        activedescendant: ""
       }
     end
 

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

@@ -1,3 +1,5 @@
+require "securerandom"
+
 class HotwireCombobox::Listbox::Option
   def initialize(option)
     @option = option.is_a?(Hash) ? Data.new(**option) : option
@@ -30,7 +32,7 @@ class HotwireCombobox::Listbox::Option
     end
 
     def id
-      option.try(:id)
+      option.try(:id) || SecureRandom.uuid
     end
 
     def data

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

@@ -1,5 +1,6 @@
 <%# locals: (for_id:, next_page:, src:) -%>
 
-<%= turbo_stream.replace hw_pagination_frame_id(for_id) do %>
+<%= turbo_stream.remove hw_pagination_frame_wrapper_id(for_id) %>
+<%= turbo_stream.append hw_listbox_id(for_id) do %>
   <%= render "hotwire_combobox/pagination", for_id: for_id, src: hw_combobox_next_page_uri(src, next_page) %>
 <% end %>

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

@@ -1,6 +1,6 @@
 <%# locals: (for_id:, options:) -%>
 
-<%= turbo_stream.public_send(hw_combobox_page_stream_action, hw_listbox_options_id(for_id)) do %>
+<%= turbo_stream.public_send(hw_combobox_page_stream_action, hw_listbox_id(for_id)) do %>
   <% options.each do |option| %>
     <%= render option %>
   <% end %>

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

@@ -1,4 +1,7 @@
 <%# locals: (for_id:, src:) -%>
 
-<%= turbo_frame_tag hw_pagination_frame_id(for_id), src: src, loading: :lazy,
-      data: { hw_combobox_target: "endOfOptionsStream", input_type: params[:input_type] } %>
+<%= tag.li id: hw_pagination_frame_wrapper_id(for_id), data: {
+      hw_combobox_target: "endOfOptionsStream", input_type: params[:input_type] },
+      aria: { hidden: true } do %>
+  <%= turbo_frame_tag hw_pagination_frame_id(for_id), src: src, loading: :lazy %>
+<% end %>

data/app/views/hotwire_combobox/combobox/_paginated_listbox.html.erb

@@ -1,8 +1,6 @@
 <%= tag.ul **component.listbox_attrs do |ul| %>
-  <%= tag.div **component.listbox_options_attrs do %>
-    <% component.options.each do |option| %>
-      <%= render option %>
-    <% end %>
+  <% component.options.each do |option| %>
+    <%= render option %>
   <% end %>
 
   <% if component.paginated? %>

data/lib/hotwire_combobox/helper.rb

@@ -45,8 +45,12 @@ module HotwireCombobox
     hw_alias :hw_async_combobox_options
 
     protected # library use only
-      def hw_listbox_options_id(id)
-        "#{id}-hw-listbox__options"
+      def hw_listbox_id(id)
+        "#{id}-hw-listbox"
+      end
+
+      def hw_pagination_frame_wrapper_id(id)
+        "#{id}__hw_combobox_pagination__wrapper"
       end
 
       def hw_pagination_frame_id(id)

data/lib/hotwire_combobox/version.rb

@@ -1,3 +1,3 @@
 module HotwireCombobox
-  VERSION = "0.1.36"
+  VERSION = "0.1.37"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotwire_combobox
 version: !ruby/object:Gem::Version
-  version: 0.1.36
+  version: 0.1.37
 platform: ruby
 authors:
 - Jose Farias
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-02 00:00:00.000000000 Z
+date: 2024-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails