Skip to content

Commit

Permalink
Fix tooltip manual toggling (#37086)
Browse files Browse the repository at this point in the history
partial regression of SHA: 9b9372e
  • Loading branch information
GeoSot committed Sep 7, 2022
1 parent 7a7469b commit 9494569
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions js/src/tooltip.js
Expand Up @@ -111,7 +111,7 @@ class Tooltip extends BaseComponent {
// Private
this._isEnabled = true
this._timeout = 0
this._isHovered = false
this._isHovered = null
this._activeTrigger = {}
this._popper = null
this._templateFactory = null
Expand Down Expand Up @@ -246,14 +246,13 @@ class Tooltip extends BaseComponent {
}

const complete = () => {
const previousHoverState = this._isHovered

this._isHovered = false
EventHandler.trigger(this._element, this.constructor.eventName(EVENT_SHOWN))

if (previousHoverState) {
if (this._isHovered === false) {
this._leave()
}

this._isHovered = false
}

this._queueCallback(complete, this.tip, this._isAnimated())
Expand Down Expand Up @@ -283,7 +282,7 @@ class Tooltip extends BaseComponent {
this._activeTrigger[TRIGGER_CLICK] = false
this._activeTrigger[TRIGGER_FOCUS] = false
this._activeTrigger[TRIGGER_HOVER] = false
this._isHovered = false
this._isHovered = null // it is a trick to support manual triggering

const complete = () => {
if (this._isWithActiveTrigger()) {
Expand Down

0 comments on commit 9494569

Please sign in to comment.