Skip to content

ROX-16515: Temporarily hide dark mode #6432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vjwilson merged 1 commit into from
Jun 10, 2023
Merged

ROX-16515: Temporarily hide dark mode #6432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions ui/apps/platform/src/Containers/MainPage/Header/MastheadToolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ import ClusterStatusProblems from './ClusterStatusProblems';
import GlobalSearchButton from './GlobalSearchButton';
import HelpMenu from './HelpMenu';
import OrchestratorComponentsToggle from './OrchestratorComponentsToggle';
/*
* TODO: remove this comment, which hides the light-mode/dark-mode toggle import,
* after we update to use PatternFly themes for dark mode
import ThemeToggleButton from './ThemeToggleButton';
*/
import UserMenu from './UserMenu';

function MastheadToolbar(): ReactElement {
Expand All @@ -38,9 +42,13 @@ function MastheadToolbar(): ReactElement {
<PageHeaderToolsItem>
<CLIDownloadMenu />
</PageHeaderToolsItem>
{/*
* TODO: remove this comment, which hides the light-mode/dark-mode toggle,
* after we update to use PatternFly themes for dark mode
<PageHeaderToolsItem>
<ThemeToggleButton />
</PageHeaderToolsItem>
*/}
<PageHeaderToolsItem>
<ClusterStatusProblems />
</PageHeaderToolsItem>
Expand Down
11 changes: 10 additions & 1 deletion ui/apps/platform/src/Containers/ThemeProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ const useEffectDarkMode = () => {
// default to light mode.
isDarkMode = darkModeValue === 'true';
}

// TODO: remove this override for never dark-mode, after we update to use PatternFly themes for dark mode
isDarkMode = false;

setThemeState({ isDarkMode, hasThemeMounted: true });
}, [userPrefersDarkMode]);

Expand All @@ -50,7 +54,12 @@ const ThemeProvider = ({ children }) => {

const toggle = () => {
const prevTheme = getTheme(themeState.isDarkMode);
const darkModeToggled = !themeState.isDarkMode;

// TODO: remove this override for never dark-mode, ` && false`
// after we update to use PatternFly themes for dark mode

const darkModeToggled = !themeState.isDarkMode && false;

localStorage.setItem(DARK_MODE_KEY, JSON.stringify(darkModeToggled));
document.body.classList.remove(prevTheme);
setThemeState({ ...themeState, isDarkMode: darkModeToggled });
Expand Down