Skip to content

fix(a11y): ensure forms accessibility compliance #40256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
juliajforesti wants to merge 7 commits into
base: develop
Choose a base branch
from
Draft

fix(a11y): ensure forms accessibility compliance #40256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
40b9963
fix(a11y): ensure accessibility compliance on `CreateChannelModal`
juliajforesti Apr 22, 2026
c0e355e
fix(a11y): ensure accessibility compliance on `CreateDiscussion`
juliajforesti Apr 22, 2026
a4bcf95
fix(a11y): ensure accessibility compliance on `CreateDirectMessage`
juliajforesti Apr 22, 2026
edf9cca
fix(a11y): ensure accessibility compliance on `CreateTeamModal`
juliajforesti Apr 22, 2026
2db6713
fix(a11y): ensure accessibility compliance on `CreateDirectMessage`
juliajforesti Apr 22, 2026
5a0a17f
chore: import `MultiSelectFiltered` from `fuselage-forms`
juliajforesti Apr 22, 2026
8098689
test: adjust locators
juliajforesti Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 22 additions & 72 deletions apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
import type { IMessage, IRoom, IUser } from '@rocket.chat/core-typings';
import { Icon, Box } from '@rocket.chat/fuselage';
import {
Field,
FieldGroup,
ToggleSwitch,
TextInput,
TextAreaInput,
Icon,
Box,
FieldHint,
FieldLabel,
FieldRow,
FieldError,
} from '@rocket.chat/fuselage';
} from '@rocket.chat/fuselage-forms';
import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
import { GenericModal } from '@rocket.chat/ui-client';
import { useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
import { useMutation } from '@tanstack/react-query';
import { useId, useState } from 'react';
import { useState } from 'react';
import { useForm, Controller } from 'react-hook-form';

import { useEncryptedRoomDescription } from '../../navbar/NavBarPagesGroup/actions/useEncryptedRoomDescription';
Expand Down Expand Up @@ -105,13 +104,6 @@ const CreateDiscussion = ({

const getEncryptedHint = useEncryptedRoomDescription('discussion');

const parentRoomId = useId();
const encryptedId = useId();
const discussionNameId = useId();
const membersId = useId();
const firstMessageId = useId();
const topicId = useId();

return (
<GenericModal
variant='warning'
Expand All @@ -126,15 +118,13 @@ const CreateDiscussion = ({
<Box mbe={24}>{t('Discussion_description')}</Box>
<FieldGroup>
<Field>
<FieldLabel htmlFor={parentRoomId} required>
{t('Discussion_target_channel')}
</FieldLabel>
<FieldLabel required>{t('Discussion_target_channel')}</FieldLabel>
<FieldRow>
{defaultParentRoom && (
<Controller
control={control}
name='parentRoom'
render={() => <DefaultParentRoomField defaultParentRoom={defaultParentRoom} id={parentRoomId} />}
render={() => <DefaultParentRoomField defaultParentRoom={defaultParentRoom} aria-required='true' />}
/>
)}
{!defaultParentRoom && (
Expand All @@ -148,119 +138,79 @@ const CreateDiscussion = ({
onBlur={onBlur}
onChange={onChange}
value={value}
id={parentRoomId}
error={Boolean(errors.parentRoom?.message)}
placeholder={t('Search_options')}
disabled={Boolean(defaultParentRoom)}
aria-invalid={Boolean(errors.parentRoom)}
aria-required='true'
aria-describedby={`${parentRoomId}-error`}
setSelectedRoom={onParentRoomChange}
renderRoomIcon={({ encrypted }) => (encrypted ? <Icon name='key' /> : null)}
/>
)}
/>
)}
</FieldRow>
{errors.parentRoom && (
<FieldError role='alert' id={`${parentRoomId}-error`}>
{errors.parentRoom.message}
</FieldError>
)}
{errors.parentRoom && <FieldError>{errors.parentRoom.message}</FieldError>}
</Field>
<Field>
<FieldLabel htmlFor={discussionNameId} required>
{t('Name')}
</FieldLabel>
<FieldLabel required>{t('Name')}</FieldLabel>
<FieldRow>
<Controller
name='name'
control={control}
rules={{ required: t('Required_field', { field: t('Name') }) }}
render={({ field }) => (
<TextInput
id={discussionNameId}
{...field}
aria-invalid={Boolean(errors.name)}
aria-required='true'
aria-describedby={errors.name ? `${discussionNameId}-error` : undefined}
addon={<Icon name='baloons' size='x20' />}
/>
<TextInput {...field} aria-required='true' addon={<Icon name='baloons' size='x20' />} error={errors.name?.message} />
)}
/>
</FieldRow>
{errors.name && (
<FieldError role='alert' id={`${discussionNameId}-error`}>
{errors.name.message}
</FieldError>
)}
{errors.name && <FieldError>{errors.name.message}</FieldError>}
</Field>
<Field>
<FieldLabel htmlFor={topicId}>{t('Topic')}</FieldLabel>
<FieldLabel>{t('Topic')}</FieldLabel>
<FieldRow>
<Controller
name='topic'
control={control}
render={({ field }) => <TextInput id={topicId} {...field} aria-describedby={`${topicId}-hint`} />}
/>
<Controller name='topic' control={control} render={({ field }) => <TextInput {...field} error={errors.topic?.message} />} />
</FieldRow>
<FieldRow>
<FieldHint id={`${topicId}-hint`}>{t('Displayed_next_to_name')}</FieldHint>
<FieldHint>{t('Displayed_next_to_name')}</FieldHint>
</FieldRow>
</Field>
<Field>
<FieldLabel htmlFor={membersId}>{t('Members')}</FieldLabel>
<FieldLabel>{t('Members')}</FieldLabel>
<FieldRow>
<Controller
control={control}
name='usernames'
render={({ field: { name, onChange, value, onBlur } }) => (
<UserAutoCompleteMultiple
id={membersId}
name={name}
onChange={onChange}
value={value}
onBlur={onBlur}
placeholder={t('Add_people')}
/>
<UserAutoCompleteMultiple name={name} onChange={onChange} value={value} onBlur={onBlur} placeholder={t('Add_people')} />
)}
/>
</FieldRow>
</Field>
<Field>
<FieldLabel htmlFor={firstMessageId}>{t('Discussion_first_message_title')}</FieldLabel>
<FieldLabel>{t('Discussion_first_message_title')}</FieldLabel>
<FieldRow>
<Controller
control={control}
name='firstMessage'
render={({ field }) => (
<TextAreaInput
id={firstMessageId}
{...field}
rows={5}
disabled={encrypted}
aria-describedby={encrypted ? `${firstMessageId}-encrypted-hint` : `${firstMessageId}-hint`}
/>
)}
render={({ field }) => <TextAreaInput {...field} rows={5} disabled={encrypted} />}
/>
</FieldRow>
{encrypted ? (
<FieldHint id={`${firstMessageId}-encrypted-hint`}>{t('Discussion_first_message_disabled_due_to_e2e')}</FieldHint>
<FieldHint>{t('Discussion_first_message_disabled_due_to_e2e')}</FieldHint>
) : (
<FieldHint id={`${firstMessageId}-hint`}>{t('First_message_hint')}</FieldHint>
<FieldHint>{t('First_message_hint')}</FieldHint>
)}
</Field>
<Field>
<FieldRow>
<FieldLabel htmlFor={encryptedId}>{t('Encrypted')}</FieldLabel>
<FieldLabel>{t('Encrypted')}</FieldLabel>
<Controller
control={control}
name='encrypted'
render={({ field: { value, ...field } }) => (
<ToggleSwitch id={encryptedId} {...field} checked={value} disabled={encryptedDisabled} />
)}
render={({ field: { value, ...field } }) => <ToggleSwitch {...field} checked={value} disabled={encryptedDisabled} />}
/>
</FieldRow>
<FieldHint id={`${encryptedId}-hint`}>{getEncryptedHint({ isPrivate: true, encrypted })}</FieldHint>
<FieldHint>{getEncryptedHint({ isPrivate: true, encrypted })}</FieldHint>
</Field>
</FieldGroup>
</GenericModal>
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultiple.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { MultiSelectFiltered } from '@rocket.chat/fuselage';
import { MultiSelectFiltered } from '@rocket.chat/fuselage-forms';
import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
import { useEndpoint } from '@rocket.chat/ui-contexts';
import { keepPreviousData, useQuery } from '@tanstack/react-query';
Expand Down
Loading
Loading