Skip to content

Fix: Defer observer init until whitelist check to prevent hydration e… #206

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
hichem-zahaf wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Defer observer init until whitelist check to prevent hydration e… #206

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
6 changes: 5 additions & 1 deletion src/content.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ const attachAllListeners = () => {

if (window.self === window.top) {
attachAllListeners();
initMutationObserver();

// Initialize settings first, observer only after whitelist check
Settings.init()
.then((settings) => {
if (
Expand All @@ -37,6 +38,9 @@ if (window.self === window.top) {
return;
}

// Only init observer after whitelist check passes
initMutationObserver();

// turn on/off the extension
settings.toggleOnOffStatus();
})
Expand Down
4 changes: 4 additions & 0 deletions src/modules/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ class Settings {
return this._settings.whitelist;
}

isWhitelisted(hostname) {
return this._settings.whitelist?.includes(hostname);
}

getSettings() {
return this._settings;
}
Expand Down