admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: fix SignInUpForm Continue button being disabled (#5185)

Browse Source 
Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
Thaïs
2024-04-26 16:27:40 +02:00
committed by GitHub
parent e1d0b26cf9
commit 8beec03762
2 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
packages/twenty-front/src/modules/ui/input/components/TextInput.tsx
View File

@ -1,27 +1,23 @@
import { FocusEventHandler, forwardRef, useRef } from 'react';
import { FocusEventHandler, forwardRef, ForwardRefRenderFunction } from 'react';
import { Key } from 'ts-key-enum';
import {
TextInputV2,
TextInputV2ComponentProps,
} from '@/ui/input/components/TextInputV2';
import { InputHotkeyScope } from '@/ui/input/types/InputHotkeyScope';
import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
import { InputHotkeyScope } from '../types/InputHotkeyScope';
import { isDefined } from '~/utils/isDefined';
export type TextInputComponentProps = TextInputV2ComponentProps & {
disableHotkeys?: boolean;
};
const TextInputComponent = ({
onFocus,
onBlur,
disableHotkeys = false,
...props
}: TextInputComponentProps): JSX.Element => {
const inputRef = useRef<HTMLInputElement>(null);
const TextInputComponent: ForwardRefRenderFunction<
HTMLInputElement,
TextInputComponentProps
> = ({ onFocus, onBlur, disableHotkeys = false, ...props }, ref) => {
const {
goBackToPreviousHotkeyScope,
setHotkeyScopeAndMemorizePreviousScope,
@ -46,14 +42,23 @@ const TextInputComponent = ({
useScopedHotkeys(
[Key.Escape, Key.Enter],
() => {
inputRef.current?.blur();
if (isDefined(ref) && 'current' in ref) {
ref.current?.blur();
}
},
InputHotkeyScope.TextInput,
{ enabled: !disableHotkeys },
);
// eslint-disable-next-line react/jsx-props-no-spreading
return <TextInputV2 {...props} onFocus={handleFocus} onBlur={handleBlur} />;
return (
<TextInputV2
ref={ref}
// eslint-disable-next-line react/jsx-props-no-spreading
{...props}
onFocus={handleFocus}
onBlur={handleBlur}
/>
);
};
export const TextInput = forwardRef(TextInputComponent);