hotwire_combobox 0.3.1 → 0.4.0

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

@@ -23,32 +23,16 @@ class HotwireCombobox::Listbox::Option
     attr_reader :option
 
     def options
-      {
-        id: id,
-        role: :option,
+      { id: id, role: :option, tabindex: "-1",
         class: [ "hw-combobox__option", { "hw-combobox__option--blank": blank? } ],
-        data: data,
-        aria: aria
-      }
+        data: { action: "click->hw-combobox#selectOnClick", filterable_as: filterable_as, autocompletable_as: autocompletable_as, value: value },
+        aria: { selected: false } }
     end
 
     def id
       @id ||= option.try(:id) || SecureRandom.uuid
     end
 
-    def data
-      {
-        action: "click->hw-combobox#selectOnClick",
-        filterable_as: filterable_as,
-        autocompletable_as: autocompletable_as,
-        value: value
-      }
-    end
-
-    def aria
-      { selected: false }
-    end
-
     def filterable_as
       option.try(:filterable_as) || option.try(:display)
     end

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

@@ -1,11 +1,13 @@
+<% hidden_field_attrs = component.hidden_field_attrs %>
+
 <%= tag.fieldset **component.fieldset_attrs do %>
   <%= tag.label component.label, **component.label_attrs %>
 
-  <%= render "hotwire_combobox/combobox/hidden_field", component: component %>
+  <%= hidden_field_tag hidden_field_attrs.delete(:name), hidden_field_attrs.delete(:value), **hidden_field_attrs %>
 
   <%= tag.div **component.main_wrapper_attrs do %>
-    <%# Essential styles defined here, removing these would break the combobox %>
     <%= tag.style nonce: content_security_policy_nonce do %>
+      <%# Essential styles defined here, removing these would break the combobox %>
       .hw-combobox__announcer {
         position: absolute;
         width: 1px;
@@ -18,12 +20,32 @@
       }
 
       .hw_combobox__pagination__wrapper {
-        height: 5px;
+        height: 1px;
       }
     <% end %>
+
     <%= 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 %>
+    <%= tag.input **component.input_attrs %>
+    <%= tag.span **component.handle_attrs %>
+
+    <%= tag.ul **component.listbox_attrs do |ul| %>
+      <% component.options.each do |option| %>
+        <%= render option %>
+      <% end %>
+
+      <% if component.paginated? %>
+        <%= render "hotwire_combobox/pagination", **component.pagination_attrs %>
+      <% end %>
+    <% end %>
+
+    <%= tag.div **component.dialog_focus_trap_attrs %>
+
+    <%= tag.div **component.dialog_wrapper_attrs do %>
+      <%= tag.dialog **component.dialog_attrs do %>
+        <%= tag.label component.dialog_label, **component.dialog_label_attrs %>
+        <%= tag.input **component.dialog_input_attrs %>
+        <%= tag.ul **component.dialog_listbox_attrs %>
+      <% end %>
+    <% end %>
   <% end %>
 <% end %>

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

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

data/config/hw_importmap.rb

@@ -1 +1 @@
-pin_all_from File.expand_path("../app/assets/javascripts", __dir__)
+pin "controllers/hw_combobox_controller", to: "hotwire_combobox.esm.js"

data/lib/hotwire_combobox/helper.rb

@@ -16,88 +16,47 @@ module HotwireCombobox
 
     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
-      component = HotwireCombobox::Component.new self, name, options: options, async_src: src, **kwargs
+      component = HotwireCombobox::Component.new self, name, options: options, async_src: src, request: request, **kwargs
       render component, &block
     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)
+    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
 
-    def hw_paginated_combobox_options(
-          options,
-          for_id: params[:for_id],
-          src: hw_fullpath_for_pagination,
-          next_page: nil,
-          render_in: {},
-          include_blank: {},
-          **custom_methods)
-      include_blank = params[:page].to_i > 0 ? nil : include_blank
+    def hw_paginated_combobox_options(options, for_id: params[:for_id], src: hw_fullpath_for_pagination, next_page: nil, render_in: {}, include_blank: {}, **custom_methods)
+      include_blank = hw_first_page? ? include_blank : nil
       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: hw_combobox_next_page_uri(src, next_page, for_id)
 
       safe_join [ this_page, next_page ]
     end
+    # setup up backward compatibility with old `#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
+    def hw_combobox_selection_chip(display:, value:, for_id: params[:for_id], remover_attrs: nil)
+      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])
+    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
+        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)
+      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])
+    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
+        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
 
@@ -147,13 +106,17 @@ module HotwireCombobox
       end
 
       def hw_combobox_page_stream_action
-        params[:page].to_i > 0 ? :append : :update
+        hw_first_page? ? :update : :append
+      end
+
+      def hw_first_page?
+        params[:page].to_i.zero?
       end
 
       def hw_uri_with_params(url_or_path, **params)
         URI.parse(url_or_path).tap do |url_or_path|
