Skip to content
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

Jump to bottom

a11y: Improve Copy content for translation modal #8973

Merged
merged 2 commits into from
Feb 8, 2022
Merged

a11y: Improve Copy content for translation modal #8973

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80b0e9d
a11y: Improve Copy content for trnaslation modal
OEvgeny Feb 7, 2022
c43fc5a
Merge branch 'main' into a11y/add-lang-modal
tonyanziano Feb 8, 2022
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
66 changes: 54 additions & 12 deletions Composer/packages/client/src/components/MultiLanguage/AddLanguageModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,18 @@ import { Checkbox } from 'office-ui-fabric-react/lib/Checkbox';
import { Label } from 'office-ui-fabric-react/lib/Label';
import { Dropdown, IDropdownOption } from 'office-ui-fabric-react/lib/Dropdown';
import { DialogWrapper, DialogTypes } from '@bfc/ui-shared';
import { hiddenContentStyle, mergeStyles } from 'office-ui-fabric-react/lib/Styling';
import { Announced } from 'office-ui-fabric-react/lib/Announced';
import { useId } from '@uifabric/react-hooks';

import { MultiLanguagesDialog } from '../../constants';

import { ILanguageFormData } from './types';
import { classNames } from './styles';
import { languageListTemplatesSorted, languageListTemplates } from './utils';

const screenReaderOnly = mergeStyles(hiddenContentStyle);

export interface IAddLanguageModalProps {
isOpen: boolean;
languages: string[];
Expand Down Expand Up @@ -108,15 +113,16 @@ const AddLanguageModal: React.FC<IAddLanguageModalProps> = (props) => {
label += formatMessage(' - Current');
}
return (
<Checkbox
key={locale}
className={classNames.checkboxItem}
defaultChecked={isEnabled}
disabled={isEnabled}
label={label}
title={locale}
onChange={onChange(locale)}
/>
<div key={locale} role="listitem">
<Checkbox
className={classNames.checkboxItem}
defaultChecked={isEnabled}
disabled={isEnabled}
label={label}
title={locale}
onChange={onChange(locale)}
/>
</div>
);
});

Expand All @@ -133,6 +139,9 @@ const AddLanguageModal: React.FC<IAddLanguageModalProps> = (props) => {
});
}, [currentLanguages]);

const searchBoxLabelId = useId('search-box-label');
const translationsLabelId = useId('translations-label');

const onSearch = (_e, newValue) => {
setSearchKeywords(newValue.trim());
};
Expand All @@ -156,15 +165,48 @@ const AddLanguageModal: React.FC<IAddLanguageModalProps> = (props) => {
onChange={onDefaultLanguageChange}
/>
</StackItem>
<StackItem grow={0}>
<Label>{MultiLanguagesDialog.ADD_DIALOG.selectionTitle}</Label>
<StackItem aria-labelledBy={translationsLabelId} grow={0}>
<div id={translationsLabelId}>
<div className={screenReaderOnly}>{formatMessage('Bot language translations')}</div>
<Announced
message={formatMessage(
`{
hasFilter, select,
false {}
other {Search results for "{searchKeywords}":}
} {
languagesCount, plural,
=1 {one language found}
=0 {no languages found}
other {# languages found}
}
`,
{ searchKeywords, hasFilter: !!searchKeywords, languagesCount: languageCheckBoxList.length }
)}
/>
<Announced
message={formatMessage(
`{
languagesCount, plural,
=0 {No languages selected}
=1 {One language selected}
other {# languages selected}
}`,
{ languagesCount: formData.languages.length }
)}
/>
</div>
<Label id={searchBoxLabelId}>{MultiLanguagesDialog.ADD_DIALOG.selectionTitle}</Label>
<SearchBox
disableAnimation
aria-labelledBy={searchBoxLabelId}
placeholder={MultiLanguagesDialog.ADD_DIALOG.searchPlaceHolder}
styles={{ root: { width: 300 } }}
onChange={onSearch}
/>
<ScrollablePane styles={scrollablePaneStyles}>{languageCheckBoxList}</ScrollablePane>
<ScrollablePane styles={scrollablePaneStyles}>
<div role="list">{languageCheckBoxList}</div>
</ScrollablePane>
</StackItem>
<StackItem>
<Checkbox
Expand Down