diff --git a/packages/calcite-components/src/components/popover/PopoverManager.ts b/packages/calcite-components/src/components/popover/PopoverManager.ts index 00f3cda446e..b872f75af11 100644 --- a/packages/calcite-components/src/components/popover/PopoverManager.ts +++ b/packages/calcite-components/src/components/popover/PopoverManager.ts @@ -87,7 +87,7 @@ export default class PopoverManager { }; private clickHandler = (event: PointerEvent): void => { - if (isKeyboardTriggeredClick(event)) { + if (isKeyboardTriggeredClick(event) || event.defaultPrevented) { return; } diff --git a/packages/calcite-components/src/components/tooltip/TooltipManager.ts b/packages/calcite-components/src/components/tooltip/TooltipManager.ts index 1c5539ac0be..2f5f68ee73d 100644 --- a/packages/calcite-components/src/components/tooltip/TooltipManager.ts +++ b/packages/calcite-components/src/components/tooltip/TooltipManager.ts @@ -97,6 +97,10 @@ export default class TooltipManager { }; private pointerMoveHandler = (event: PointerEvent): void => { + if (event.defaultPrevented) { + return; + } + const composedPath = event.composedPath(); const { activeTooltip } = this; @@ -129,6 +133,10 @@ export default class TooltipManager { } private clickHandler = (event: Event): void => { + if (event.defaultPrevented) { + return; + } + this.clickedTooltip = null; const composedPath = event.composedPath(); const tooltip = this.queryTooltip(composedPath); @@ -160,6 +168,10 @@ export default class TooltipManager { }; private focusInHandler = (event: FocusEvent): void => { + if (event.defaultPrevented) { + return; + } + const composedPath = event.composedPath(); const tooltip = this.queryTooltip(composedPath);