From a965f3193c7892722e08650a01993c11df845819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Istv=C3=A1n=20Pat=C3=B3?= <istvan.pato@gmail.com>
Date: Wed, 7 Sep 2022 13:00:45 +0200
Subject: [PATCH] fix(ComboBox): handling TAB behaviour

---
 docs/src/pages/framed/ComboBox/FilterableComboBox.svelte | 5 ++++-
 src/ComboBox/ComboBox.svelte                             | 4 +---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/src/pages/framed/ComboBox/FilterableComboBox.svelte b/docs/src/pages/framed/ComboBox/FilterableComboBox.svelte
index 38d408ba..a88ea671 100644
--- a/docs/src/pages/framed/ComboBox/FilterableComboBox.svelte
+++ b/docs/src/pages/framed/ComboBox/FilterableComboBox.svelte
@@ -1,6 +1,7 @@
 <script>
   import { ComboBox } from "carbon-components-svelte";
 
+  let selectedId
   function shouldFilterItem(item, value) {
     if (!value) return true;
     return item.text.toLowerCase().includes(value.toLowerCase());
@@ -8,6 +9,7 @@
 </script>
 
 <ComboBox
+  bind:selectedId
   titleText="Contact"
   placeholder="Select contact method"
   items="{[
@@ -16,4 +18,5 @@
     { id: '2', text: 'Fax' },
   ]}"
   shouldFilterItem="{shouldFilterItem}"
-/>
+  helperText="selectedId: {selectedId}"
+/>
\ No newline at end of file
diff --git a/src/ComboBox/ComboBox.svelte b/src/ComboBox/ComboBox.svelte
index cb2bdd78..d1735667 100644
--- a/src/ComboBox/ComboBox.svelte
+++ b/src/ComboBox/ComboBox.svelte
@@ -289,7 +289,7 @@
           if (['Enter', 'ArrowDown', 'ArrowUp'].includes(key)) {
             e.preventDefault();
           }
-          if (key === 'Enter') {
+          if (key === 'Enter' || key === 'Tab') {
             open = !open;
             if (
               highlightedIndex > -1 &&
@@ -317,8 +317,6 @@
               }
             }
             highlightedIndex = -1;
-          } else if (key === 'Tab') {
-            open = false;
           } else if (key === 'ArrowDown') {
             change(1);
           } else if (key === 'ArrowUp') {