focus behaviour

mcnuttandrew · Feb 16, 2024 · 55a7c6e · 55a7c6e
1 parent 0c25314
commit 55a7c6e
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
@@ -633,13 +633,13 @@ export function dealWithFocusEvent(
   focusedItems: number[]
 ) {
   const newFocusedItems = toggleElement(focusedItems, clickedItem);
-  const isShift = e.shiftKey;
-  const isCtrl = e.ctrlKey;
-  if (isShift) {
+  if (e.shiftKey || e.ctrlKey || e.metaKey) {
     return newFocusedItems;
   }
-  if (isCtrl) {
-    return newFocusedItems;
+  const itemInFocus = newFocusedItems.includes(clickedItem);
+  const numFocused = focusedItems.length;
+  if (numFocused > 1) {
+    return [clickedItem];
   }
-  return [clickedItem];
+  return itemInFocus ? [clickedItem] : [];
 }