@invopop/popui 0.0.25 → 0.0.26

package/dist/BaseTable.svelte

@@ -5,6 +5,7 @@ import BaseCounter from "./BaseCounter.svelte";
 import BaseTableRow from "./BaseTableRow.svelte";
 import BaseTableCell from "./BaseTableCell.svelte";
 import InputCheckbox from "./InputCheckbox.svelte";
+import { isInputFocused } from "./helpers.js";
 const dispatch = createEventDispatcher();
 const callback = (entry) => {
   if (entry.intersectionRatio && entry.isIntersecting) {
@@ -97,95 +98,84 @@ function selectRange(to) {
   const itemsToSelect = flattedData.slice(fromIndex, toIndex + 1);
   selectedRows = [.../* @__PURE__ */ new Set([...selectedRows, ...itemsToSelect])];
 }
-</script>
-
-<svelte:window
-  on:mousemove={() => {
-    selectionMode = 'mouse'
-  }}
-  on:keydown={(event) => {
-    event.preventDefault()
-
-    selectionMode = 'keyboard'
-
-    if (event.key === 'Escape' || event.key === 'Esc') {
-      selectedRows = []
-      lastSelected = {}
+function handleKeydown(event) {
+  if (isInputFocused()) {
+    return;
+  }
+  selectionMode = "keyboard";
+  event.preventDefault();
+  if (event.key === "Escape" || event.key === "Esc") {
+    selectedRows = [];
+    lastSelected = {};
+  }
+  if ((event.code === "Space" || event.key === " ") && lastSelectedIndex >= 0) {
+    toggleRow(lastSelected);
+  }
+  metaKeyPressed = event.metaKey;
+  shiftKeyPressed = event.shiftKey;
+  if (event.key === "Enter") {
+    if (lastSelectedIndex >= 0) {
+      dispatch("rowClick", lastSelected);
     }
-
-    if ((event.code === 'Space' || event.key === ' ') && lastSelectedIndex >= 0) {
-      toggleRow(lastSelected)
+    return;
+  }
+  if (event.key === "Shift") {
+    selectWithArrowPosition = lastSelectedIndex;
+    return;
+  }
+  if (event.key === "ArrowUp") {
+    const toIndex = lastSelectedIndex - 1;
+    const to = flattedData[toIndex];
+    if (!to)
+      return;
+    if (!shiftKeyPressed) {
+      lastSelected = to;
+      return;
     }
-
-    metaKeyPressed = event.metaKey
-    shiftKeyPressed = event.shiftKey
-
-    if (event.key === 'Enter') {
-      if (lastSelectedIndex >= 0) {
-        dispatch('rowClick', lastSelected)
-      }
-      return
+    if (!rowIsSelected(lastSelected)) {
+      selectRow(lastSelected);
     }
-
-    if (event.key === 'Shift') {
-      selectWithArrowPosition = lastSelectedIndex
-      return
+    if (toIndex < selectWithArrowPosition) {
+      selectRow(to);
+    } else {
+      unselectRow(lastSelected);
     }
-
-    if (event.key === 'ArrowUp') {
-      const toIndex = lastSelectedIndex - 1
-      const to = flattedData[toIndex]
-
-      if (!to) return
-
-      if (!shiftKeyPressed) {
-        lastSelected = to
-        return
-      }
-
-      if (!rowIsSelected(lastSelected)) {
-        selectRow(lastSelected)
-      }
-
-      if (toIndex < selectWithArrowPosition) {
-        selectRow(to)
-      } else {
-        unselectRow(lastSelected)
+    lastSelected = to;
+  }
+  if (event.key === "ArrowDown") {
+    if (lastSelectedIndex < 0) {
+      if (shiftKeyPressed) {
+        selectRow(flattedData[0]);
       }
-      lastSelected = to
+      lastSelected = flattedData[0];
+      return;
     }
-
-    if (event.key === 'ArrowDown') {
-      if (lastSelectedIndex < 0) {
-        if (shiftKeyPressed) {
-          selectRow(flattedData[0])
-        }
-        lastSelected = flattedData[0]
-        return
-      }
-
-      const toIndex = lastSelectedIndex + 1
-      const to = flattedData[toIndex]
-
-      if (!to) return
-
-      if (!shiftKeyPressed) {
-        lastSelected = to
-        return
-      }
-
-      if (!rowIsSelected(lastSelected)) {
-        selectRow(lastSelected)
-      }
-
-      if (toIndex > selectWithArrowPosition) {
-        selectRow(to)
-      } else {
-        unselectRow(lastSelected)
-      }
-      lastSelected = to
+    const toIndex = lastSelectedIndex + 1;
+    const to = flattedData[toIndex];
+    if (!to)
+      return;
+    if (!shiftKeyPressed) {
+      lastSelected = to;
+      return;
+    }
+    if (!rowIsSelected(lastSelected)) {
+      selectRow(lastSelected);
     }
+    if (toIndex > selectWithArrowPosition) {
+      selectRow(to);
+    } else {
+      unselectRow(lastSelected);
+    }
+    lastSelected = to;
+  }
+}
+</script>
+
+<svelte:window
+  on:mousemove={() => {
+    selectionMode = 'mouse'
   }}
+  on:keydown={handleKeydown}
   on:keyup={(event) => {
     metaKeyPressed = false
     shiftKeyPressed = false

package/dist/BaseTable.svelte.d.ts

@@ -20,8 +20,8 @@ declare const __propDef: {
         orderBy: CustomEvent<any>;
         action: CustomEvent<any>;
         copied: CustomEvent<any>;
-        rowClick: CustomEvent<any>;
         rowNewTabClick: CustomEvent<any>;
+        rowClick: CustomEvent<any>;
         rowRightClick: CustomEvent<any>;
         tableEndReached: CustomEvent<any>;
     } & {

package/dist/GlobalSearch.svelte

@@ -4,6 +4,7 @@ import { createEventDispatcher, onDestroy, onMount } from "svelte";
 import clsx from "clsx";
 import ShortcutWrapper from "./ShortcutWrapper.svelte";
 import { GLOBAL_SEARCH_KEY } from "./constants.js";
+import { isInputFocused } from "./helpers.js";
 const dispatch = createEventDispatcher();
 export let collapsed = false;
 $:
@@ -14,10 +15,7 @@ function onKeyDown(event) {
   if (event.key !== GLOBAL_SEARCH_KEY) {
     return;
   }
-  const activeElement = document.activeElement;
-  const isInputText = activeElement?.tagName === "INPUT" && ["text", "search"].includes(activeElement.type);
-  const isTextarea = activeElement?.tagName === "TEXTAREA";
-  if (isInputText || isTextarea) {
+  if (isInputFocused()) {
     return;
   }
   open();

package/dist/helpers.d.ts

@@ -6,3 +6,4 @@ export declare function getCountryName(code: string): string | undefined;
 export declare function getStatusType(status: string): FeedItemStatus;
 export declare function getScrollableContainer(element: HTMLElement): HTMLElement | undefined;
 export declare function scrollIntoTableView(element: HTMLElement): void;
+export declare function isInputFocused(): boolean;

package/dist/helpers.js

@@ -73,3 +73,12 @@ export function scrollIntoTableView(element) {
         });
     }
 }
+export function isInputFocused() {
+    const activeElement = document.activeElement;
+    if (!activeElement)
+        return false;
+    const isInputText = activeElement.tagName === 'INPUT' &&
+        ['text', 'search', 'email', 'password', 'url'].includes(activeElement.type);
+    const isTextArea = activeElement.tagName === 'TEXTAREA' || activeElement.isContentEditable;
+    return isInputText || isTextArea;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@invopop/popui",
   "license": "MIT",
-  "version": "0.0.25",
+  "version": "0.0.26",
   "scripts": {
     "dev": "vite dev",
     "build": "vite build && npm run package",