Merge branch 'main' into chore/update-babel-versions-apr-2021

carbon-design-system · May 3, 2021 · 4b69ba9 · 4b69ba9
2 parents e2a4a8f + 4acc699
commit 4b69ba9
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/packages/react/src/components/Tooltip/Tooltip.js b/packages/react/src/components/Tooltip/Tooltip.js
@@ -425,6 +425,7 @@ class Tooltip extends Component {
   handleEscKeyPress = (event) => {
     const { open } = this.isControlled ? this.props : this.state;
     if (open && keyDownMatch(event, [keys.Escape])) {
+      event.stopPropagation();
       return this._handleUserInputOpenClose(event, { open: false });
     }
   };