svelte-typeahead 4.2.3 → 4.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-typeahead",
-  "version": "4.2.3",
+  "version": "4.3.1",
   "license": "MIT",
   "description": "Accessible, fuzzy search typeahead component",
   "author": "Eric Liu (https://github.com/metonym)",
@@ -8,7 +8,6 @@
   "main": "./lib/index.js",
   "module": "./lib/index.mjs",
   "types": "./types/index.d.ts",
-  "sideEffects": false,
   "scripts": {
     "dev": "rollup -cw",
     "predeploy": "rollup -c",
@@ -22,7 +21,7 @@
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^21.0.2",
-    "svelte": "^3.48.0",
+    "svelte": "^3.49.0",
     "svelte-check": "^2.8.0",
     "svelte-readme": "^3.6.3"
   },

package/src/Typeahead.svelte

@@ -33,6 +33,9 @@
   /** Set to `true` to re-focus the input after selecting a result */
   export let focusAfterSelect = false;
 
+  /** Set to `true` to only show results when the input is focused */
+  export let showDropdownOnFocus = false;
+
   /**
    * Specify the maximum number of results to return
    * @type {number}
@@ -50,10 +53,11 @@
   let hideDropdown = false;
   let selectedIndex = -1;
   let prevResults = "";
+  let isFocused = false;
 
   afterUpdate(() => {
     if (prevResults !== resultsId && autoselect) {
-      selectedIndex = 0;
+      selectedIndex = getNextNonDisabledIndex();
     }
 
     if (prevResults !== resultsId && !$$slots["no-results"]) {
@@ -85,14 +89,33 @@
     await tick();
 
     if (focusAfterSelect) searchRef.focus();
+    close();
+  }
+
+  /** @type {() => number} */
+  function getNextNonDisabledIndex() {
+    let index = 0;
+    let disabled = results[index]?.disabled ?? false;
+
+    while (disabled) {
+      if (index === results.length) {
+        index = 0;
+      } else {
+        index += 1;
+      }
 
-    hideDropdown = true;
+      disabled = results[index]?.disabled ?? false;
+    }
+
+    return index;
   }
 
   /** @type {(direction: -1 | 1) => void} */
   function change(direction) {
     let index =
-      direction === 1 && selectedIndex === results.length - 1 ? 0 : selectedIndex + direction;
+      direction === 1 && selectedIndex === results.length - 1
+        ? 0
+        : selectedIndex + direction;
     if (index < 0) index = results.length - 1;
 
     let disabled = results[index].disabled;
@@ -110,6 +133,9 @@
     selectedIndex = index;
   }
 
+  const open = () => (hideDropdown = false);
+  const close = () => (hideDropdown = true);
+
   $: options = { pre: "<mark>", post: "</mark>", extract };
   $: results = fuzzy
     .filter(value, data, options)
@@ -118,12 +144,16 @@
     .filter((result) => !filter(result.original))
     .map((result) => ({ ...result, disabled: disable(result.original) }));
   $: resultsId = results.map((result) => extract(result.original)).join("");
+  $: showResults = !hideDropdown && results.length > 0;
+  $: if (showDropdownOnFocus) {
+    showResults = showResults && isFocused;
+  }
 </script>
 
 <svelte:window
   on:click={({ target }) => {
-    if (!hideDropdown && comboboxRef && !comboboxRef.contains(target)) {
-      hideDropdown = true;
+    if (!hideDropdown && !comboboxRef?.contains(target)) {
+      close();
     }
   }}
 />
@@ -135,7 +165,7 @@
   aria-haspopup="listbox"
   aria-owns="{id}-listbox"
   class:dropdown={results.length > 0}
-  aria-expanded={!hideDropdown && results.length > 0}
+  aria-expanded={showResults}
   id="{id}-typeahead"
 >
   <Search
@@ -157,13 +187,15 @@
     on:change
     on:focus
     on:focus={() => {
-      hideDropdown = false;
+      open();
+      isFocused = true;
     }}
     on:clear
-    on:clear={() => {
-      hideDropdown = false;
-    }}
+    on:clear={open}
     on:blur
+    on:blur={() => {
+      isFocused = false;
+    }}
     on:keydown
     on:keydown={(e) => {
       if (results.length === 0) return;
@@ -183,8 +215,8 @@
         case "Escape":
           e.preventDefault();
           value = "";
-          searchRef.focus();
-          hideDropdown = true;
+          searchRef?.focus();
+          close();
           break;
       }
     }}
@@ -195,26 +227,25 @@
     aria-labelledby="{id}-label"
     id="{id}-listbox"
   >
-    {#if !hideDropdown && results.length > 0}
-      {#each results as result, i}
+    {#if showResults}
+      {#each results as result, index}
         <li
           role="option"
-          id="{id}-result-{i}"
-          class:selected={selectedIndex === i}
+          id="{id}-result-{index}"
+          class:selected={selectedIndex === index}
           class:disabled={result.disabled}
-          aria-selected={selectedIndex === i}
+          aria-selected={selectedIndex === index}
           on:click={() => {
-            if (!result.disabled) {
-              selectedIndex = i;
-              select();
-            }
+            if (result.disabled) return;
+            selectedIndex = index;
+            select();
           }}
           on:mouseenter={() => {
             if (result.disabled) return;
-            selectedIndex = i;
+            selectedIndex = index;
           }}
         >
-          <slot {result} index={i} {value}>
+          <slot {result} {index} {value}>
             {@html result.string}
           </slot>
         </li>
@@ -245,6 +276,10 @@
     box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
   }
 
+  [aria-expanded="true"] ul {
+    z-index: 1;
+  }
+
   li,
   .no-results {
     padding: 0.25rem 1rem;

package/types/Typeahead.svelte.d.ts

@@ -62,6 +62,12 @@ export interface TypeaheadProps<TItem> extends SearchProps {
    */
   focusAfterSelect?: boolean;
 
+  /**
+   * Set to `true` to only show results when the input is focused
+   * @default false
+   */
+  showDropdownOnFocus?: boolean;
+
   /**
    * Specify the maximum number of results to return
    * @default Infinity