hotwire_combobox 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f21dd202e0a59116a7d505c6b79df8ba287db06dfa66fd6c9159cbaad15f119d
-  data.tar.gz: 9eb4d23df658d14948200e88ee39f9dad471a61782cde5f4132767a6c81763e1
+  metadata.gz: f1edf53e6f495466fb562c9e5a5fa6f4484fcb3f5729d561dc3e59ab622daad5
+  data.tar.gz: ade7a12ec97430ec9fb824525725706d0f4628f67a12019b5392c2f2b5ce46a2
 SHA512:
-  metadata.gz: 4013316a7bcbaf7080f25987c32f0f2dc4b2a38f11e8cfb62292155d626ab2bbc7d46f5116125b351eacabeb40856e50fb03335f69c95c7e09a919a0a0ed26ca
-  data.tar.gz: 6ca62cf9479f2d6951823affeb07320e572ff02dbb34681cf3ef33dabb579103410f7ad6123ee02cd21252c2cdcbb0e06c2efb564913c52b289beaae57e1fb36
+  metadata.gz: 4b8a4ed1d34fa641f546fc59838e052feaa9bd1f89a339b31ef218a5f61354cefb5cc4ced5c5b02d29a1416d125054a7a93087bc8a94b54855cba2fe0f4cb4da
+  data.tar.gz: 771ddf2a2f621331bc0199dcb114ef9362fdb090459a80dc1e56589d5c2221dd5eec45516a84acdc279fd349f86494fd800838c5203c6412bfa40f11e36a4724

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

@@ -30,7 +30,8 @@ export default class HwComboboxController extends Concerns(...concerns) {
     "dialogListbox",
     "handle",
     "hiddenField",
-    "listbox"
+    "listbox",
+    "paginationFrame"
   ]
 
   static values = {
@@ -41,6 +42,7 @@ export default class HwComboboxController extends Concerns(...concerns) {
     filterableAttribute: String,
     nameWhenNew: String,
     originalName: String,
+    prefilledDisplay: String,
     smallViewportMaxWidth: String
   }
 
@@ -66,4 +68,8 @@ export default class HwComboboxController extends Concerns(...concerns) {
       this._collapse()
     }
   }
+
+  paginationFrameTargetConnected() {
+    this._preselectOption()
+  }
 }

data/app/assets/javascripts/models/combobox/dialog.js

