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

Use aria-label for Preferences selector #2181

Merged
merged 4 commits into from
Nov 30, 2024
Merged

Use aria-label for Preferences selector #2181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdd43a2
Use aria-label for Preferences selector
mquevill May 28, 2024
149d71e
Merge branch 'main' into UpdatePreferencesSelector
mquevill Nov 29, 2024
d804634
Remove note about fragile selector
mquevill Nov 29, 2024
1f11a69
Merge branch 'main' into UpdatePreferencesSelector
mquevill Nov 29, 2024
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
7 changes: 1 addition & 6 deletions source/browser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,11 +222,6 @@ async function openHiddenPreferences(): Promise<boolean> {
if (!isPreferencesOpen()) {
document.documentElement.classList.add('hide-preferences-window');

const style = document.createElement('style');
// Hide both the backdrop and the preferences dialog
style.textContent = `${selectors.preferencesSelector} ._3ixn, ${selectors.preferencesSelector} ._59s7 { opacity: 0 !important }`;
document.body.append(style);

await openPreferences();

return true;
Expand Down Expand Up @@ -661,7 +656,7 @@ async function openPreferences(): Promise<void> {
}

function isPreferencesOpen(): boolean {
return Boolean(document.querySelector<HTMLElement>('[aria-label=Preferences]'));
return Boolean(document.querySelector<HTMLElement>(selectors.preferencesSelector));
}

async function closePreferences(): Promise<void> {
Expand Down
3 changes: 1 addition & 2 deletions source/browser/selectors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ export default {
userMenuNewSidebar: '[role=navigation] > div > div:nth-child(2) > div > div > div:nth-child(1) [role=button]',
viewsMenu: '.x9f619.x1n2onr6.x1ja2u2z.x78zum5.xdt5ytf.x2lah0s.x193iq5w.xdj266r',
selectedConversation: '[role=navigation] [role=grid] [role=row] [role=gridcell] [role=link][aria-current=page]',
// ! Very fragile selector (most likely cause of hidden dialog issue)
preferencesSelector: 'div[role=dialog][class="x1n2onr6 x1ja2u2z x1afcbsf x78zum5 xdt5ytf x1a2a7pz x6ikm8r x10wlt62 x71s49j x1jx94hy x1g2kw80 xxadwq3 x16n5opg x3hh19s xl7ujzl x1kl8bxo xhkep3z xb3b7hn xwhkkir xeb55yp x17omtbh"]',
preferencesSelector: '[aria-label=Preferences]',
// TODO: Fix this selector for new design
messengerSoundsSelector: '._374d ._6bkz',
conversationMenuSelectorNewDesign: '[role=menu]',
Expand Down