feat: added theme switcher with match-system option #1273
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| <starlight-theme-select> | ||
| <label style='width: 6.25em'> | ||
| <span class="sr-only">Выберите тему</span> | ||
| <select value="auto" width="6.25em"> | ||
| <option value="dark">Темная тема</option> | ||
| <option value="light">Светлая тема</option> | ||
| <option value="auto">Системная тема</option> | ||
| </select> | ||
| </label> | ||
| </starlight-theme-select> | ||
|
|
||
|
|
||
| <script> | ||
| const storageKey = 'theme'; | ||
|
|
||
| const parseTheme = (theme) => | ||
| theme === 'auto' || theme === 'dark' || theme === 'light' ? theme : 'auto'; | ||
|
|
||
| const loadTheme = () => | ||
| parseTheme(typeof localStorage !== 'undefined' && localStorage.getItem(storageKey)); | ||
|
There was a problem hiding this comment. Выше уже писал, предлагаю юзать |
||
|
|
||
| function storeTheme(theme) { | ||
| if (typeof localStorage !== 'undefined') { | ||
| localStorage.setItem(storageKey, theme === 'light' || theme === 'dark' ? theme : ''); | ||
| } | ||
| } | ||
|
Comment on lines
+22
to
+26
There was a problem hiding this comment. зачем это в глобальной видимости? |
||
|
|
||
| const getPreferredColorScheme = () => | ||
| matchMedia('(prefers-color-scheme: light)').matches ? 'light' : 'dark'; | ||
|
|
||
| matchMedia(`(prefers-color-scheme: light)`).addEventListener('change', () => { | ||
| if (loadTheme() === 'auto') onThemeChange('auto'); | ||
|
There was a problem hiding this comment.
|
||
| }); | ||
|
|
||
| class StarlightThemeProvider { | ||
| storedTheme = loadTheme(); | ||
|
|
||
| constructor() { | ||
| const theme = this.storedTheme || | ||
| (window.matchMedia('(prefers-color-scheme: light)').matches ? 'light' : 'dark'); | ||
| document.documentElement.dataset.theme = theme === 'light' ? 'light' : 'dark'; | ||
|
There was a problem hiding this comment.
|
||
| } | ||
|
|
||
| updatePickers(theme = this.storedTheme || 'auto') { | ||
| document.querySelectorAll('starlight-theme-select').forEach((picker) => { | ||
| console.log('picker', picker); | ||
|
There was a problem hiding this comment. Надо бы кильнуть, пакер не убирает логи из продакшен-бандла |
||
| const select = picker.querySelector('select'); | ||
| if (select) select.value = theme; | ||
|
|
||
| /** @type {HTMLTemplateElement | null} */ | ||
| const tmpl = document.querySelector(`#theme-icons`); | ||
| const newIcon = tmpl && tmpl.content.querySelector('.' + theme); | ||
| if (newIcon) { | ||
| const oldIcon = picker.querySelector('starlight-theme-select i.label-icon'); | ||
| if (oldIcon) { | ||
| oldIcon.replaceChildren(...newIcon.cloneNode(true).childNodes); | ||
| } | ||
| } | ||
|
Comment on lines
+51
to
+58
|
||
| }); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| class StarlightThemeSelect extends HTMLElement { | ||
| themeProvider = new StarlightThemeProvider(); | ||
|
|
||
| constructor() { | ||
| super(); | ||
| this.onThemeChange(loadTheme()); | ||
| this.querySelector('select')?.addEventListener('change', (e) => { | ||
|
|
||
| if (e.currentTarget instanceof HTMLSelectElement) { | ||
|
There was a problem hiding this comment. событие |
||
| this.onThemeChange(parseTheme(e.currentTarget.value)); | ||
| } | ||
| }); | ||
|
|
||
| this.themeProvider.updatePickers(loadTheme()); | ||
|
|
||
| matchMedia(`(prefers-color-scheme: light)`).addEventListener('change', () => { | ||
| if (loadTheme() === 'auto') this.onThemeChange('auto'); | ||
| }); | ||
| } | ||
|
|
||
| onThemeChange(theme) { | ||
| this.themeProvider.updatePickers(theme); | ||
| document.documentElement.setAttribute("theme", theme === 'auto' ? getPreferredColorScheme() : theme); | ||
| storeTheme(theme); | ||
| } | ||
| } | ||
| customElements.define('starlight-theme-select', StarlightThemeSelect); | ||
| </script> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| <template> | ||
| <label style="width: 6.25em"> | ||
| <span class="sr-only">Выберите тему</span> | ||
| <select value="auto" width="6.25em" @input="setTheme"> | ||
| <option value="dark">Темная тема</option> | ||
| <option value="light">Светлая тема</option> | ||
| <option value="auto">Системная тема</option> | ||
| </select> | ||
| </label> | ||
| </template> | ||
|
|
||
| <script> | ||
| const storageKey = "theme"; | ||
|
|
||
| const parseTheme = (theme) => (theme === "auto" || theme === "dark" || theme === "light" ? theme : "auto"); | ||
|
|
||
| const loadTheme = () => parseTheme(typeof localStorage !== "undefined" && localStorage.getItem(storageKey)); | ||
|
|
||
| function storeTheme(theme) { | ||
| if (typeof localStorage !== "undefined") { | ||
| localStorage.setItem(storageKey, theme === "light" || theme === "dark" ? theme : ""); | ||
| } | ||
| } | ||
|
|
||
| const getPreferredColorScheme = () => (matchMedia("(prefers-color-scheme: light)").matches ? "light" : "dark"); | ||
|
|
||
| matchMedia(`(prefers-color-scheme: light)`).addEventListener("change", () => { | ||
| if (loadTheme() === "auto") onThemeChange("auto"); | ||
| }); | ||
|
|
||
| // class ThemeProvider { | ||
| // storedTheme = loadTheme(); | ||
|
|
||
| // constructor() { | ||
| // const theme = | ||
| // this.storedTheme || (window.matchMedia("(prefers-color-scheme: light)").matches ? "light" : "dark"); | ||
| // document.documentElement.dataset.theme = theme === "light" ? "light" : "dark"; | ||
| // } | ||
|
|
||
| // updatePickers(theme = this.storedTheme || "auto") { | ||
| // document.querySelectorAll("starlight-theme-select").forEach((picker) => { | ||
| // console.log("picker", picker); | ||
| // const select = picker.querySelector("select"); | ||
| // if (select) select.value = theme; | ||
|
|
||
| // /** @type {HTMLTemplateElement | null} */ | ||
| // const tmpl = document.querySelector(`#theme-icons`); | ||
| // const newIcon = tmpl && tmpl.content.querySelector("." + theme); | ||
| // if (newIcon) { | ||
| // const oldIcon = picker.querySelector("starlight-theme-select i.label-icon"); | ||
| // if (oldIcon) { | ||
| // oldIcon.replaceChildren(...newIcon.cloneNode(true).childNodes); | ||
| // } | ||
| // } | ||
| // }); | ||
| // } | ||
| // } | ||
|
|
||
| // const themeProvider = new ThemeProvider(); | ||
|
|
||
| export default { | ||
| name: "PostUpvote", | ||
| props: {}, | ||
| data() { | ||
| const theme = loadTheme(); | ||
| onThemeChange(theme); | ||
| // themeProvider.updatePickers(theme); | ||
| }, | ||
| methods: { | ||
| setTheme(option) { | ||
| if (!option) { | ||
| return; | ||
| } | ||
|
|
||
| const theme = parseTheme(option.value); | ||
|
|
||
| onThemeChange(theme); | ||
| // themeProvider.updatePickers(theme); | ||
| document.documentElement.setAttribute("theme", theme === "auto" ? getPreferredColorScheme() : theme); | ||
| storeTheme(theme); | ||
| }, | ||
| }, | ||
| }; | ||
| </script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
В некоторых местах далее проверяется
typeof localStorage !== 'undefined'перед юзанием LS. Предлагаю что тут, что далее юзатьnullsafe, т.е. вместо проверок и дерева изif, просто юзать