Fixed enter in modal confirmation dialogs

(cherry picked from commit 930742ae2c69a530afe60f76a5824f2722540df8)
This commit is contained in:
Taloth Saldono 2020-09-23 00:12:42 +02:00 committed by Qstick
parent 58cb0dc556
commit ace7371b69
2 changed files with 7 additions and 5 deletions

View File

@ -30,10 +30,10 @@ function ConfirmModal(props) {
useEffect(() => {
if (isOpen) {
bindShortcut('enter', onConfirm);
} else {
unbindShortcut('enter', onConfirm);
return () => unbindShortcut('enter', onConfirm);
}
}, [onConfirm]);
}, [isOpen, onConfirm]);
return (
<Modal

View File

@ -56,8 +56,10 @@ function keyboardShortcuts(WrappedComponent) {
}
unbindShortcut = (key) => {
delete this._mousetrapBindings[key];
this._mousetrap.unbind(key);
if (this._mousetrap != null) {
delete this._mousetrapBindings[key];
this._mousetrap.unbind(key);
}
}
unbindAllShortcuts = () => {