diff --git a/js/src/dom/event-handler.js b/js/src/dom/event-handler.js
index b76677858885..5fea03018288 100644
--- a/js/src/dom/event-handler.js
+++ b/js/src/dom/event-handler.js
@@ -94,6 +94,7 @@ function getEvent(element) {
function bootstrapHandler(element, fn) {
return function handler(event) {
+ event.delegateTarget = element
if (handler.oneOff) {
EventHandler.off(element, event.type, fn)
}
@@ -109,6 +110,7 @@ function bootstrapDelegationHandler(element, selector, fn) {
for (let { target } = event; target && target !== this; target = target.parentNode) {
for (let i = domElements.length; i--;) {
if (domElements[i] === target) {
+ event.delegateTarget = target
if (handler.oneOff) {
EventHandler.off(element, event.type, fn)
}
diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index d76679a6a09b..64011796de39 100644
--- a/js/src/tooltip.js
+++ b/js/src/tooltip.js
@@ -194,14 +194,14 @@ class Tooltip {
if (event) {
const dataKey = this.constructor.DATA_KEY
- let context = Data.getData(event.target, dataKey)
+ let context = Data.getData(event.delegateTarget, dataKey)
if (!context) {
context = new this.constructor(
- event.target,
+ event.delegateTarget,
this._getDelegateConfig()
)
- Data.setData(event.target, dataKey, context)
+ Data.setData(event.delegateTarget, dataKey, context)
}
context._activeTrigger.click = !context._activeTrigger.click
@@ -587,14 +587,14 @@ class Tooltip {
_enter(event, context) {
const dataKey = this.constructor.DATA_KEY
- context = context || Data.getData(event.target, dataKey)
+ context = context || Data.getData(event.delegateTarget, dataKey)
if (!context) {
context = new this.constructor(
- event.target,
+ event.delegateTarget,
this._getDelegateConfig()
)
- Data.setData(event.target, dataKey, context)
+ Data.setData(event.delegateTarget, dataKey, context)
}
if (event) {
@@ -627,14 +627,14 @@ class Tooltip {
_leave(event, context) {
const dataKey = this.constructor.DATA_KEY
- context = context || Data.getData(event.target, dataKey)
+ context = context || Data.getData(event.delegateTarget, dataKey)
if (!context) {
context = new this.constructor(
- event.target,
+ event.delegateTarget,
this._getDelegateConfig()
)
- Data.setData(event.target, dataKey, context)
+ Data.setData(event.delegateTarget, dataKey, context)
}
if (event) {
diff --git a/js/tests/unit/tooltip.spec.js b/js/tests/unit/tooltip.spec.js
index e713fe560202..0a98096a405e 100644
--- a/js/tests/unit/tooltip.spec.js
+++ b/js/tests/unit/tooltip.spec.js
@@ -324,6 +324,28 @@ describe('Tooltip', () => {
tooltip.show()
})
+ it('should show a tooltip when hovering a children element', done => {
+ fixtureEl.innerHTML =
+ '' +
+ '' +
+ ''
+
+ const tooltipEl = fixtureEl.querySelector('a')
+ const tooltip = new Tooltip(tooltipEl)
+
+ spyOn(tooltip, 'show')
+
+ tooltipEl.querySelector('rect').dispatchEvent(createEvent('mouseover', { bubbles: true }))
+
+ setTimeout(() => {
+ expect(tooltip.show).toHaveBeenCalled()
+ done()
+ }, 0)
+ })
+
it('should show a tooltip on mobile', done => {
fixtureEl.innerHTML = ''
diff --git a/site/content/docs/5.0/components/tooltips.md b/site/content/docs/5.0/components/tooltips.md
index 384be8781873..19d95e0281d7 100644
--- a/site/content/docs/5.0/components/tooltips.md
+++ b/site/content/docs/5.0/components/tooltips.md
@@ -81,6 +81,17 @@ And with custom HTML added:
{{< /highlight >}}
+With an SVG:
+
+
+
## Usage
The tooltip plugin generates content and markup on demand, and by default places tooltips after their trigger element.