Skip to content

feat(dark-theme): replace dark theme switcher with toggle group #3788

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
evwilkin merged 1 commit into from
Nov 1, 2023
Merged

feat(dark-theme): replace dark theme switcher with toggle group #3788

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
6 changes: 6 additions & 0 deletions packages/documentation-framework/layouts/sideNavLayout/sideNavLayout.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,9 @@
--pf-v5-c-switch__input--not-checked__label--Color: var(--pf-v5-global--Color--100);
--pf-v5-c-switch__input--checked__label--Color: var(--pf-v5-global--Color--100);
}

.ws-masthead .pf-v5-c-toggle-group {
--pf-v5-c-toggle-group__button--m-selected--BackgroundColor: var(--pf-v5-global--palette--blue-400);
--pf-v5-c-toggle-group__button--focus--BackgroundColor: transparent;
--pf-v5-c-toggle-group__button--hover--BackgroundColor: transparent;
}
Comment on lines +46 to +50
Copy link
Collaborator Author

@wise-king-sullyman wise-king-sullyman Oct 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Custom styling needed because otherwise the background colors on top of the dark masthead when in light mode looks off
image

20 changes: 17 additions & 3 deletions packages/documentation-framework/layouts/sideNavLayout/sideNavLayout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
DropdownGroup,
DropdownList,
Divider,
Icon,
Masthead,
MastheadToggle,
MastheadMain,
Expand All @@ -23,10 +24,14 @@ import {
ToolbarItem,
SkipToContent,
Switch,
SearchInput
SearchInput,
ToggleGroup,
ToggleGroupItem
} from '@patternfly/react-core';
import BarsIcon from '@patternfly/react-icons/dist/esm/icons/bars-icon';
import GithubIcon from '@patternfly/react-icons/dist/esm/icons/github-icon';
import MoonIcon from '@patternfly/react-icons/dist/esm/icons/moon-icon';
import SunIcon from '@patternfly/react-icons/dist/esm/icons/sun-icon';
import { SideNav, TopNav, GdprBanner } from '../../components';
import staticVersions from '../../versions.json';
import v5Logo from '../PF-HorizontalLogo-Reverse.svg';
Expand All @@ -50,6 +55,7 @@ const HeaderTools = ({
const [isDropdownOpen, setDropdownOpen] = useState(false);
const [searchValue, setSearchValue] = React.useState('');
const [isSearchExpanded, setIsSearchExpanded] = React.useState(false);
const [isDarkTheme, setIsDarkTheme] = React.useState(false);

const getDropdownItem = (version, isLatest = false) => (
<DropdownItem itemId={version.name} key={version.name} to={isLatest ? '/' : `/${version.name}`}>
Expand All @@ -65,6 +71,12 @@ const HeaderTools = ({
setIsSearchExpanded(!isSearchExpanded);
};

const toggleDarkTheme = (_evt, selected) => {
const darkThemeToggleClicked = !selected === isDarkTheme
Copy link
Member

@evwilkin evwilkin Oct 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggest adding a semicolon for consistency, otherwise LGTM

Suggested change
const darkThemeToggleClicked = !selected === isDarkTheme
const darkThemeToggleClicked = !selected === isDarkTheme;

document.querySelector('html').classList.toggle('pf-v5-theme-dark', darkThemeToggleClicked);
setIsDarkTheme(darkThemeToggleClicked);
};

useEffect(() => {
// reattach algolia to input each time search is expanded
if (hasSearch && isSearchExpanded) {
Expand All @@ -86,8 +98,10 @@ const HeaderTools = ({
>
{hasDarkThemeSwitcher && (
<ToolbarItem>
<Switch id="ws-theme-switch" label="Dark theme" defaultChecked={false} onChange={() =>
document.querySelector('html').classList.toggle('pf-v5-theme-dark')} />
<ToggleGroup aria-label="Dark theme toggle group">
<ToggleGroupItem aria-label="light theme toggle" icon={<Icon size="md"><SunIcon /></Icon>} isSelected={!isDarkTheme} onChange={toggleDarkTheme} />
<ToggleGroupItem aria-label="dark theme toggle" icon={<Icon size="md"><MoonIcon /></Icon>} isSelected={isDarkTheme} onChange={toggleDarkTheme} />
</ToggleGroup>
</ToolbarItem>
)}
{hasRTLSwitcher && (
Expand Down