By default, focus first suggestion for creatables

pull/3322/head
Adam Rutkowski 3 years ago
parent 17d317775a
commit 54e2fb02eb

@ -1,12 +1,12 @@
// Courtesy of Benjamin von Polheim:
// https://blog.devgenius.io/build-a-performat-autocomplete-using-phoenix-liveview-and-alpine-js-8bcbbed17ba7
let suggestionsDropdown = function(id) {
let suggestionsDropdown = function(id, opts) {
return {
isOpen: false,
id: id,
open() { this.isOpen = true },
close() { this.isOpen = false },
focus: 0,
focus: opts.focus ?? 0,
setFocus(f) {
this.focus = f;
},

@ -1,7 +1,7 @@
defmodule PlausibleWeb.SiteController do
use PlausibleWeb, :controller
use Plausible.Repo
alias Plausible.{Sites, Goals}
alias Plausible.Sites
plug PlausibleWeb.RequireAccountPlug

@ -72,7 +72,7 @@ defmodule PlausibleWeb.Live.Components.ComboBox do
<div
id={"input-picker-main-#{@id}"}
class={@class}
x-data={"window.suggestionsDropdown('#{@id}')"}
x-data={"window.suggestionsDropdown('#{@id}', {focus: #{initial_dropdown_focus(@creatable, @suggestions)}})"}
x-on:keydown.arrow-up.prevent="focusPrev"
x-on:keydown.arrow-down.prevent="focusNext"
x-on:keydown.enter.prevent="select"
@ -361,4 +361,8 @@ defmodule PlausibleWeb.Live.Components.ComboBox do
fun.(input, options)
end
end
defp initial_dropdown_focus(creatable?, suggestions) do
if creatable? and Enum.count(suggestions) > 0, do: 1, else: 0
end
end

@ -57,11 +57,24 @@ defmodule PlausibleWeb.Live.Components.ComboBoxTest do
assert text_of_attr(li2, "x-bind:class") =~ "focus === 2"
end
test "Alpine.js: component refers to window.suggestionsDropdown" do
test "Alpine.js: component refers to window.suggestionsDropdown including initial focus value" do
assert new_options(2)
|> render_sample_component()
|> find("div#input-picker-main-test-component")
|> text_of_attr("x-data") =~ "window.suggestionsDropdown('test-component')"
|> text_of_attr("x-data") =~
"window.suggestionsDropdown('test-component', {focus: 0})"
assert new_options(2)
|> render_sample_component(creatable: true)
|> find("div#input-picker-main-test-component")
|> text_of_attr("x-data") =~
"window.suggestionsDropdown('test-component', {focus: 1})"
assert []
|> render_sample_component(creatable: true)
|> find("div#input-picker-main-test-component")
|> text_of_attr("x-data") =~
"window.suggestionsDropdown('test-component', {focus: 0})"
end
test "Alpine.js: component sets up keyboard navigation" do

Loading…
Cancel
Save