Fixed enter in modal confirmation dialogs

(cherry picked from commit 930742ae2c69a530afe60f76a5824f2722540df8)
pull/5848/head
Taloth Saldono 4 years ago committed by Qstick
parent 6ad6bf270f
commit 0443cc34c6

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

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

Loading…
Cancel
Save