From a6d8318cf0fa5ed7741127e482f06d6cb3ad955a Mon Sep 17 00:00:00 2001
From: Maximilien Carbonne <maximilien.carbonne@gmail.com>
Date: Mon, 20 Jan 2025 18:54:00 +0100
Subject: [PATCH] PR #467

---
 frontend/components/Base/Modal.vue            | 12 +++++--
 frontend/components/Form/Multiselect.vue      |  7 ++--
 frontend/components/Item/CreateModal.vue      | 28 +++++++++-------
 frontend/components/Label/CreateModal.vue     | 10 ++++--
 frontend/components/Location/CreateModal.vue  | 33 ++++++++++++++++---
 .../components/global/QuickMenu/Input.vue     | 20 +++++++----
 .../components/global/QuickMenu/Modal.vue     | 15 ++-------
 frontend/layouts/default.vue                  | 28 +++++++++++-----
 8 files changed, 102 insertions(+), 51 deletions(-)

diff --git a/frontend/components/Base/Modal.vue b/frontend/components/Base/Modal.vue
index 6939f929c..b1ea21c22 100644
--- a/frontend/components/Base/Modal.vue
+++ b/frontend/components/Base/Modal.vue
@@ -41,6 +41,10 @@
       type: Boolean,
       default: true,
     },
+    clickOutsideToClose: {
+      type: Boolean,
+      default: false,
+    },
   });
 
   const modalBox = ref();
@@ -51,9 +55,11 @@
     }
   }
 
-  onClickOutside(modalBox, () => {
-    close();
-  });
+  if (props.clickOutsideToClose) {
+    onClickOutside(modalBox, () => {
+      close();
+    });
+  }
 
   function close() {
     if (props.readonly) {
diff --git a/frontend/components/Form/Multiselect.vue b/frontend/components/Form/Multiselect.vue
index 91e1a27ad..ad67c6443 100644
--- a/frontend/components/Form/Multiselect.vue
+++ b/frontend/components/Form/Multiselect.vue
@@ -4,7 +4,10 @@
       <span class="label-text">{{ label }}</span>
     </label>
     <div class="dropdown dropdown-top sm:dropdown-end">
-      <div tabindex="0" class="flex min-h-[48px] w-full flex-wrap gap-2 rounded-lg border border-gray-400 p-4">
+      <div
+        tabindex="0"
+        class="flex min-h-[48px] w-full flex-wrap gap-2 rounded-lg border border-base-content/20 p-4"
+      >
         <span v-for="itm in value" :key="itm.id" class="badge">
           {{ itm.name }}
         </span>
@@ -20,7 +23,7 @@
       <div
         tabindex="0"
         style="display: inline"
-        class="dropdown-content menu z-[9999] mb-1 w-full rounded border border-gray-400 bg-base-100 shadow"
+        class="dropdown-content menu z-[9999] mb-1 w-full rounded border border-base-content/20 bg-base-100 shadow"
       >
         <div class="m-2">
           <input v-model="search" placeholder="Search…" class="input input-bordered input-sm w-full" />
diff --git a/frontend/components/Item/CreateModal.vue b/frontend/components/Item/CreateModal.vue
index 27def2901..8bb799da6 100644
--- a/frontend/components/Item/CreateModal.vue
+++ b/frontend/components/Item/CreateModal.vue
@@ -141,20 +141,26 @@
     }
   }
 
