rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-18 10:52:19 +01:00
Code Issues Actions Packages Releases Activity

More tooltip refactoring (#35546)

Browse Source 
* Tooltip.js: move `shown` check to method

* Tooltip.js: move Popper's creation to method

* Tooltip.js: merge checks before `hide`

* Tooltip.js: minor refactoring on `toggle` method
This commit is contained in:
GeoSot 2022-01-30 17:39:03 +02:00 committed by GitHub
parent e1020a43a5
commit 74f24cdf24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
js/src/tooltip.js
View File

@ -178,14 +178,16 @@ class Tooltip extends BaseComponent {
} else {
context._leave()
}
} else {
if (this._getTipElement().classList.contains(CLASS_NAME_SHOW)) {
this._leave()
return
}
this._enter()
return
}
if (this._isShown()) {
this._leave()
return
}
this._enter()
}
dispose() {
@ -234,11 +236,7 @@ class Tooltip extends BaseComponent {
if (this._popper) {
this._popper.update()
} else {
const placement = typeof this._config.placement === 'function' ?
this._config.placement.call(this, tip, this._element) :
this._config.placement
const attachment = AttachmentMap[placement.toUpperCase()]
this._popper = Popper.createPopper(this._element, tip, this._getPopperConfig(attachment))
this._createPopper(tip)
}
tip.classList.add(CLASS_NAME_SHOW)
@ -268,7 +266,7 @@ class Tooltip extends BaseComponent {
}
hide() {
if (!this._popper) {
if (!this._isShown()) {
return
}
@ -291,6 +289,7 @@ class Tooltip extends BaseComponent {
this._activeTrigger[TRIGGER_CLICK] = false
this._activeTrigger[TRIGGER_FOCUS] = false
this._activeTrigger[TRIGGER_HOVER] = false
this._isHovered = false
const complete = () => {
if (this._isWithActiveTrigger()) {
@ -308,7 +307,6 @@ class Tooltip extends BaseComponent {
}
this._queueCallback(complete, this.tip, this._isAnimated())
this._isHovered = false
}
update() {
@ -356,7 +354,7 @@ class Tooltip extends BaseComponent {
setContent(content) {
let isShown = false
if (this.tip) {
isShown = this.tip.classList.contains(CLASS_NAME_SHOW)
isShown = this._isShown()
this.tip.remove()
this.tip = null
}
@ -404,6 +402,18 @@ class Tooltip extends BaseComponent {
return this._config.animation || (this.tip && this.tip.classList.contains(CLASS_NAME_FADE))
}
_isShown() {
return this.tip && this.tip.classList.contains(CLASS_NAME_SHOW)
}
_createPopper(tip) {
const placement = typeof this._config.placement === 'function' ?
this._config.placement.call(this, tip, this._element) :
this._config.placement
const attachment = AttachmentMap[placement.toUpperCase()]
this._popper = Popper.createPopper(this._element, tip, this._getPopperConfig(attachment))
}
_getOffset() {
const { offset } = this._config
@ -532,7 +542,7 @@ class Tooltip extends BaseComponent {
}
_enter() {
if (this._getTipElement().classList.contains(CLASS_NAME_SHOW) || this._isHovered) {
if (this._isShown() || this._isHovered) {
this._isHovered = true
return
}