hotwire_combobox 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9649cc031cc63f665e78c4f72857f72698d42af893d8204cab739a5817be27b8
-  data.tar.gz: f9e791cc61927caebd9db3c32cf3e71382f6d77e4f54c8275348b02600fce8d4
+  metadata.gz: 375e5d8a06acd3bfb37fda548dcbaf55c097dafddf6511d33292ee424c267e92
+  data.tar.gz: 334608cf151572af945be3f9cf17598ccbf9b1808580c1cb57e2ea8e24fba246
 SHA512:
-  metadata.gz: 5f6c132e19554295758e13763663a6e0d3b0e7a0a413088a25aed723370dd5967133af3e2660e9ef4ecb16d661f39232bb36ac9c08c37531b36677f2a8c0d961
-  data.tar.gz: 6461c5650345338c17dd33dd378575d5376e2b31ed9466aa4b527096ae831db8feac8b73f357dc8da7908dd7e41aeed1a6750bd9bc1cd570c6e5634562aca0f9
+  metadata.gz: 3a39403f378b1be54d167ed15e4006e96751c19ab71c3c7f60414c3b13598f861fb2cbc7611995775f804a1caadcc0849fc89f68dc4761777a015acf57e1ad19
+  data.tar.gz: 1618b436e6c19922b32ce986f6f5103676e206eb9d04c868cfa5bfd6b9a84dd62dd65c164dd2072ab355e62d951e91610dfb9043fe72e14432ec2e9c6fcb45b4

data/app/assets/javascripts/controllers/hw_combobox_controller.js

