Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 17 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 43 additions & 7 deletions src/docs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@ class DocsAfterDark {

registerStorageListener(this.handleStorageUpdate);
registerMessageListener(this.handleMessageUpdate);

window
.matchMedia("(prefers-color-scheme: dark)")
.addEventListener("change", this.handleSystemThemeChange);
}

private raiseButton(raise: boolean) {
Expand Down Expand Up @@ -177,6 +181,12 @@ class DocsAfterDark {
});
}

private handleSystemThemeChange = () => {
if (this.extensionData.mode === ExtensionMode.Auto) {
this.updateExtension();
}
};

private handleMessageUpdate: MessageListener = (message) => {
Logger.debug("Update via message:", message);

Expand Down Expand Up @@ -348,6 +358,15 @@ class DocsAfterDark {
this.updateButton();
}

private resolveMode(): ExtensionMode {
if (this.extensionData.mode !== ExtensionMode.Auto) {
return this.extensionData.mode;
}
return window.matchMedia("(prefers-color-scheme: dark)").matches
? ExtensionMode.Dark
: ExtensionMode.Light;
}

private updateMode(): boolean {
this.resetMode();

Expand All @@ -361,13 +380,15 @@ class DocsAfterDark {
addClassToHTML(enabledClass);
insertStylesheet("docs.bundle.css", "stylesheet");

if (this.extensionData.mode === ExtensionMode.Dark) {
const effectiveMode = this.resolveMode();

if (effectiveMode === ExtensionMode.Dark) {
this.updateDarkMode();
} else if (this.extensionData.mode === ExtensionMode.Light) {
} else if (effectiveMode === ExtensionMode.Light) {
this.updateLightMode();
} else {
throw new Error(
"Unknown extension operation: " + this.extensionData.mode
"Unknown extension operation: " + effectiveMode
);
}

Expand All @@ -379,26 +400,41 @@ class DocsAfterDark {
}

private updateDocumentBackground() {
if (this.extensionData.doc_bg == DocumentBackground.Custom) {
let docBg = this.extensionData.doc_bg;
if (this.extensionData.mode === ExtensionMode.Auto) {
docBg =
this.resolveMode() === ExtensionMode.Dark
? DocumentBackground.Blend
: DocumentBackground.Default;
}

if (docBg == DocumentBackground.Custom) {
setStyleProperty(
"documentBackground",
this.extensionData.custom_bg ?? ""
);
} else {
setStyleProperty(
"documentBackground",
documentBackgroundStyles[this.extensionData.doc_bg]
documentBackgroundStyles[docBg]
);
}
}

private updateDocumentInvert() {
if (!this.extensionData.invert_enabled) {
let invertEnabled = this.extensionData.invert_enabled;
let invertMode = this.extensionData.invert_mode;
if (this.extensionData.mode === ExtensionMode.Auto) {
invertEnabled = this.resolveMode() === ExtensionMode.Dark;
invertMode = defaultExtensionData.invert_mode;
}

if (!invertEnabled) {
setStyleProperty("documentInvert", documentInvert.off);
return;
}

switch (this.extensionData.invert_mode) {
switch (invertMode) {
case InvertMode.Gray:
setStyleProperty("documentInvert", documentInvert.grayscale);
break;
Expand Down
1 change: 1 addition & 0 deletions src/popup.html
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ <h3 class="sectionTitle">Global Toggle</h3>
<button id="modeLight" value="light">
Light
</button>
<button id="modeAuto" value="auto">Auto</button>
<button id="modeOff" value="off">Off</button>
</div>
</div>
Expand Down
14 changes: 11 additions & 3 deletions src/popup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class toggleCategoryComponent {

class ModeComponent extends StateSubscriber {
private modeButtons = document.querySelectorAll(
"#modeDark, #modeLight, #modeOff"
"#modeDark, #modeLight, #modeAuto, #modeOff"
) as NodeListOf<HTMLButtonElement>;

initialize() {
Expand Down Expand Up @@ -138,6 +138,9 @@ class ModeComponent extends StateSubscriber {
invert_enabled: false,
});
break;
case "auto":
this.state.setData({ mode: ExtensionMode.Auto });
break;
}
});
});
Expand All @@ -151,7 +154,9 @@ class ModeComponent extends StateSubscriber {
(button.value == "off" && newData.mode == ExtensionMode.Off) ||
(button.value == "dark" &&
newData.mode == ExtensionMode.Dark) ||
(button.value == "light" && newData.mode == ExtensionMode.Light)
(button.value == "light" &&
newData.mode == ExtensionMode.Light) ||
(button.value == "auto" && newData.mode == ExtensionMode.Auto)
) {
button.classList.add("selected");
}
Expand Down Expand Up @@ -184,7 +189,10 @@ class DarkModeComponent extends StateSubscriber {
update(newData: ExtensionData): void {
this.resetAppearance();

if (newData.mode != ExtensionMode.Dark) {
if (
newData.mode != ExtensionMode.Dark &&
newData.mode != ExtensionMode.Auto
) {
this.section.classList.add("hidden");
}

Expand Down
1 change: 1 addition & 0 deletions src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ enum ExtensionMode {
Off = 0,
Light = 1,
Dark = 2,
Auto = 3,
}

enum DarkModeOperation {
Expand Down
Loading