Skip to content

Commit 7e3074c

Browse files
GeoSotXhmikosR
authored andcommitted
fix tooltip/popper disposal inconsistencies (#37235)
1 parent 127a816 commit 7e3074c

File tree

1 file changed

+8
-16
lines changed

1 file changed

+8
-16
lines changed

js/src/tooltip.js

+8-16
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,6 @@ class Tooltip extends BaseComponent {
172172

173173
EventHandler.off(this._element.closest(SELECTOR_MODAL), EVENT_MODAL_HIDE, this._hideModalHandler)
174174

175-
if (this.tip) {
176-
this.tip.remove()
177-
}
178-
179175
if (this._element.getAttribute('data-bs-original-title')) {
180176
this._element.setAttribute('title', this._element.getAttribute('data-bs-original-title'))
181177
}
@@ -202,10 +198,7 @@ class Tooltip extends BaseComponent {
202198
}
203199

204200
// todo v6 remove this OR make it optional
205-
if (this.tip) {
206-
this.tip.remove()
207-
this.tip = null
208-
}
201+
this._disposePopper()
209202

210203
const tip = this._getTipElement()
211204

@@ -218,11 +211,7 @@ class Tooltip extends BaseComponent {
218211
EventHandler.trigger(this._element, this.constructor.eventName(EVENT_INSERTED))
219212
}
220213

221-
if (this._popper) {
222-
this._popper.update()
223-
} else {
224-
this._popper = this._createPopper(tip)
225-
}
214+
this._popper = this._createPopper(tip)
226215

227216
tip.classList.add(CLASS_NAME_SHOW)
228217

@@ -281,13 +270,11 @@ class Tooltip extends BaseComponent {
281270
}
282271

283272
if (!this._isHovered) {
284-
tip.remove()
273+
this._disposePopper()
285274
}
286275

287276
this._element.removeAttribute('aria-describedby')
288277
EventHandler.trigger(this._element, this.constructor.eventName(EVENT_HIDDEN))
289-
290-
this._disposePopper()
291278
}
292279

293280
this._queueCallback(complete, this.tip, this._isAnimated())
@@ -612,6 +599,11 @@ class Tooltip extends BaseComponent {
612599
this._popper.destroy()
613600
this._popper = null
614601
}
602+
603+
if (this.tip) {
604+
this.tip.remove()
605+
this.tip = null
606+
}
615607
}
616608

617609
// Static

0 commit comments

Comments
 (0)