Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle non-empty whitespace textContent in Tooltip trigger #36588

Merged
merged 3 commits into from Jul 6, 2022
Merged

Handle non-empty whitespace textContent in Tooltip trigger #36588

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38bb726
Handle non-empty whitespace textContent in Tooltip trigger
nwalters512 Jun 15, 2022
2c072a2
Add test case
nwalters512 Jun 23, 2022
368be9b
Merge branch 'main' into fix-tooltip-label
julien-deramond Jul 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion js/src/tooltip.js
View file
Open in desktop
Expand Up @@ -518,7 +518,7 @@ class Tooltip extends BaseComponent {
return
}

if (!this._element.getAttribute('aria-label') && !this._element.textContent) {
if (!this._element.getAttribute('aria-label') && !this._element.textContent.trim()) {
this._element.setAttribute('aria-label', title)
}

Expand Down
19 changes: 19 additions & 0 deletions js/tests/unit/tooltip.spec.js
View file
Open in desktop
Expand Up @@ -1358,6 +1358,25 @@ describe('Tooltip', () => {
})
})

it('should add the aria-label attribute when element text content is a whitespace string', () => {
return new Promise(resolve => {
fixtureEl.innerHTML = '<a href="#" rel="tooltip" title="A tooltip"><span> </span></a>'

const tooltipEl = fixtureEl.querySelector('a')
const tooltip = new Tooltip(tooltipEl)

tooltipEl.addEventListener('shown.bs.tooltip', () => {
const tooltipShown = document.querySelector('.tooltip')

expect(tooltipShown).not.toBeNull()
expect(tooltipEl.getAttribute('aria-label')).toEqual('A tooltip')
resolve()
})

tooltip.show()
})
})

it('should not add the aria-label attribute if the attribute already exists', () => {
return new Promise(resolve => {
fixtureEl.innerHTML = '<a href="#" rel="tooltip" aria-label="Different label" title="Another tooltip"></a>'
Expand Down