Web: Client: fixed Login page "keydown" event

This commit is contained in:
Nikita Gopienko 2019-10-02 16:59:38 +03:00
parent fae9b49f21
commit 16c7740fc6

View File

@ -94,7 +94,7 @@ const Form = props => {
}; };
const onSendPasswordInstructions = useCallback( const onSendPasswordInstructions = useCallback(
e => { () => {
setIsLoading(true); setIsLoading(true);
sendInstructionsToChangePassword(email) sendInstructionsToChangePassword(email)
.then(res => { .then(res => {
@ -152,21 +152,19 @@ const Form = props => {
const onKeyPress = useCallback( const onKeyPress = useCallback(
event => { event => {
if (event.key === "Enter" && !isDisabled) { if (event.key === "Enter") {
onSubmit(); !isDisabled ? onSubmit() : onSendPasswordInstructions();
} }
}, },
[onSubmit, isDisabled] [onSendPasswordInstructions, onSubmit, isDisabled]
); );
useEffect(() => { useEffect(() => {
i18n.changeLanguage(language); i18n.changeLanguage(language);
params.error && setErrorText(params.error); params.error && setErrorText(params.error);
window.addEventListener("keydown", onKeyPress);
window.addEventListener("keyup", onKeyPress); window.addEventListener("keyup", onKeyPress);
// Remove event listeners on cleanup // Remove event listeners on cleanup
return () => { return () => {
window.removeEventListener("keydown", onKeyPress);
window.removeEventListener("keyup", onKeyPress); window.removeEventListener("keyup", onKeyPress);
}; };
}, [onKeyPress, params, language]); }, [onKeyPress, params, language]);
@ -285,7 +283,6 @@ const Form = props => {
isDisabled={isLoading} isDisabled={isLoading}
value={email} value={email}
onChange={onChangeEmail} onChange={onChangeEmail}
//onKeyDown={onKeyPress}
/> />
]} ]}
footerContent={[ footerContent={[