[next] feat: use nextcloud-theme-dark var for dark theme computation
#6648
Conversation
This file contains hidden or 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 comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
Signed-off-by: John Molakvoæ <[email protected]>
skjnldsv
force-pushed
the
feat/isDarkTheme
branch
from
3af1c88 to
4942940
Compare
|
/backport to master |
|
Done @ShGKme |
ShGKme
reviewed
Mar 25, 2025
Comment on lines
+23
to
+26
| const darkModeSystemPreference = window?.matchMedia?.('(prefers-color-scheme: dark)')?.matches | ||
| const darkModeAccountSetting = document.body.getAttribute('data-themes')?.includes('dark') | ||
| const darkModeElementOverride = el.closest('[data-theme-dark]') !== null | ||
| return darkModeElementOverride || darkModeAccountSetting || darkModeSystemPreference || false |
There was a problem hiding this comment.
To do lazy checks and not perform x3 DOM API calls
Suggested change
| const darkModeSystemPreference = window?.matchMedia?.('(prefers-color-scheme: dark)')?.matches | |
| const darkModeAccountSetting = document.body.getAttribute('data-themes')?.includes('dark') | |
| const darkModeElementOverride = el.closest('[data-theme-dark]') !== null | |
| return darkModeElementOverride || darkModeAccountSetting || darkModeSystemPreference || false | |
| if (el.closest('[data-theme-dark]') !== null) { | |
| return true | |
| } | |
| if (document.body.getAttribute('data-themes')?.includes('dark')) { | |
| return true | |
| } | |
| if (window.matchMedia('(prefers-color-scheme: dark)')?.matches) { | |
| return true | |
| } | |
| return false |
There was a problem hiding this comment.
Or
Suggested change
| const darkModeSystemPreference = window?.matchMedia?.('(prefers-color-scheme: dark)')?.matches | |
| const darkModeAccountSetting = document.body.getAttribute('data-themes')?.includes('dark') | |
| const darkModeElementOverride = el.closest('[data-theme-dark]') !== null | |
| return darkModeElementOverride || darkModeAccountSetting || darkModeSystemPreference || false | |
| const darkModeSystemPreference = () => window.matchMedia('(prefers-color-scheme: dark)')?.matches | |
| const darkModeAccountSetting = () => document.body.getAttribute('data-themes')?.includes('dark') | |
| const darkModeElementOverride = () => el.closest('[data-theme-dark]') !== null | |
| return darkModeElementOverride() || darkModeAccountSetting() || darkModeSystemPreference() || false |
There was a problem hiding this comment.
// 1. first priority is the data-theme-dark attribute on a parent element
// 2. second priority is the data-themes attribute on the body, aka the user setting
Could you provide with the example where we need 2 and 1 was not enough?
There was a problem hiding this comment.
@ShGKme future proof. The Theming engine have been initially designed so other themes could be added or even provided on the appstore.
The [data-theme-dark] wasn't even properly discussed 🙈
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Require nextcloud/server#51702
On next only so we're compatible with 32 and above? 🤞