[6.x] Fix theme resetting after leaving preferences page - #15579
Merged
Merged
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This pull request fixes an issue where the Control Panel would switch back to the default theme after visiting the preferences page and navigating elsewhere, until the page was refreshed.
This was happening because, when the theme selector was unmounted, it re-applied the theme from the field's initial value. However, the preferences page only contains the preferences saved at that level (eg. the user's own preferences), so when the theme was inherited from a role or the default preferences, the field was empty and the default theme was applied.
This PR fixes it by remembering the server-rendered theme colors when the selector is mounted and restoring them when it's unmounted. Saving preferences reloads the page, so restoring the original colors is always correct.
Before
CleanShot.2026-10-05.at.08.58.31.mp4
After
CleanShot.2026-10-05.at.09.00.49.mp4