From 00a61d2dc9c948ff5df0eb1055205f100018030b Mon Sep 17 00:00:00 2001
From: TJ Egan <tw15egan@gmail.com>
Date: Thu, 16 Feb 2023 15:10:46 -0500
Subject: [PATCH] fix(ComboBox): retain input value when menu is open and esc
 is pressed

---
 packages/react/src/components/ComboBox/ComboBox.tsx       | 8 ++++++++
 .../src/components/MultiSelect/FilterableMultiSelect.js   | 7 ++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/react/src/components/ComboBox/ComboBox.tsx b/packages/react/src/components/ComboBox/ComboBox.tsx
index aeec22bcc52a..9574c5a763e1 100644
--- a/packages/react/src/components/ComboBox/ComboBox.tsx
+++ b/packages/react/src/components/ComboBox/ComboBox.tsx
@@ -480,6 +480,14 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => {
             if (match(event, keys.Enter) && !inputValue) {
               toggleMenu();
             }
+
+            if (match(event, keys.Escape) && inputValue) {
+              if (event.target === textInput.current && isOpen) {
+                toggleMenu();
+                event.preventDownshiftDefault = true;
+                event.persist();
+              }
+            }
           },
         });
 
diff --git a/packages/react/src/components/MultiSelect/FilterableMultiSelect.js b/packages/react/src/components/MultiSelect/FilterableMultiSelect.js
index 203e8e359b04..8a2b54c07f63 100644
--- a/packages/react/src/components/MultiSelect/FilterableMultiSelect.js
+++ b/packages/react/src/components/MultiSelect/FilterableMultiSelect.js
@@ -303,14 +303,11 @@ const FilterableMultiSelect = React.forwardRef(function FilterableMultiSelect(
                   if (match(event, keys.Delete) || match(event, keys.Escape)) {
                     if (isOpen) {
                       handleOnMenuChange(true);
+                      clearInputValue();
                       event.stopPropagation();
                     } else if (!isOpen) {
-                      clearInputValue();
+                      clearSelection();
                       event.stopPropagation();
-                      if (event.target.value === '') {
-                        clearSelection();
-                        event.stopPropagation();
-                      }
                     }
                   }
                 }