Skip to content

Fix keyboard shortcuts snackbar text showing stale values #3165

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
taneliang merged 3 commits into from
Jan 16, 2021
Merged

Fix keyboard shortcuts snackbar text showing stale values #3165

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1dd00c
Fix keyboard shortcuts toggle snackbar text
chrisgzf Jan 16, 2021
c282a2d
Fix review comments
chrisgzf Jan 16, 2021
a7c7814
Merge branch 'master' into fix-nightmode-toggle-text
taneliang Jan 16, 2021
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
15 changes: 11 additions & 4 deletions website/src/views/components/KeyboardShortcuts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { memo, useCallback, useEffect, useRef, useState } from 'react';
import { useHistory } from 'react-router-dom';
import { useDispatch, useSelector } from 'react-redux';
import { useDispatch, useStore } from 'react-redux';
import Mousetrap from 'mousetrap';
import { groupBy, map } from 'lodash';

Expand Down Expand Up @@ -33,8 +33,7 @@ const KeyboardShortcuts: React.FC = () => {
const [helpShown, setHelpShown] = useState(false);
const closeModal = useCallback(() => setHelpShown(false), []);

const mode = useSelector(({ settings }: State) => settings.mode);
const themeId = useSelector(({ theme }: State) => theme.id);
const store = useStore<State>();
const dispatch = useDispatch();

const history = useHistory();
Expand Down Expand Up @@ -102,6 +101,10 @@ const KeyboardShortcuts: React.FC = () => {
bind('x', APPEARANCE, 'Toggle Night Mode', () => {
dispatch(toggleMode());

// We fetch the current mode from the redux store directly, instead of
// using useSelector, as useSelector will capture the old stale value
const { mode } = store.getState().settings;

dispatch(
openNotification(`Night mode ${mode === DARK_MODE ? 'on' : 'off'}`, {
overwritable: true,
Expand All @@ -111,7 +114,11 @@ const KeyboardShortcuts: React.FC = () => {

// Cycle through themes
function notifyThemeChange() {
// We fetch the current theme id from the redux store directly, instead of
// using useSelector, as useSelector will capture the old stale value
const themeId = store.getState().theme.id;
const theme = themes.find((t) => t.id === themeId);

if (theme) {
dispatch(
openNotification(`Theme switched to ${theme.name}`, {
Expand Down Expand Up @@ -141,7 +148,7 @@ const KeyboardShortcuts: React.FC = () => {
shortcuts.current.forEach(({ key }) => Mousetrap.unbind(key));
shortcuts.current = [];
};
}, [dispatch, helpShown, mode, history, themeId]);
}, [dispatch, helpShown, history, store]);

function renderShortcut(shortcut: Shortcut): React.ReactNode {
if (typeof shortcut === 'string') {
Expand Down