Merge branch 'master' into users/nirice/fix-style-removal-behavior

microsoft · Jun 10, 2020 · 8c3ef7e · 8c3ef7e
2 parents 84458f2 + caa6323
commit 8c3ef7e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/packages/react/fast-components-react-base/src/select/select.tsx b/packages/react/fast-components-react-base/src/select/select.tsx
@@ -2,6 +2,7 @@ import { SelectClassNameContract } from "@microsoft/fast-components-class-name-c
 import Foundation, { HandledProps } from "@microsoft/fast-components-foundation-react";
 import {
     classNames,
+    isHTMLElement,
     keyCodeArrowDown,
     keyCodeArrowLeft,
     keyCodeArrowRight,
@@ -641,7 +642,9 @@ class Select extends Foundation<SelectHandledProps, SelectUnhandledProps, Select
             this.state.isMenuOpen &&
             !this.props.multiselectable &&
             this.rootElement.current !== null &&
-            !this.rootElement.current.contains(event.relatedTarget as Element)
+            (!this.rootElement.current.contains(event.relatedTarget as Element) ||
+                (isHTMLElement(event.relatedTarget) &&
+                    (event.relatedTarget as HTMLElement).id === this.triggerId))
         ) {
             this.toggleMenu(false);
         }