From 2130c139f8e7b9b8dcb5648b67b01a6b86e4c909 Mon Sep 17 00:00:00 2001 From: Eric Liu Date: Thu, 26 Nov 2020 14:29:16 -0800 Subject: [PATCH] fix(header-search): selecting a result should reset the search --- src/UIShell/HeaderSearch.svelte | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/UIShell/HeaderSearch.svelte b/src/UIShell/HeaderSearch.svelte index 153abb53..b6e24bcd 100644 --- a/src/UIShell/HeaderSearch.svelte +++ b/src/UIShell/HeaderSearch.svelte @@ -31,6 +31,12 @@ let refSearch = null; + function selectResult() { + active = false; + value = ""; + dispatch("select", { value, selectedResultIndex, selectedResult }); + } + $: if (active && ref) ref.focus(); $: selectedResult = results[selectedResultIndex]; $: selectedId = selectedResult @@ -211,9 +217,7 @@ on:keydown="{({ key }) => { switch (key) { case 'Enter': - active = false; - value = ''; - dispatch('select', { value, selectedResultIndex, selectedResult }); + selectResult(); break; case 'ArrowDown': if (selectedResultIndex === results.length - 1) { @@ -258,13 +262,7 @@ role="menuitem" href="{result.href}" class:selected="{selectedId === `search-menuitem-${i}`}" - on:click|preventDefault="{() => { - dispatch('select', { - value, - selectedResultIndex, - selectedResult, - }); - }}" + on:click|preventDefault="{selectResult}" > {result.text}