Skip to content

fix(watch-later): inject button outside aria-hidden anchor (#4305) #4307

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

Open
shoaibyazdani wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(watch-later): inject button outside aria-hidden anchor (#4305) #4307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions js&css/extension/www.youtube.com/general/general.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,13 +460,14 @@ extension.features.watchLaterButtons = function (event) {
}

function addWatchLaterButton(thumbnail) {
var videoId = thumbnail ? getVideoId(thumbnail.href) : null;
var videoId = thumbnail ? getVideoId(thumbnail.href) : null,
container = thumbnail ? thumbnail.parentElement : null;

if (thumbnail && thumbnail.itWatchLaterButton && !thumbnail.contains(thumbnail.itWatchLaterButton)) {
if (thumbnail && thumbnail.itWatchLaterButton && (!container || !container.contains(thumbnail.itWatchLaterButton))) {
thumbnail.itWatchLaterButton = null;
}

if (thumbnail && videoId && !thumbnail.itWatchLaterButton) {
if (thumbnail && videoId && container && !thumbnail.itWatchLaterButton) {
var button = document.createElement('button'),
svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg'),
path = document.createElementNS('http://www.w3.org/2000/svg', 'path');
Expand All @@ -481,11 +482,17 @@ extension.features.watchLaterButtons = function (event) {
path.setAttribute('d', 'M12 2a10 10 0 1 0 10 10A10 10 0 0 0 12 2Zm0 18.2A8.2 8.2 0 1 1 20.2 12 8.2 8.2 0 0 1 12 20.2Zm.7-13.2h-1.8v5.8l5 3 .9-1.5-4.1-2.4Z');
svg.appendChild(path);
button.appendChild(svg);
thumbnail.appendChild(button);
// Append to the thumbnail's parent container (the renderer) rather than
// the thumbnail anchor itself: YouTube marks the anchor with
// aria-hidden="true", so injecting a focusable button as a direct child
// triggers "Blocked aria-hidden on an element because its descendant
// retained focus" in the console. Visual placement is unaffected because
// the button is positioned absolutely relative to a higher ancestor.
container.appendChild(button);
thumbnail.itWatchLaterButton = button;

button.addEventListener('click', function (clickEvent) {
var nativeButton = findNativeWatchLaterButton(this.parentElement),
var nativeButton = findNativeWatchLaterButton(container),
id = this.dataset.id;

clickEvent.preventDefault();
Expand Down
10 changes: 10 additions & 0 deletions tests/unit/watch-later-buttons.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,14 @@ describe('Watch Later thumbnail buttons', () => {
expect(generalCss).toContain("html[it-watch-later-buttons='hover']");
expect(generalCss).toContain("html[it-watch-later-buttons='always']");
});

test('injects button outside the aria-hidden thumbnail anchor (#4305)', () => {
// The button must be appended to the thumbnail's parent container, not
// directly to the anchor itself. YouTube marks the anchor with
// aria-hidden="true", so a focusable button inside it triggers the
// "Blocked aria-hidden on an element because its descendant retained
// focus" warning when clicked.
expect(generalJs).not.toMatch(/thumbnail\.appendChild\s*\(\s*button\s*\)/);
expect(generalJs).toMatch(/(?:container|parentElement)\.appendChild\s*\(\s*button\s*\)/);
});
});