@@ -61,7 +61,6 @@ export default class HwComboboxController extends Concerns(...concerns) {
   initialize() {
     this._initializeActors()
     this._initializeFiltering()
-    this._initializeMultiselect()
   }
 
   connect() {
@@ -70,6 +69,7 @@ export default class HwComboboxController extends Concerns(...concerns) {
 
   idempotentConnect() {
     this._connectSelection()
+    this._connectMultiselect()
     this._connectListAutocomplete()
     this._connectDialog()
   }

data/app/assets/javascripts/hotwire_combobox.esm.js

@@ -1,5 +1,5 @@
 /*!
-HotwireCombobox 0.2.1
+HotwireCombobox 0.2.3
 */
 import { Controller } from '@hotwired/stimulus';
 
@@ -776,7 +776,7 @@ Combobox.Multiselect = Base => class extends Base {
     }
   }
 
-  _initializeMultiselect() {
+  _connectMultiselect() {
     if (!this._isMultiPreselected) {
       this._preselectMultiple();
       this._markMultiPreselected();
@@ -1702,7 +1702,6 @@ class HwComboboxController extends Concerns(...concerns) {
   initialize() {
     this._initializeActors();
     this._initializeFiltering();
-    this._initializeMultiselect();
   }
 
   connect() {
@@ -1711,6 +1710,7 @@ class HwComboboxController extends Concerns(...concerns) {
 
   idempotentConnect() {
     this._connectSelection();
+    this._connectMultiselect();
     this._connectListAutocomplete();
     this._connectDialog();
   }

data/app/assets/javascripts/hotwire_combobox.umd.js

@@ -1,5 +1,5 @@
 /*!
-HotwireCombobox 0.2.1
+HotwireCombobox 0.2.3
 */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('@hotwired/stimulus')) :
@@ -780,7 +780,7 @@ HotwireCombobox 0.2.1
       }
     }
 
-    _initializeMultiselect() {
+    _connectMultiselect() {
       if (!this._isMultiPreselected) {
         this._preselectMultiple();
         this._markMultiPreselected();
@@ -1706,7 +1706,6 @@ HotwireCombobox 0.2.1
     initialize() {
       this._initializeActors();
       this._initializeFiltering();
-      this._initializeMultiselect();
     }
 
     connect() {
@@ -1715,6 +1714,7 @@ HotwireCombobox 0.2.1
 
     idempotentConnect() {
       this._connectSelection();
+      this._connectMultiselect();
       this._connectListAutocomplete();
       this._connectDialog();
     }

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

@@ -55,7 +55,7 @@ Combobox.Multiselect = Base => class extends Base {
     }
   }
 
-  _initializeMultiselect() {
+  _connectMultiselect() {
     if (!this._isMultiPreselected) {
       this._preselectMultiple()
       this._markMultiPreselected()

data/app/presenters/hotwire_combobox/component.rb

@@ -80,15 +80,7 @@ class HotwireCombobox::Component
 
   def announcer_attrs
     {
-      style: "
-        position: absolute;
-        width: 1px;
-        height: 1px;
-        margin: -1px;
-        padding: 0;
-        overflow: hidden;
-        clip: rect(0, 0, 0, 0);
-        border: 0;".squish,
+      class: "hw-combobox__announcer",
       aria: announcer_aria,
       data: announcer_data
     }
@@ -256,7 +248,7 @@ class HotwireCombobox::Component
     end
 
     def association_exists?
-      form_object&.class&.reflect_on_association(association_name).present?
+      association_name && form_object&.respond_to?(association_name)
     end
 
     def form_object
@@ -308,7 +300,7 @@ class HotwireCombobox::Component
     def hidden_field_value
       return value if value
 
-      if form_object&.defined_enums&.try :[], name
+      if form_object&.try(:defined_enums)&.try(:[], name)
         form_object.public_send "#{name}_before_type_cast"
       else
         form_object&.try(name).then do |value|

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

@@ -4,6 +4,19 @@
   <%= render "hotwire_combobox/combobox/hidden_field", component: component %>
 
   <%= tag.div **component.main_wrapper_attrs do %>
+    <%# Announcer styles defined here because they're not optional %>
+    <%= tag.style nonce: content_security_policy_nonce do %>
+      .hw-combobox__announcer {
+        position: absolute;
+        width: 1px;
+        height: 1px;
+        margin: -1px;
+        padding: 0;
+        overflow: hidden;
+        clip: rect(0, 0, 0, 0);
+        border: 0;
+      }
+    <% end %>
     <%= tag.div **component.announcer_attrs %>
     <%= render "hotwire_combobox/combobox/input", component: component %>
     <%= render "hotwire_combobox/combobox/paginated_listbox", component: component %>

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

@@ -1,6 +1,6 @@
-<%# locals: (for_id:, next_page:, src:) -%>
+<%# locals: (for_id:, src:) -%>
 
 <%= 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, for_id) %>
+  <%= render "hotwire_combobox/pagination", for_id: for_id, src: src %>
 <% end %>

data/lib/hotwire_combobox/helper.rb

@@ -37,7 +37,7 @@ module HotwireCombobox
     def hw_paginated_combobox_options(
           options,
           for_id: params[:for_id],
-          src: request.path,
+          src: request.fullpath,
           next_page: nil,
           render_in: {},
           include_blank: {},
@@ -45,7 +45,7 @@ module HotwireCombobox
       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
+      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
@@ -146,23 +146,13 @@ module HotwireCombobox
         "#{id}__hw_combobox_pagination"
       end
 
-      def hw_combobox_next_page_uri(uri, next_page, for_id)
-        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_combobox_page_stream_action
         params[:page].to_i > 0 ? :append : :update
       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)
+          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
         end.to_s
       rescue URI::InvalidURIError
@@ -178,6 +168,16 @@ module HotwireCombobox
       end
 
     private
+      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
+      end
+
       def hw_extract_options_and_src(options_or_src, render_in, include_blank)
         if options_or_src.is_a? String
           [ hw_combobox_options([]), options_or_src ]

data/lib/hotwire_combobox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotwire_combobox
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Jose Farias
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-31 00:00:00.000000000 Z
+date: 2024-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: An accessible autocomplete for Ruby on Rails apps using Hotwire.
 email:
 - jose@farias.mx
@@ -130,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.18
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Accessible Autocomplete for Rails apps