Fix theme picker text when unspecified theme #42671
Merged
Conversation
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
avatus
added
backport-required
no-changelog
avatus
requested review from
ryanclark,
kimlisa and
rudream
and removed request for
ravicious and
ibeckermayer
ryanclark
reviewed
Jun 10, 2024
zmb3
reviewed
Jun 10, 2024
| @@ -39,6 +39,23 @@ function themePreferenceToTheme(themePreference: Theme) { | |||
| return themePreference === Theme.LIGHT ? lightTheme : darkTheme; | |||
| } | |||
|
|
|||
| // because unspecific can exist but only used as a fallback and not an option, | |||
There was a problem hiding this comment.
Suggested change
| // because unspecific can exist but only used as a fallback and not an option, | |
| // because unspecified can exist but only used as a fallback and not an option, |
zmb3
reviewed
Jun 10, 2024
| if (currentTheme === Theme.UNSPECIFIED) { | ||
| return getPrefersDark() ? Theme.DARK : Theme.LIGHT; | ||
| } | ||
| } |
There was a problem hiding this comment.
Are you intentionally not returning anything if currentTheme !== Theme.UNSPECIFIED?
ryanclark
reviewed
Jun 11, 2024
Comment on lines
55
to
58
| if (currentTheme === Theme.UNSPECIFIED) { | ||
| return getPrefersDark() ? Theme.LIGHT : Theme.DARK; | ||
| } | ||
| return currentTheme === Theme.LIGHT ? Theme.DARK : Theme.LIGHT; |
There was a problem hiding this comment.
Can this be
Suggested change
| if (currentTheme === Theme.UNSPECIFIED) { | |
| return getPrefersDark() ? Theme.LIGHT : Theme.DARK; | |
| } | |
| return currentTheme === Theme.LIGHT ? Theme.DARK : Theme.LIGHT; | |
| return getCurrentTheme(currentTheme) === Theme.LIGHT ? Theme.DARK : Theme.LIGHT; |
|
friendly ping @ryanclark @kimlisa @rudream |
kimlisa
reviewed
Jun 17, 2024
| // and remove the checks for unspecified | ||
| export function getCurrentTheme(currentTheme: Theme): Theme { | ||
| if (currentTheme === Theme.UNSPECIFIED) { | ||
| return getPrefersDark() ? Theme.DARK : Theme.LIGHT; |
There was a problem hiding this comment.
how do i test this? i created a new user, and it defaulted to light theme (using brave)
nvm it worked, not sure what happened before lol.
when i do this flow:
new user -> login -> switch theme
the first click did not work, i had to click a second time to switch the theme
There was a problem hiding this comment.
I wasn't able to reproduce this first click not working in incognito or normal mode
kimlisa
approved these changes
Jun 17, 2024
|
friendly ping @ryanclark |
ryanclark
approved these changes
Jun 18, 2024
public-teleport-github-review-bot
bot
removed the request for review
from rudream
Merged
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.
Fixes #42395
Currently, we work under the assumption that the theme is a binary decision between light/dark. The default user theme is now
UNSPECIFIEDwhich will default to the system theme. This PR adds a few utility options to get the current/next theme with this unspecified in mind. We can remove them once we add the user settings page to make "use system theme" a valid option to select.To test, you can create a new user in an incognito window. The theme should be whatever your system theme is. Also, the theme selector should know which theme is being used a properly show text for what the next theme should be.