-          query = URI.decode_www_form(url_or_path.query || "").to_h.merge(params.compact_blank.stringify_keys)
-          url_or_path.query = URI.encode_www_form query
+          query = Rack::Utils.parse_nested_query(url_or_path.query || "").merge(params.compact_blank.stringify_keys)
+          url_or_path.query = Rack::Utils.build_nested_query query
         end.to_s
       rescue URI::InvalidURIError
         url_or_path
@@ -174,13 +137,9 @@ module HotwireCombobox
       end
 
       def hw_combobox_next_page_uri(uri, next_page, for_id)
-        return unless next_page
-
-        hw_uri_with_params uri,
-          page: next_page,
-          q: params[:q],
-          for_id: for_id,
-          format: :turbo_stream
+        if next_page
+          hw_uri_with_params uri, page: next_page, q: params[:q], for_id: for_id, format: :turbo_stream
+        end
       end
 
       def hw_extract_options_and_src(options_or_src, render_in, include_blank)

data/lib/hotwire_combobox/platform.rb

@@ -0,0 +1,15 @@
+require "platform_agent"
+
+class HotwireCombobox::Platform < PlatformAgent
+  def ios?
+    mobile_webkit? && !android?
+  end
+
+  def android?
+    match?(/Android/)
+  end
+
+  def mobile_webkit?
+    match?(/AppleWebKit/) && match?(/Mobile/)
+  end
+end

data/lib/hotwire_combobox/version.rb

@@ -1,3 +1,3 @@
 module HotwireCombobox
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/hotwire_combobox.rb

@@ -1,5 +1,6 @@
 require "hotwire_combobox/version"
 require "hotwire_combobox/engine"
+require "hotwire_combobox/platform"
 
 module HotwireCombobox
   mattr_accessor :bypass_convenience_methods

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: hotwire_combobox
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Jose Farias
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-31 00:00:00.000000000 Z
+date: 2025-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +51,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: platform_agent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +92,6 @@ files:
 - app/assets/config/hw_combobox_manifest.js
 - app/assets/javascripts/controllers/hw_combobox_controller.js
 - app/assets/javascripts/hotwire_combobox.esm.js
-- app/assets/javascripts/hotwire_combobox.umd.js
 - app/assets/javascripts/hw_combobox/helpers.js
 - app/assets/javascripts/hw_combobox/models/combobox.js
 - app/assets/javascripts/hw_combobox/models/combobox/actors.js
@@ -87,6 +99,7 @@ files:
 - 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/callbacks.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
@@ -102,7 +115,22 @@ files:
 - app/assets/javascripts/hw_combobox/vendor/requestjs.js
 - app/assets/stylesheets/hotwire_combobox.css
 - app/presenters/hotwire_combobox/component.rb
+- app/presenters/hotwire_combobox/component/announced.rb
+- app/presenters/hotwire_combobox/component/associations.rb
+- app/presenters/hotwire_combobox/component/async.rb
 - app/presenters/hotwire_combobox/component/customizable.rb
+- app/presenters/hotwire_combobox/component/freetext.rb
+- app/presenters/hotwire_combobox/component/markup/dialog.rb
+- app/presenters/hotwire_combobox/component/markup/fieldset.rb
+- app/presenters/hotwire_combobox/component/markup/form.rb
+- app/presenters/hotwire_combobox/component/markup/handle.rb
+- app/presenters/hotwire_combobox/component/markup/hidden_field.rb
+- app/presenters/hotwire_combobox/component/markup/input.rb
+- app/presenters/hotwire_combobox/component/markup/label.rb
+- app/presenters/hotwire_combobox/component/markup/listbox.rb
+- app/presenters/hotwire_combobox/component/markup/wrapper.rb
+- app/presenters/hotwire_combobox/component/multiselect.rb
+- app/presenters/hotwire_combobox/component/paginated.rb
 - app/presenters/hotwire_combobox/listbox/group.rb
 - app/presenters/hotwire_combobox/listbox/item.rb
 - app/presenters/hotwire_combobox/listbox/item/collection.rb
@@ -112,15 +140,12 @@ files:
 - 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
 - lib/hotwire_combobox/helper.rb
+- lib/hotwire_combobox/platform.rb
 - lib/hotwire_combobox/version.rb
 homepage: https://hotwirecombobox.com/
 licenses:
@@ -129,7 +154,6 @@ metadata:
   homepage_uri: https://hotwirecombobox.com/
   source_code_uri: https://github.com/josefarias/hotwire_combobox
   changelog_uri: https://github.com/josefarias/hotwire_combobox/releases
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -144,8 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Accessible Autocomplete for Rails apps
 test_files: []