Skip to content

Commit 13aa16a

Browse files
amitrathieshgoogle-labs-jules[bot]julien-deramond
authored
Fix: Popover with hover and click triggers closes on mouseleave (#41511)
* Fix: Popover with hover and click triggers closes on mouseleave When a popover is configured with `trigger: 'hover click'`, if you open it by a click, it would incorrectly close when the mouse pointer leaves the trigger element. This was because the `mouseleave` event (part of the hover trigger) would hide the popover without adequately respecting the click trigger's intent to keep it open. This commit modifies the click event listener within `Tooltip.js` (which Popover extends) to explicitly manage the `_activeTrigger[TRIGGER_CLICK]` state: - When a click opens the popover or makes a hover-opened popover sticky, `_activeTrigger[TRIGGER_CLICK]` is set to `true`. - When a click closes an already click-activated popover, `_activeTrigger[TRIGGER_CLICK]` is set to `false`. The `_leave()` method, called by `mouseleave`, already checks `_isWithActiveTrigger()`. With `_activeTrigger[TRIGGER_CLICK]` now accurately reflecting the click state, `_leave()` will not hide a click-activated popover when the mouse leaves the trigger element. The popover will now correctly remain open until a subsequent click closes it. * Removed `test-popover.html` * Fix linting issues * Add unit test --------- Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com> Co-authored-by: Julien Déramond <[email protected]>
1 parent 3c1e178 commit 13aa16a

File tree

2 files changed

+26
-1
lines changed

2 files changed

+26
-1
lines changed

js/src/tooltip.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@ class Tooltip extends BaseComponent {
448448
if (trigger === 'click') {
449449
EventHandler.on(this._element, this.constructor.eventName(EVENT_CLICK), this._config.selector, event => {
450450
const context = this._initializeOnDelegatedTarget(event)
451+
context._activeTrigger[TRIGGER_CLICK] = !(context._isShown() && context._activeTrigger[TRIGGER_CLICK])
451452
context.toggle()
452453
})
453454
} else if (trigger !== TRIGGER_MANUAL) {

js/tests/unit/popover.spec.js

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import EventHandler from '../../src/dom/event-handler.js'
22
import Popover from '../../src/popover.js'
3-
import { clearFixture, getFixture, jQueryMock } from '../helpers/fixture.js'
3+
import {
4+
clearFixture, getFixture, jQueryMock, createEvent
5+
} from '../helpers/fixture.js'
46

57
describe('Popover', () => {
68
let fixtureEl
@@ -313,6 +315,28 @@ describe('Popover', () => {
313315
popover.show()
314316
})
315317
})
318+
319+
it('should keep popover open when mouse leaves after click trigger', () => {
320+
return new Promise(resolve => {
321+
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://x.com/getbootstrap" data-bs-trigger="hover click">BS X</a>'
322+
323+
const popoverEl = fixtureEl.querySelector('a')
324+
new Popover(popoverEl) // eslint-disable-line no-new
325+
326+
popoverEl.addEventListener('shown.bs.popover', () => {
327+
popoverEl.dispatchEvent(createEvent('mouseout'))
328+
329+
popoverEl.addEventListener('hide.bs.popover', () => {
330+
throw new Error('Popover should not hide when mouse leaves after click')
331+
})
332+
333+
expect(document.querySelector('.popover')).not.toBeNull()
334+
resolve()
335+
})
336+
337+
popoverEl.click()
338+
})
339+
})
316340
})
317341

318342
describe('hide', () => {

0 commit comments

Comments
 (0)