From f19589ac542c2246944d6ef88f39fdda76521fb9 Mon Sep 17 00:00:00 2001
From: Eric Liu <ericyl.us@gmail.com>
Date: Tue, 31 Dec 2019 07:58:21 -0800
Subject: [PATCH] fix(combo-box): apply filter when open

---
 src/components/ComboBox/ComboBox.svelte | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/ComboBox/ComboBox.svelte b/src/components/ComboBox/ComboBox.svelte
index 0c7b6e1a..aec48f2a 100644
--- a/src/components/ComboBox/ComboBox.svelte
+++ b/src/components/ComboBox/ComboBox.svelte
@@ -30,6 +30,7 @@
     ListBoxSelection
   } from '../ListBox';
 
+  let selectedId = undefined;
   let inputRef = undefined;
   let inputValue = undefined;
   let highlightedIndex = -1;
@@ -49,6 +50,7 @@
   afterUpdate(() => {
     if (open) {
       inputRef.focus();
+      filteredItems = items.filter(item => shouldFilterItem(item, value));
     } else {
       highlightedIndex = -1;
       inputValue = selectedItem ? selectedItem.text : '';
@@ -165,10 +167,11 @@
       <ListBoxMenu aria-label={ariaLabel} {id}>
         {#each filteredItems as item, i (item.id || i)}
           <ListBoxMenuItem
-            active={selectedIndex === i}
+            active={selectedIndex === i || selectedId === item.id}
             highlighted={highlightedIndex === i || selectedIndex === i}
             on:click={() => {
-              selectedIndex = i;
+              selectedId = item.id;
+              selectedIndex = items.map(({ id }) => id).indexOf(filteredItems[i].id);
               open = false;
             }}
             on:mouseenter={() => {