diff --git a/assets/js/liveview/suggestions_dropdown.js b/assets/js/liveview/suggestions_dropdown.js index e18999235..99026f195 100644 --- a/assets/js/liveview/suggestions_dropdown.js +++ b/assets/js/liveview/suggestions_dropdown.js @@ -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; }, diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.ex index c9ec3eb6f..24c37ebbc 100644 --- a/lib/plausible_web/controllers/site_controller.ex +++ b/lib/plausible_web/controllers/site_controller.ex @@ -1,7 +1,7 @@ defmodule PlausibleWeb.SiteController do use PlausibleWeb, :controller use Plausible.Repo - alias Plausible.{Sites, Goals} + alias Plausible.Sites plug PlausibleWeb.RequireAccountPlug diff --git a/lib/plausible_web/live/components/combo_box.ex b/lib/plausible_web/live/components/combo_box.ex index e223d8a1b..e4efef515 100644 --- a/lib/plausible_web/live/components/combo_box.ex +++ b/lib/plausible_web/live/components/combo_box.ex @@ -72,7 +72,7 @@ defmodule PlausibleWeb.Live.Components.ComboBox do
0, do: 1, else: 0 + end end diff --git a/test/plausible_web/live/components/combo_box_test.exs b/test/plausible_web/live/components/combo_box_test.exs index 7280b91b1..54b2fb32e 100644 --- a/test/plausible_web/live/components/combo_box_test.exs +++ b/test/plausible_web/live/components/combo_box_test.exs @@ -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