diff --git a/src/components/Button/validateSubmitShortcut/index.ts b/src/components/Button/validateSubmitShortcut/index.ts index 29ba071c25f2..8c5d73d5d2b2 100644 --- a/src/components/Button/validateSubmitShortcut/index.ts +++ b/src/components/Button/validateSubmitShortcut/index.ts @@ -10,11 +10,16 @@ import type ValidateSubmitShortcut from './types'; */ const validateSubmitShortcut: ValidateSubmitShortcut = (isDisabled, isLoading, event) => { - const eventTarget = event?.target as HTMLElement; - if (isDisabled || isLoading || eventTarget.nodeName === 'TEXTAREA' || (eventTarget?.contentEditable === 'true' && eventTarget.ariaMultiLine)) { + const eventTarget = event?.target as HTMLInputElement; + if ( + isDisabled || + isLoading || + eventTarget.nodeName === 'TEXTAREA' || + (eventTarget.nodeName === 'INPUT' && eventTarget.autocomplete === 'one-time-code') || + (eventTarget?.contentEditable === 'true' && eventTarget.ariaMultiLine) + ) { return false; } - event?.preventDefault(); return true; };