Skip to content

Commit 34e406e

Browse files
committed
fix: replace useAutoFocus
1 parent c72d3cf commit 34e406e

9 files changed

+20
-14
lines changed

packages/onboarding-ui/src/forms/AdminInfoForm/AdminInfoForm.tsx

+7-4
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import {
99
Box,
1010
CheckBox,
1111
} from '@rocket.chat/fuselage';
12-
import { useUniqueId, useAutoFocus } from '@rocket.chat/fuselage-hooks';
13-
import type { ReactElement } from 'react';
12+
import { useUniqueId } from '@rocket.chat/fuselage-hooks';
13+
import { ReactElement, useEffect } from 'react';
1414
import { useForm, SubmitHandler, Validate } from 'react-hook-form';
1515
import { useTranslation } from 'react-i18next';
1616

@@ -48,7 +48,6 @@ const AdminInfoForm = ({
4848
onSubmit,
4949
}: AdminInfoFormProps): ReactElement => {
5050
const { t } = useTranslation();
51-
const autofocus = useAutoFocus();
5251

5352
const fullnameField = useUniqueId();
5453
const usernameField = useUniqueId(); // lgtm [js/insecure-randomness]
@@ -59,13 +58,18 @@ const AdminInfoForm = ({
5958
register,
6059
handleSubmit,
6160
formState: { isValidating, isSubmitting, errors },
61+
setFocus,
6262
} = useForm<AdminInfoPayload>({
6363
defaultValues: {
6464
...initialValues,
6565
password: '',
6666
},
6767
});
6868

69+
useEffect(() => {
70+
setFocus('fullname');
71+
}, [setFocus]);
72+
6973
return (
7074
<Form onSubmit={handleSubmit(onSubmit)}>
7175
<Form.Steps currentStep={currentStep} stepCount={stepCount} />
@@ -86,7 +90,6 @@ const AdminInfoForm = ({
8690
'form.adminInfoForm.fields.fullName.placeholder'
8791
)}
8892
id={fullnameField}
89-
ref={autofocus}
9093
/>
9194
</Field.Row>
9295
{errors.fullname && (

packages/onboarding-ui/src/forms/CloudAccountEmailForm/CloudAccountEmailForm.tsx

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ButtonGroup, Button, EmailInput, Field } from '@rocket.chat/fuselage';
22
import { useUniqueId } from '@rocket.chat/fuselage-hooks';
3-
import type { ReactElement } from 'react';
3+
import { ReactElement, useEffect } from 'react';
44
import { useForm, SubmitHandler, Validate } from 'react-hook-form';
55
import { useTranslation } from 'react-i18next';
66

@@ -34,13 +34,18 @@ const CloudAccountEmailForm = ({
3434
register,
3535
handleSubmit,
3636
formState: { isValidating, isSubmitting, errors },
37+
setFocus,
3738
} = useForm<CloudAccountEmailPayload>({
3839
defaultValues: {
3940
email: '',
4041
...initialValues,
4142
},
4243
});
4344

45+
useEffect(() => {
46+
setFocus('email');
47+
}, [setFocus]);
48+
4449
return (
4550
<Form onSubmit={handleSubmit(onSubmit)}>
4651
<Form.Steps currentStep={currentStep} stepCount={stepCount} />

packages/onboarding-ui/src/forms/OrganizationInfoForm/OrganizationInfoForm.tsx

+7-9
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,8 @@ import {
99
SelectOptions,
1010
Box,
1111
} from '@rocket.chat/fuselage';
12-
import {
13-
useBreakpoints,
14-
useUniqueId,
15-
useAutoFocus,
16-
} from '@rocket.chat/fuselage-hooks';
17-
import type { ReactElement, ReactNode } from 'react';
12+
import { useBreakpoints, useUniqueId } from '@rocket.chat/fuselage-hooks';
13+
import { ReactElement, ReactNode, useEffect } from 'react';
1814
import { useForm, SubmitHandler, Controller } from 'react-hook-form';
1915
import { useTranslation } from 'react-i18next';
2016

@@ -65,17 +61,20 @@ const OrganizationInfoForm = ({
6561
const organizationSizeField = useUniqueId();
6662
const countryField = useUniqueId();
6763

68-
const autofocus = useAutoFocus();
69-
7064
const {
7165
register,
7266
control,
7367
handleSubmit,
7468
formState: { isValidating, isSubmitting, errors },
69+
setFocus,
7570
} = useForm<OrganizationInfoPayload>({
7671
defaultValues: initialValues,
7772
});
7873

74+
useEffect(() => {
75+
setFocus('organizationName');
76+
}, [setFocus]);
77+
7978
return (
8079
<Form onSubmit={handleSubmit(onSubmit)}>
8180
<Form.Steps currentStep={currentStep} stepCount={stepCount} />
@@ -94,7 +93,6 @@ const OrganizationInfoForm = ({
9493
'form.organizationInfoForm.fields.organizationName.placeholder'
9594
)}
9695
id={organizationNameField}
97-
ref={autofocus}
9896
/>
9997
</Field.Row>
10098
{errors.organizationName && (

0 commit comments

Comments
 (0)