starred/yaak
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-04-21 08:21:19 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Fix indent guide on drag and drop after expand folder

Browse Source 
https://feedback.yaak.app/p/displace-moving-caret-on-spring-loaded-folder
This commit is contained in:
Gregory Schier
2025-10-25 09:41:06 -07:00
parent 17dbe7c9a7
commit 923b1ac830
5 changed files with 71 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src-web/hooks/useHotKey.ts
View File

@@ -173,7 +173,8 @@ function handleKeyDown(e: KeyboardEvent) {
if (e.metaKey) currentKeysWithModifiers.add('Meta');
if (e.shiftKey) currentKeysWithModifiers.add('Shift');
outer: for (const [hkAction, hkKeys] of Object.entries(hotkeys) as [HotkeyAction, string[]][]) {
const executed: string[] = [];
outer: for (const { action, callback, options } of jotaiStore.get(sortedCallbacksAtom)) {
if (
(e.target instanceof HTMLInputElement || e.target instanceof HTMLTextAreaElement) &&
currentKeysWithModifiers.size === 1 &&
@@ -184,8 +185,7 @@ function handleKeyDown(e: KeyboardEvent) {
continue;
}
const executed: string[] = [];
for (const { action, callback, options } of jotaiStore.get(sortedCallbacksAtom)) {
for (const [hkAction, hkKeys] of Object.entries(hotkeys) as [HotkeyAction, string[]][]) {
if (hkAction !== action) {
continue;
}
@@ -207,12 +207,12 @@ function handleKeyDown(e: KeyboardEvent) {
}
}
}
if (executed.length > 0) {
console.log('Executed hotkey', executed.join(', '));
jotaiStore.set(currentKeysAtom, new Set([]));
}
}
if (executed.length > 0) {
console.log('Executed hotkey', executed.join(', '));
jotaiStore.set(currentKeysAtom, new Set([]));
}
clearCurrentKeysDebounced();
}
@@ -272,7 +272,13 @@ const resolveHotkeyKey = (key: string) => {
function compareKeys(keysA: string[], keysB: string[]) {
if (keysA.length !== keysB.length) return false;
const sortedA = keysA.map((k) => k.toLowerCase()).sort().join('::');
const sortedB = keysB.map((k) => k.toLowerCase()).sort().join('::');
const sortedA = keysA
.map((k) => k.toLowerCase())
.sort()
.join('::');
const sortedB = keysB
.map((k) => k.toLowerCase())
.sort()
.join('::');
return sortedA === sortedB;
}