From 1317560ed50798d5cc4c05fed0c11ece2ad1e4b4 Mon Sep 17 00:00:00 2001 From: Armand Krynauw Date: Wed, 26 Jul 2023 09:19:18 +0200 Subject: [PATCH] Fix can't type in palette bug --- src/frontend/ui/base/palette/Palette.svelte | 37 +++++++++++++-------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/src/frontend/ui/base/palette/Palette.svelte b/src/frontend/ui/base/palette/Palette.svelte index dee49f8d..cf5f885b 100644 --- a/src/frontend/ui/base/palette/Palette.svelte +++ b/src/frontend/ui/base/palette/Palette.svelte @@ -6,7 +6,7 @@ import Shortcuts from "../../utils/Shortcuts.svelte"; let showPalette = false; - let expanded = false; + let expanded = true; let inputElement: HTMLInputElement; let searchTerm = ""; @@ -118,15 +118,31 @@ } } + function openPalette() { + showPalette = true; + searchTerm = ""; + selectedCategory = 0; + selectedItem = 0; + categories = categoriesOriginals; + } + + function closePalette() { + showPalette = false; + } + const shortcuts = { "blix.palette.toggle": () => { - showPalette = !showPalette; + if (showPalette) { + closePalette(); + } else { + openPalette(); + } }, "blix.palette.show": () => { - showPalette = true; + openPalette(); }, "blix.palette.hide": () => { - showPalette = false; + closePalette(); }, "blix.palette.scrollDown": () => { selectedItem++; @@ -151,16 +167,11 @@ commandStore.runCommand(item.id); } - $: if (showPalette && inputElement) { - inputElement.focus(); - } + $: inputElement?.focus(); - $: if (showPalette) { - searchTerm = ""; - expanded = true; - selectedCategory = 0; - selectedItem = 0; - categories = categoriesOriginals; + $: { + selectedCategory; + selectedItem; repairItemIndex(); }