Fix can't type in palette bug

COS301-SE-2023 · Jul 26, 2023 · 1317560 · 1317560
1 parent 1bb3bc5
commit 1317560
Showing 1 changed file with 24 additions and 13 deletions.
diff --git 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();
   }
 </script>