@@ -14,7 +14,7 @@ Combobox.Dialog = Base => class extends Base {
   }
 
   _moveArtifactsToDialog() {
-    this.dialogComboboxTarget.value = this.actingCombobox.value
+    this.dialogComboboxTarget.value = this._actingCombobox.value
 
     this._actingCombobox = this.dialogComboboxTarget
     this._actingListbox = this.dialogListboxTarget
@@ -23,7 +23,7 @@ Combobox.Dialog = Base => class extends Base {
   }
 
   _moveArtifactsInline() {
-    this.comboboxTarget.value = this.actingCombobox.value
+    this.comboboxTarget.value = this._actingCombobox.value
 
     this._actingCombobox = this.comboboxTarget
     this._actingListbox = this.listboxTarget
@@ -32,9 +32,11 @@ Combobox.Dialog = Base => class extends Base {
   }
 
   _resizeDialog = () => {
-    const fullHeight = window.innerHeight
-    const viewportHeight = window.visualViewport.height
-    this.dialogTarget.style.setProperty("--hw-dialog-bottom-padding", `${fullHeight - viewportHeight}px`)
+    if (window.visualViewport) {
+      const fullHeight = window.innerHeight
+      const viewportHeight = window.visualViewport.height
+      this.dialogTarget.style.setProperty("--hw-dialog-bottom-padding", `${fullHeight - viewportHeight}px`)
+    }
   }
 
   // After closing a dialog, focus returns to the last focused element.

data/app/assets/javascripts/models/combobox/options.js

@@ -10,9 +10,9 @@ Combobox.Options = Base => class extends Base {
   _isValidNewOption(query, { ignoreAutocomplete = false } = {}) {
     const typedValue = this._actingCombobox.value
     const autocompletedValue = this._visibleOptionElements[0]?.getAttribute(this.autocompletableAttributeValue)
-    const insufficentAutocomplete = !autocompletedValue || !startsWith(autocompletedValue, typedValue)
+    const insufficientAutocomplete = !autocompletedValue || !startsWith(autocompletedValue, typedValue)
 
-    return query.length > 0 && this._allowNew && (ignoreAutocomplete || insufficentAutocomplete)
+    return query.length > 0 && this._allowNew && (ignoreAutocomplete || insufficientAutocomplete)
   }
 
   get _allowNew() {

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

@@ -8,8 +8,8 @@ Combobox.Selection = Base => class extends Base {
   }
 
   _connectSelection() {
-    if (this.hiddenFieldTarget.value) {
-      this._selectOptionByValue(this.hiddenFieldTarget.value)
+    if (this.hasPrefilledDisplayValue) {
+      this._actingCombobox.value = this.prefilledDisplayValue
     }
   }
 
@@ -17,8 +17,6 @@ Combobox.Selection = Base => class extends Base {
     this._resetOptions()
 
     if (option) {
-      if (this.hasSelectedClass) option.classList.add(this.selectedClass)
-
       this._markValid()
       this._maybeAutocompleteWith(option, { force })
       this._commitSelection(option, { selected: true })
@@ -28,21 +26,27 @@ Combobox.Selection = Base => class extends Base {
   }
 
   _commitSelection(option, { selected }) {
-    option?.setAttribute("aria-selected", selected)
-    option?.scrollIntoView({ block: "nearest" })
+    this._markSelected(option, { selected })
 
     if (selected) {
-      this.hiddenFieldTarget.value = option?.dataset.value
+      this.hiddenFieldTarget.value = option.dataset.value
+      option.scrollIntoView({ block: "nearest" })
     } else {
       this.hiddenFieldTarget.value = null
     }
   }
 
+  _markSelected(option, { selected }) {
+    if (this.hasSelectedClass) {
+      option.classList.toggle(this.selectedClass, selected)
+    }
+
+    option.setAttribute("aria-selected", selected)
+  }
+
   _deselect() {
     const option = this._selectedOptionElement
-
-    if (this.hasSelectedClass) option?.classList.remove(this.selectedClass)
-    this._commitSelection(option, { selected: false })
+    if (option) this._commitSelection(option, { selected: false })
   }
 
   _selectNew(query) {
@@ -56,7 +60,17 @@ Combobox.Selection = Base => class extends Base {
     this._select(option, { force: true })
   }
 
-  _selectOptionByValue(value) {
-    this._allOptions.find(option => option.dataset.value === value)?.click()
+  _preselectOption() {
+    if (this._hasValueButNoSelection && this._allOptions.length < 100) {
+      const option = this._allOptions.find(option => {
+        return option.dataset.value === this.hiddenFieldTarget.value
+      })
+
+      if (option) this._markSelected(option, { selected: true })
+    }
+  }
+
+  get _hasValueButNoSelection() {
+    return this.hiddenFieldTarget.value && !this._selectedOptionElement
   }
 }

data/app/assets/javascripts/models/combobox/toggle.js

@@ -21,8 +21,11 @@ Combobox.Toggle = Base => class extends Base {
     }
   }
 
-  closeOnClickOutside({ target }) {
+  closeOnClickOutside(event) {
+    const target = event.target
+
     if (this.element.contains(target) && !this._isDialogDismisser(target)) return
+    if (this._withinElementBounds(event)) return
 
     this.close()
   }
@@ -35,6 +38,17 @@ Combobox.Toggle = Base => class extends Base {
     this.close()
   }
 
+  // Some browser extensions like 1Password overlay elements on top of the combobox.
+  // Hovering over these elements emits a click event for some reason.
+  // These events don't contain any telling information, so we use `_withinElementBounds`
+  // as an alternative to check whether the click is legitimate.
+  _withinElementBounds(event) {
+    const { left, right, top, bottom } = this.element.getBoundingClientRect()
+    const { clientX, clientY } = event
+
+    return clientX >= left && clientX <= right && clientY >= top && clientY <= bottom
+  }
+
   _ensureSelection() {
     if (!this._isValidNewOption(this._actingCombobox.value, { ignoreAutocomplete: true })) {
       this._select(this._selectedOptionElement, { force: true })
@@ -49,7 +63,9 @@ Combobox.Toggle = Base => class extends Base {
     return target.closest("dialog") && target.role != "combobox"
   }
 
-  async _expand() {
+  _expand() {
+    if (this._preselectOnExpansion) this._preselectOption()
+
     if (this._autocompletesList && this._smallViewport) {
       this._openInDialog()
     } else {
@@ -101,4 +117,8 @@ Combobox.Toggle = Base => class extends Base {
   get _isOpen() {
     return this.expandedValue
   }
+
+  get _preselectOnExpansion() {
+    return !this._isAsync // async comboboxes preselect based on callbacks
+  }
 }

data/app/helpers/hotwire_combobox/helper.rb

@@ -3,26 +3,27 @@ module HotwireCombobox
     class << self
       delegate :bypass_convenience_methods?, to: :HotwireCombobox
 
-      def hw(method_name)
+      def hw_alias(method_name)
         unless bypass_convenience_methods?
           alias_method method_name.to_s.sub(/^hw_/, ""), method_name
         end
       end
     end
 
-    hw def hw_combobox_style_tag(*args, **kwargs)
+    def hw_combobox_style_tag(*args, **kwargs)
       stylesheet_link_tag HotwireCombobox.stylesheet_path, *args, **kwargs
     end
+    hw_alias :hw_combobox_style_tag
 
-    hw def hw_combobox_tag(*args, async_src: nil, options: [], render_in: {}, **kwargs)
-      options = hw_combobox_options options, render_in: render_in
-      src = hw_uri_with_params async_src, format: :turbo_stream
-      component = HotwireCombobox::Component.new self, *args, options: options, async_src: src, **kwargs
+    def hw_combobox_tag(name, options_or_src = [], render_in: {}, **kwargs)
+      options, src = hw_extract_options_and_src(options_or_src, render_in)
+      component = HotwireCombobox::Component.new self, name, options: options, async_src: src, **kwargs
 
       render "hotwire_combobox/combobox", component: component
     end
+    hw_alias :hw_combobox_tag
 
-    hw def hw_combobox_options(options, render_in: {}, display: :to_combobox_display, **methods)
+    def hw_combobox_options(options, render_in: {}, display: :to_combobox_display, **methods)
       if options.first.is_a? HotwireCombobox::Listbox::Option
         options
       else
@@ -35,19 +36,34 @@ module HotwireCombobox
         hw_parse_combobox_options options, **methods.merge(display: display, content: content)
       end
     end
+    hw_alias :hw_combobox_options
 
-    hw def hw_paginated_combobox_options(options, for_id:, src:, next_page:, render_in: {}, **methods)
+    def hw_paginated_combobox_options(options, for_id:, src: request.path, next_page: nil, render_in: {}, **methods)
       this_page = render("hotwire_combobox/paginated_options", for_id: for_id, options: hw_combobox_options(options, render_in: render_in, **methods), format: :turbo_stream)
-      next_page = render("hotwire_combobox/next_page", src: src, next_page: next_page, format: :turbo_stream)
+      next_page = render("hotwire_combobox/next_page", for_id: for_id, src: src, next_page: next_page, format: :turbo_stream)
 
       safe_join [ this_page, next_page ]
     end
+    hw_alias :hw_paginated_combobox_options
 
-    hw def hw_listbox_options_id(id)
-      "#{id}-hw-listbox__options"
-    end
+    protected # library use only
+      def hw_listbox_options_id(id)
+        "#{id}-hw-listbox__options"
+      end
+
+      def hw_pagination_frame_id(id)
+        "#{id}__hw_combobox_pagination"
+      end
 
     private
+      def hw_extract_options_and_src(options_or_src, render_in)
+        if options_or_src.is_a? String
+          [ [], hw_uri_with_params(options_or_src, format: :turbo_stream) ]
+        else
+          [ hw_combobox_options(options_or_src, render_in: render_in), nil ]
+        end
+      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)

data/app/presenters/hotwire_combobox/component.rb

@@ -1,23 +1,29 @@
 class HotwireCombobox::Component
   attr_reader :async_src, :options, :dialog_label
 
-  def initialize(
-      view, name, value = nil,
-      autocomplete: :both,
-      id: nil,
-      form: nil,
-      name_when_new: nil,
-      open: false,
-      small_width: "640px",
-      async_src: nil,
-      dialog_label: nil,
-      options: [], data: {}, input: {}, **rest)
-    @combobox_attrs = input.reverse_merge(rest).with_indifferent_access
-
+  def initialize \
+      view, name,
+      association_name: nil,
+      async_src:        nil,
+      autocomplete:     :both,
+      data:             {},
+      dialog_label:     nil,
+      form:             nil,
+      id:               nil,
+      input:            {},
+      name_when_new:    nil,
+      open:             false,
+      options:          [],
+      small_width:      "640px",
+      value:            nil,
+      **rest
     @view, @autocomplete, @id, @name, @value, @form, @async_src,
     @name_when_new, @open, @data, @small_width, @options, @dialog_label =
       view, autocomplete, id, name, value, form, async_src,
       name_when_new, open, data, small_width, options, dialog_label
+
+    @combobox_attrs = input.reverse_merge(rest).with_indifferent_access
+    @association_name = association_name || infer_association_name
   end
 
   def fieldset_attrs
@@ -125,15 +131,23 @@ class HotwireCombobox::Component
   end
 
   def pagination_attrs
-    { src: async_src }
+    { for_id: hidden_field_id, src: async_src }
   end
 
   private
     attr_reader :view, :autocomplete, :id, :name, :value, :form,
-      :name_when_new, :open, :data, :combobox_attrs, :small_width
+      :name_when_new, :open, :data, :combobox_attrs, :small_width,
+      :association_name
+
+    def infer_association_name
+      if name.to_s.include?("_id")
+        name.to_s.sub(/_id\z/, "")
+      end
+    end
 
     def fieldset_data
       data.reverse_merge \
+        pagination_id: hidden_field_id,
         controller: view.token_list("hw-combobox", data[:controller]),
         hw_combobox_expanded_value: open,
         hw_combobox_name_when_new_value: name_when_new,
@@ -141,11 +155,30 @@ class HotwireCombobox::Component
         hw_combobox_autocomplete_value: autocomplete,
         hw_combobox_small_viewport_max_width_value: small_width,
         hw_combobox_async_src_value: async_src,
+        hw_combobox_prefilled_display_value: prefilled_display,
         hw_combobox_filterable_attribute_value: "data-filterable-as",
         hw_combobox_autocompletable_attribute_value: "data-autocompletable-as",
         hw_combobox_selected_class: "hw-combobox__option--selected"
     end
 
+    def prefilled_display
+      if async_src && associated_object
+        associated_object.to_combobox_display
+      elsif value
+        options.find { |option| option.value == value }&.content
+      end
+    end
+
+    def associated_object
+      @associated_object ||= if association_exists?
+        form.object.public_send association_name
+      end
+    end
+
+    def association_exists?
+      form&.object&.class&.reflect_on_association(association_name).present?
+    end
+
 
     def hidden_field_id
       id || form&.field_id(name)
@@ -180,7 +213,8 @@ class HotwireCombobox::Component
           keydown->hw-combobox#navigate
           click@window->hw-combobox#closeOnClickOutside
           focusin@window->hw-combobox#closeOnFocusOutside".squish,
-        hw_combobox_target: "combobox"
+        hw_combobox_target: "combobox",
+        pagination_id: hidden_field_id
     end
 
     def input_aria

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

@@ -3,8 +3,16 @@ class HotwireCombobox::Listbox::Option
     @option = option.is_a?(Hash) ? Data.new(**option) : option
   end
 
-  def render_in(view_context)
-    view_context.tag.li content, **options
+  def render_in(view)
+    view.tag.li content, **options
+  end
+
+  def value
+    option.try(:value) || option.id
+  end
+
+  def content
+    option.try(:content) || option.try(:display)
   end
 
   private
@@ -12,16 +20,11 @@ class HotwireCombobox::Listbox::Option
 
     attr_reader :option
 
-    def content
-      option.try(:content) || option.try(:display)
-    end
-
     def options
       {
         id: id,
         role: :option,
         class: "hw-combobox__option",
-        tabindex: 0,
         data: data
       }
     end
@@ -46,8 +49,4 @@ class HotwireCombobox::Listbox::Option
     def autocompletable_as
       option.try(:autocompletable_as) || option.try(:display)
     end
-
-    def value
-      option.try(:value) || option.id
-    end
 end

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

@@ -1,5 +1,5 @@
-<%# locals: (next_page:, src:) -%>
+<%# locals: (for_id:, next_page:, src:) -%>
 
-<%= turbo_stream.replace :hotwire_combobox_pagination do %>
-  <%= render "hotwire_combobox/pagination", src: hw_combobox_next_page_uri(src, next_page) %>
+<%= turbo_stream.replace hw_pagination_frame_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/_pagination.html.erb

@@ -1,3 +1,4 @@
-<%# locals: (src:) -%>
+<%# locals: (for_id:, src:) -%>
 
-<%= turbo_frame_tag :hotwire_combobox_pagination, src: src, loading: :lazy %>
+<%= turbo_frame_tag hw_pagination_frame_id(for_id), src: src, loading: :lazy,
+      data: { hw_combobox_target: "paginationFrame" } %>

data/lib/hotwire_combobox/engine.rb

@@ -8,8 +8,8 @@ module HotwireCombobox
 
         unless HotwireCombobox.bypass_convenience_methods?
           module FormBuilderExtensions
-            def combobox(*args, **kwargs, &block)
-              @template.hw_combobox_tag *args, **kwargs.merge(form: self), &block
+            def combobox(*args, **kwargs)
+              @template.hw_combobox_tag *args, **kwargs.merge(form: self)
             end
           end
 

data/lib/hotwire_combobox/version.rb

@@ -1,3 +1,3 @@
 module HotwireCombobox
-  VERSION = "0.1.12"
+  VERSION = "0.1.14"
 end

metadata

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