Skip to content

Fix: 25448 ESC keyboard shortcut shows up in modal on second render on login page #26809

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
arosiclair merged 5 commits into from
Sep 12, 2023
Merged

Fix: 25448 ESC keyboard shortcut shows up in modal on second render on login page #26809

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fcf6bff
state for shortcuts
Charan-hs Sep 5, 2023
b9bbd11
Setting State in subscribeOpenModalShortcuts
Charan-hs Sep 6, 2023
29f9310
removed dep
Charan-hs Sep 7, 2023
5e74153
Merge branch 'Expensify:main' into 25448-ESC-keyboard-shortcut
Charan-hs Sep 11, 2023
94485be
Merge branch 'Expensify:main' into 25448-ESC-keyboard-shortcut
Charan-hs Sep 12, 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
5 changes: 3 additions & 2 deletions src/components/KeyboardShortcutsModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, {useEffect, useRef} from 'react';
import React, {useEffect, useRef, useState} from 'react';
import PropTypes from 'prop-types';
import {View, ScrollView} from 'react-native';
import {withOnyx} from 'react-native-onyx';
Expand Down Expand Up @@ -41,7 +41,7 @@ const openShortcutModalConfig = CONST.KEYBOARD_SHORTCUTS.SHORTCUT_MODAL;
function KeyboardShortcutsModal({isShortcutsModalOpen = false, isSmallScreenWidth, translate}) {
const subscribedOpenModalShortcuts = useRef([]);
const modalType = isSmallScreenWidth ? CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED : CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE;
const shortcuts = KeyboardShortcut.getDocumentedShortcuts();
const [shortcuts, setShortcurts] = useState([]);
Comment thread
Charan-hs marked this conversation as resolved.
Resolved

/*
* Subscribe shortcuts that only are used when the modal is open
Expand Down Expand Up @@ -79,6 +79,7 @@ function KeyboardShortcutsModal({isShortcutsModalOpen = false, isSmallScreenWidt
KeyboardShortcut.subscribe(arrowUpConfig.shortcutKey, () => {}, arrowUpConfig.descriptionKey, arrowUpConfig.modifiers, true),
KeyboardShortcut.subscribe(arrowDownConfig.shortcutKey, () => {}, arrowDownConfig.descriptionKey, arrowDownConfig.modifiers, true),
];
setShortcurts(KeyboardShortcut.getDocumentedShortcuts());
};

/*
Expand Down