thePR0M3TH3AN/bitvid
1
0 Fork 0
mirror of https://github.com/PR0M3TH3AN/bitvid.git synced 2026-11-03 03:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop closing menus from refocusing unrelated cards

Browse Source
This commit is contained in:
thePR0M3TH3AN committed 2025-10-16 16:43:58 -04:00
1 parent 2b65a85335
commit f9455db2a7
2 files changed
+137 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

js/ui/components/VideoCard.js
+26 -6
View File
@@ -226,8 +226,13 @@ export class VideoCard {
closeMoreMenu(options = {}) {
const restoreFocus = options?.restoreFocus !== false;
const trigger = this.moreMenuButton;
const wasExpanded =
typeof trigger?.getAttribute === "function" &&
trigger.getAttribute("aria-expanded") === "true";
const detail = {
trigger: this.moreMenuButton,
trigger,
video: this.video,
card: this,
restoreFocus,
@@ -247,9 +252,14 @@ export class VideoCard {
}
}
if (!handled && restoreFocus && this.moreMenuButton?.focus) {
if (
!handled &&
restoreFocus &&
wasExpanded &&
typeof trigger?.focus === "function"
) {
try {
this.moreMenuButton.focus();
trigger.focus();
} catch (error) {
/* noop */
}
@@ -258,8 +268,13 @@ export class VideoCard {
closeSettingsMenu(options = {}) {
const restoreFocus = options?.restoreFocus !== false;
const trigger = this.settingsButton;
const wasExpanded =
typeof trigger?.getAttribute === "function" &&
trigger.getAttribute("aria-expanded") === "true";
const detail = {
trigger: this.settingsButton,
trigger,
video: this.video,
card: this,
restoreFocus,
@@ -279,9 +294,14 @@ export class VideoCard {
}
}
if (!handled && restoreFocus && this.settingsButton?.focus) {
if (
!handled &&
restoreFocus &&
wasExpanded &&
typeof trigger?.focus === "function"
) {
try {
this.settingsButton.focus();
trigger.focus();
} catch (error) {
/* noop */
}