From fcb2c7868c19dc0cff6fea2810ccdcd4a07a30e5 Mon Sep 17 00:00:00 2001 From: Cory LaViska Date: Wed, 18 Oct 2023 13:44:20 -0400 Subject: [PATCH] backport PR 1661 --- docs/pages/resources/changelog.md | 1 + src/components/tooltip/tooltip.component.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/pages/resources/changelog.md b/docs/pages/resources/changelog.md index 2ad10bb59..6f31fa298 100644 --- a/docs/pages/resources/changelog.md +++ b/docs/pages/resources/changelog.md @@ -23,6 +23,7 @@ New versions of Web Awesome are released as-needed and generally occur when a cr ## Next - Added the Croatian translation [#1656] +- Fixed a bug that caused the [[Escape]] key to stop propagating when tooltips are disabled [#1607] ## 2.10.0 diff --git a/src/components/tooltip/tooltip.component.ts b/src/components/tooltip/tooltip.component.ts index b5563b369..ac96d8ce4 100644 --- a/src/components/tooltip/tooltip.component.ts +++ b/src/components/tooltip/tooltip.component.ts @@ -145,7 +145,7 @@ export default class WaTooltip extends WebAwesomeElement { private handleKeyDown = (event: KeyboardEvent) => { // Pressing escape when the target element has focus should dismiss the tooltip - if (this.open && event.key === 'Escape') { + if (this.open && !this.disabled && event.key === 'Escape') { event.stopPropagation(); this.hide(); }