-  whenever(
+  watch(
     () => modal.value,
-    () => {
-      focused.value = true;
-
-      if (locationId.value) {
-        const found = locations.value.find(l => l.id === locationId.value);
-        if (found) {
-          form.location = found;
+    open => {
+      if (open) {
+        useTimeoutFn(() => {
+          focused.value = true;
+        }, 50);
+
+        if (locationId.value) {
+          const found = locations.value.find(l => l.id === locationId.value);
+          if (found) {
+            form.location = found;
+          }
         }
-      }
 
-      if (labelId.value) {
-        form.labels = labels.value.filter(l => l.id === labelId.value);
+        if (labelId.value) {
+          form.labels = labels.value.filter(l => l.id === labelId.value);
+        }
+      } else {
+        focused.value = false;
       }
     }
   );
diff --git a/frontend/components/Label/CreateModal.vue b/frontend/components/Label/CreateModal.vue
index 89d74354d..a16b480da 100644
--- a/frontend/components/Label/CreateModal.vue
+++ b/frontend/components/Label/CreateModal.vue
@@ -64,10 +64,14 @@
     loading.value = false;
   }
 
-  whenever(
+  watch(
     () => modal.value,
-    () => {
-      focused.value = true;
+    open => {
+      if (open)
+        useTimeoutFn(() => {
+          focused.value = true;
+        }, 50);
+      else focused.value = false;
     }
   );
 
diff --git a/frontend/components/Location/CreateModal.vue b/frontend/components/Location/CreateModal.vue
index 0552194a7..3363c50f5 100644
--- a/frontend/components/Location/CreateModal.vue
+++ b/frontend/components/Location/CreateModal.vue
@@ -2,6 +2,7 @@
   <BaseModal v-model="modal">
     <template #title>{{ $t("components.location.create_modal.title") }}</template>
     <form @submit.prevent="create()">
+      <LocationSelector v-model="form.parent" />
       <FormTextField
         ref="locationNameRef"
         v-model="form.name"
@@ -17,7 +18,6 @@
         :label="$t('components.location.create_modal.location_description')"
         :max-length="1000"
       />
-      <LocationSelector v-model="form.parent" />
       <div class="modal-action">
         <div class="flex justify-center">
           <BaseButton class="rounded-r-none" type="submit" :loading="loading">{{ $t("global.create") }}</BaseButton>
@@ -59,10 +59,23 @@
     parent: null as LocationSummary | null,
   });
 
-  whenever(
+  watch(
     () => modal.value,
-    () => {
-      focused.value = true;
+    open => {
+      if (open) {
+        useTimeoutFn(() => {
+          focused.value = true;
+        }, 50);
+
+        if (locationId.value) {
+          const found = locations.value.find(l => l.id === locationId.value);
+          if (found) {
+            form.parent = found;
+          }
+        }
+      } else {
+        focused.value = false;
+      }
     }
   );
 
@@ -77,8 +90,20 @@
   const api = useUserApi();
   const toast = useNotifier();
 
+  const locationsStore = useLocationStore();
+  const locations = computed(() => locationsStore.allLocations);
+
+  const route = useRoute();
+
   const { shift } = useMagicKeys();
 
+  const locationId = computed(() => {
+    if (route.fullPath.includes("/location/")) {
+      return route.params.id;
+    }
+    return null;
+  });
+
   async function create(close = true) {
     if (loading.value) {
       toast.error("Already creating a location");
diff --git a/frontend/components/global/QuickMenu/Input.vue b/frontend/components/global/QuickMenu/Input.vue
index 8f047a7e0..34b845a34 100644
--- a/frontend/components/global/QuickMenu/Input.vue
+++ b/frontend/components/global/QuickMenu/Input.vue
@@ -7,6 +7,7 @@
     ></ComboboxInput>
     <ComboboxOptions
       class="card dropdown-content absolute max-h-48 w-full overflow-y-scroll rounded-lg border border-base-300 bg-base-100"
+      :unmount="false"
     >
       <ComboboxOption
         v-for="(action, idx) in filteredActions"
@@ -68,21 +69,20 @@
     },
   });
 
-  const selectedAction = useVModel(props, "modelValue");
+  const emit = defineEmits(["update:modelValue", "actionSelected"]);
+  const selectedAction = ref();
 
   const inputValue = ref("");
   const inputBox = ref();
   const inputBoxButton = ref();
   const { focused: inputBoxFocused } = useFocus(inputBox);
 
-  const emit = defineEmits(["update:modelValue", "quickSelect"]);
-
   const revealActions = () => {
     unrefElement(inputBoxButton).click();
   };
 
-  watch(inputBoxFocused, () => {
-    if (inputBoxFocused.value) revealActions();
+  watch(inputBoxFocused, val => {
+    if (val) revealActions();
     else inputValue.value = "";
   });
 
@@ -90,11 +90,19 @@
     if (!oldVal) {
       const action = props.actions?.find(v => v.shortcut === val);
       if (action) {
-        emit("quickSelect", action);
+        emit("actionSelected", action);
+        inputBoxFocused.value = false;
       }
     }
   });
 
+  watch(selectedAction, val => {
+    if (val) {
+      emit("actionSelected", val);
+      selectedAction.value = null;
+    }
+  });
+
   const filteredActions = computed(() => {
     const searchTerm = inputValue.value.toLowerCase();
     return (props.actions || []).filter(action => {
diff --git a/frontend/components/global/QuickMenu/Modal.vue b/frontend/components/global/QuickMenu/Modal.vue
index 5d0942601..538e9755d 100644
--- a/frontend/components/global/QuickMenu/Modal.vue
+++ b/frontend/components/global/QuickMenu/Modal.vue
@@ -1,13 +1,8 @@
 <template>
-  <BaseModal v-model="modal" :show-close-button="false">
+  <BaseModal v-model="modal" :show-close-button="false" :click-outside-to-close="true">
     <div class="relative">
       <span class="text-neutral-400">{{ $t("components.quick_menu.shortcut_hint") }}</span>
-      <QuickMenuInput
-        ref="inputBox"
-        v-model="selectedAction"
-        :actions="props.actions || []"
-        @quick-select="invokeAction"
-      ></QuickMenuInput>
+      <QuickMenuInput ref="inputBox" :actions="props.actions || []" @action-selected="invokeAction"></QuickMenuInput>
     </div>
   </BaseModal>
 </template>
@@ -28,7 +23,6 @@
   });
 
   const modal = useVModel(props, "modelValue");
-  const selectedAction = ref<QuickMenuAction>();
 
   const inputBox = ref<QuickMenuInputData>({ focused: false, revealActions: () => {} });
 
@@ -37,7 +31,6 @@
   }, 50).start;
 
   const onModalClose = () => {
-    selectedAction.value = undefined;
     inputBox.value.focused = false;
   };
 
@@ -51,8 +44,4 @@
     modal.value = false;
     useTimeoutFn(action.action, 100).start();
   }
-
-  watch(selectedAction, action => {
-    if (action) invokeAction(action);
-  });
 </script>
diff --git a/frontend/layouts/default.vue b/frontend/layouts/default.vue
index b910eee22..52f2c2670 100644
--- a/frontend/layouts/default.vue
+++ b/frontend/layouts/default.vue
@@ -70,9 +70,11 @@
                       <button class="group" @click="btn.action">
                         {{ btn.name.value }}
 
-                        <kbd v-if="btn.shortcut" class="ml-auto hidden text-neutral-400 group-hover:inline">{{
-                          btn.shortcut
-                        }}</kbd>
+                        <kbd
+                          v-if="btn.shortcut"
+                          class="kbd kbd-sm ml-auto hidden text-neutral-400 group-hover:inline"
+                          >{{ btn.shortcut }}</kbd
+                        >
                       </button>
                     </li>
                   </ul>
@@ -145,9 +147,14 @@
 
   const displayOutdatedWarning = computed(() => !isDev && !hasHiddenLatest.value && isOutdated.value);
 
+  const activeElement = useActiveElement();
   const keys = useMagicKeys({
     aliasMap: {
       "⌃": "control_",
+      "Shift+": "ShiftLeft_",
+      "!": "ShiftLeft_digit1",
+      "@": "ShiftLeft_digit2",
+      "#": "ShiftLeft_digit3",
     },
   });
 
@@ -173,7 +180,7 @@
     {
       id: 0,
       name: computed(() => t("menu.create_item")),
-      shortcut: "⌃1",
+      shortcut: "!",
       action: () => {
         modals.item = true;
       },
@@ -181,7 +188,7 @@
     {
       id: 1,
       name: computed(() => t("menu.create_location")),
-      shortcut: "⌃2",
+      shortcut: "@",
       action: () => {
         modals.location = true;
       },
@@ -189,7 +196,7 @@
     {
       id: 2,
       name: computed(() => t("menu.create_label")),
-      shortcut: "⌃3",
+      shortcut: "#",
       action: () => {
         modals.label = true;
       },
@@ -197,9 +204,12 @@
   ];
 
   dropdown.forEach(option => {
-    if (option.shortcut) {
-      whenever(keys[option.shortcut], () => {
-        option.action();
+    if (option?.shortcut) {
+      const shortcutKeycode = option.shortcut.replace(/([0-9])/, "digit$&");
+      whenever(keys[shortcutKeycode], () => {
+        if (activeElement.value?.tagName !== "INPUT") {
+          option.action();
+        }
       });
     }
   });