Skip to content
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

Jump to bottom

Fix theme toggle button bugs #3875

Merged
merged 8 commits into from
May 10, 2023
Merged

Fix theme toggle button bugs #3875

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6299a27
Fix theme icons not synchronised, add hover effect to theme toggle in…
Bestem0r May 7, 2023
d1ebb61
Move theme listener to useEffect, reformat with prettier
Bestem0r May 7, 2023
a7da665
Add empty line before rule
Bestem0r May 8, 2023
2834dea
Refactor background color to use more descriptive name
Bestem0r May 8, 2023
a2931c3
Fix theme icons not synchronised, add hover effect to theme toggle in…
Bestem0r May 7, 2023
6642edc
Move theme listener to useEffect, reformat with prettier
Bestem0r May 7, 2023
aa9c627
Add empty line before rule
Bestem0r May 8, 2023
077e008
Merge remote-tracking branch 'origin/vebjorn/fix/theme-toggle' into v…
Bestem0r May 8, 2023
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
4 changes: 4 additions & 0 deletions app/components/Header/Header.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,14 @@
justify-content: space-between;
align-items: center;
cursor: pointer;
transition: background-color var(--linear-medium);

& button {
padding: 0;
}
&:hover {
background-color: var(--color-gray-1);
}
}

.buttonGroup {
Expand Down
7 changes: 6 additions & 1 deletion app/components/Header/ToggleTheme.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import cx from 'classnames';
import { debounce } from 'lodash';
import { useCallback, useState, useEffect } from 'react';
import { applySelectedTheme, getTheme } from 'app/utils/themeUtils';
import Icon from '../Icon';
Expand Down Expand Up @@ -32,6 +33,10 @@ const ToggleTheme = ({
setIcon(getIcon());
}, []);

window.addEventListener('themeChange', () => {
setIcon(getIcon());
});

Bestem0r marked this conversation as resolved.
Show resolved Hide resolved
const handleThemeChange = useCallback(
(e) => {
e.preventDefault();
Expand All @@ -50,7 +55,7 @@ const ToggleTheme = ({
const props = {
name: 'Endre tema',
className: classN,
onClick: handleThemeChange,
onClick: debounce(handleThemeChange, 200),
};
return isButton ? (
<button {...props}>
Expand Down