diff --git a/assets/js/liveview/suggestions_dropdown.js b/assets/js/liveview/suggestions_dropdown.js index 99026f195..f89cf7b8d 100644 --- a/assets/js/liveview/suggestions_dropdown.js +++ b/assets/js/liveview/suggestions_dropdown.js @@ -1,18 +1,50 @@ // Courtesy of Benjamin von Polheim: // https://blog.devgenius.io/build-a-performat-autocomplete-using-phoenix-liveview-and-alpine-js-8bcbbed17ba7 -let suggestionsDropdown = function(id, opts) { +let suggestionsDropdown = function(id) { return { isOpen: false, id: id, - open() { this.isOpen = true }, - close() { this.isOpen = false }, - focus: opts.focus ?? 0, + focus: null, setFocus(f) { this.focus = f; }, + initFocus() { + if (this.focus === null) { + this.setFocus(this.leastFocusableIndex()) + } + }, + open() { + this.initFocus() + this.isOpen = true + }, + suggestionsCount() { + return this.$refs.suggestions?.querySelectorAll('li').length + }, + hasCreatableOption() { + return this.$refs.suggestions?.querySelector('li').classList.contains("creatable") + }, + leastFocusableIndex() { + if (this.suggestionsCount() === 0) { + return 0 + } + return this.hasCreatableOption() ? 0 : 1 + }, + maxFocusableIndex() { + return this.hasCreatableOption() ? this.suggestionsCount() - 1 : this.suggestionsCount() + }, + nextFocusableIndex() { + const currentFocus = this.focus + return currentFocus + 1 > this.maxFocusableIndex() ? this.leastFocusableIndex() : currentFocus + 1 + }, + prevFocusableIndex() { + const currentFocus = this.focus + return currentFocus - 1 >= this.leastFocusableIndex() ? currentFocus - 1 : this.maxFocusableIndex() + }, + close() { this.isOpen = false }, select() { this.$refs[`dropdown-${this.id}-option-${this.focus}`]?.click() - this.focusPrev() + this.close() + document.getElementById(this.id).blur() }, scrollTo(idx) { this.$refs[`dropdown-${this.id}-option-${idx}`]?.scrollIntoView( @@ -20,23 +52,21 @@ let suggestionsDropdown = function(id, opts) { ) }, focusNext() { - const nextIndex = this.focus + 1 - const total = this.$refs.suggestions?.childElementCount ?? 0 + const nextIndex = this.nextFocusableIndex() if (!this.isOpen) this.open() - if (nextIndex < total) { - this.setFocus(nextIndex) - this.scrollTo(nextIndex); - } + this.setFocus(nextIndex) + this.scrollTo(nextIndex) }, focusPrev() { - const nextIndex = this.focus - 1 - if (this.isOpen && nextIndex >= 0) { - this.setFocus(nextIndex) - this.scrollTo(nextIndex) - } - }, + const prevIndex = this.prevFocusableIndex() + + if (!this.isOpen) this.open() + + this.setFocus(prevIndex) + this.scrollTo(prevIndex) + } } } diff --git a/lib/plausible_web/live/components/combo_box.ex b/lib/plausible_web/live/components/combo_box.ex index 186008050..17c2757c2 100644 --- a/lib/plausible_web/live/components/combo_box.ex +++ b/lib/plausible_web/live/components/combo_box.ex @@ -80,7 +80,7 @@ defmodule PlausibleWeb.Live.Components.ComboBox do