PandaDEV/Qopy
1
0
Fork 0
mirror of https://github.com/0PandaDEV/Qopy.git synced 2025-04-21 13:14:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: integrate keyboard functionality and clean up event handling

Browse source
This commit is contained in:
PandaDEV 2025-03-13 15:29:02 +01:00
parent b2395e19a9
commit b6269c60c9
No known key found for this signature in database
GPG key ID: 13EFF9BAF70EE75C
5 changed files with 55 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

57
pages/index.vue
View file

@ -174,7 +174,7 @@ import type {
InfoColor,
InfoCode,
} from "~/types/types";
import { Key } from "wrdu-keyboard/key";
import { Key, keyboard } from "wrdu-keyboard";
interface GroupedHistory {
label: string;
@ -207,8 +207,6 @@ const imageLoading = ref<boolean>(false);
const pageTitle = ref<string>("");
const pageOgImage = ref<string>("");
const keyboard = useKeyboard();
const isSameDay = (date1: Date, date2: Date): boolean => {
return (
date1.getFullYear() === date2.getFullYear() &&
@ -593,39 +591,70 @@ const setupEventListeners = async (): Promise<void> => {
}
}
focusSearchInput();
// Re-register keyboard shortcuts on focus
keyboard.clear();
keyboard.prevent.down([Key.DownArrow], () => {
selectNext();
});
keyboard.prevent.down([Key.UpArrow], () => {
selectPrevious();
});
keyboard.prevent.down([Key.Enter], () => {
pasteSelectedItem();
});
keyboard.prevent.down([Key.Escape], () => {
hideApp();
});
switch (os.value) {
case "macos":
keyboard.prevent.down([Key.LeftMeta, Key.K], () => {});
keyboard.prevent.down([Key.RightMeta, Key.K], () => {});
break;
case "linux":
case "windows":
keyboard.prevent.down([Key.LeftControl, Key.K], () => {});
keyboard.prevent.down([Key.RightControl, Key.K], () => {});
break;
}
});
await listen("tauri://blur", () => {
searchInput.value?.blur();
keyboard.clear();
});
keyboard.prevent.down([Key.DownArrow], (event) => {
keyboard.prevent.down([Key.DownArrow], () => {
selectNext();
});
keyboard.prevent.down([Key.UpArrow], (event) => {
keyboard.prevent.down([Key.UpArrow], () => {
selectPrevious();
});
keyboard.prevent.down([Key.Enter], (event) => {
keyboard.prevent.down([Key.Enter], () => {
pasteSelectedItem();
});
keyboard.prevent.down([Key.Escape], (event) => {
keyboard.prevent.down([Key.Escape], () => {
hideApp();
});
switch (os.value) {
case "macos":
keyboard.prevent.down([Key.LeftMeta, Key.K], (event) => {});
keyboard.prevent.down([Key.RightMeta, Key.K], (event) => {});
keyboard.prevent.down([Key.LeftMeta, Key.K], () => {});
keyboard.prevent.down([Key.RightMeta, Key.K], () => {});
break;
case "linux" || "windows":
keyboard.prevent.down([Key.LeftControl, Key.K], (event) => {});
keyboard.prevent.down([Key.RightControl, Key.K], (event) => {});
case "linux":
case "windows":
keyboard.prevent.down([Key.LeftControl, Key.K], () => {});
keyboard.prevent.down([Key.RightControl, Key.K], () => {});
break;
}
};

18
pages/settings.vue
View file

@ -93,9 +93,9 @@ import { invoke } from "@tauri-apps/api/core";
import { onMounted, onUnmounted, reactive, ref } from "vue";
import { platform } from "@tauri-apps/plugin-os";
import { useRouter } from "vue-router";
import { Key } from "wrdu-keyboard/key";
import { KeyValues, KeyLabels } from "../types/keys";
import { disable, enable } from "@tauri-apps/plugin-autostart";
import { Key, keyboard } from "wrdu-keyboard";
const activeModifiers = reactive<Set<KeyValues>>(new Set());
const isKeybindInputFocused = ref(false);
@ -104,7 +104,6 @@ const keybindInput = ref<HTMLElement | null>(null);
const lastBlurTime = ref(0);
const os = ref("");
const router = useRouter();
const keyboard = useKeyboard();
const showEmptyKeybindError = ref(false);
const autostart = ref(false);
const { $settings } = useNuxtApp();
@ -189,13 +188,13 @@ const toggleAutostart = async () => {
os.value = platform();
onMounted(async () => {
keyboard.down([Key.All], (event) => {
keyboard.prevent.down([Key.All], (event: KeyboardEvent) => {
if (isKeybindInputFocused.value) {
onKeyDown(event);
}
});
keyboard.down([Key.Escape], (event) => {
keyboard.prevent.down([Key.Escape], () => {
if (isKeybindInputFocused.value) {
keybindInput.value?.blur();
} else {
@ -205,27 +204,28 @@ onMounted(async () => {
switch (os.value) {
case "macos":
keyboard.down([Key.LeftMeta, Key.Enter], (event) => {
keyboard.prevent.down([Key.LeftMeta, Key.Enter], () => {
if (!isKeybindInputFocused.value) {
saveKeybind();
}
});
keyboard.down([Key.RightMeta, Key.Enter], (event) => {
keyboard.prevent.down([Key.RightMeta, Key.Enter], () => {
if (!isKeybindInputFocused.value) {
saveKeybind();
}
});
break;
case "linux" || "windows":
keyboard.down([Key.LeftControl, Key.Enter], (event) => {
case "linux":
case "windows":
keyboard.prevent.down([Key.LeftControl, Key.Enter], () => {
if (!isKeybindInputFocused.value) {
saveKeybind();
}
});
keyboard.down([Key.RightControl, Key.Enter], (event) => {
keyboard.prevent.down([Key.RightControl, Key.Enter], () => {
if (!isKeybindInputFocused.value) {
saveKeybind();
}