Skip to content

aria label missing in Call composite configuration page #1172

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

Merged
alcail merged 6 commits into from
Nov 30, 2021
Merged

aria label missing in Call composite configuration page #1172

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9a236df
fix common label for mic and speakers in config
alcail Nov 26, 2021
b38c28d
Change files
alcail Nov 26, 2021
666ab96
Merge branch 'main' into alcail/a11yBugFix
alcail Nov 26, 2021
9a31167
Merge branch 'main' into alcail/a11yBugFix
alcail Nov 29, 2021
40dcdcf
update disabled state of Sound settings label to follow page "Start" …
alcail Nov 29, 2021
c496e29
Merge branch 'main' into alcail/a11yBugFix
alcail Nov 30, 2021
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
7 changes: 7 additions & 0 deletions change/@internal-react-composites-05c7878d-2e39-4a68-856b-13bb72b4e090.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix common label for mic and speakers in Call composite configuration page",
"packageName": "@internal/react-composites",
"email": "alcail@microsoft.com",
"dependentChangeType": "none"
}
106 changes: 59 additions & 47 deletions packages/react-composites/src/composites/CallComposite/components/LocalDeviceSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT license.

import { AudioDeviceInfo, VideoDeviceInfo } from '@azure/communication-calling';
import { Dropdown, Icon, IDropdownOption, Stack } from '@fluentui/react';
import { Dropdown, Icon, IDropdownOption, Label, mergeStyles, Stack } from '@fluentui/react';
import { useTheme, VideoStreamOptions } from '@internal/react-components';
import React from 'react';
import { useLocale } from '../../localization';
Expand Down Expand Up @@ -121,52 +121,64 @@ export const LocalDeviceSettings = (props: LocalDeviceSettingsType): JSX.Element
}}
onRenderTitle={(props?: IDropdownOption[]) => onRenderTitle('Camera', props)}
/>
<Dropdown
label={soundLabel}
placeholder={defaultPlaceHolder}
styles={dropDownStyles(theme)}
disabled={!props.microphonePermissionGranted}
errorMessage={
props.microphonePermissionGranted === undefined || props.microphonePermissionGranted
? undefined
: locale.strings.call.microphonePermissionDenied
}
options={
props.microphonePermissionGranted
? getDropDownList(props.microphones)
: [{ key: 'deniedOrUnknown', text: '' }]
}
defaultSelectedKey={
props.microphonePermissionGranted
? props.selectedMicrophone
? props.selectedMicrophone.id
: defaultDeviceId(props.microphones)
: 'deniedOrUnknown'
}
onChange={(
event: React.FormEvent<HTMLDivElement>,
option?: IDropdownOption | undefined,
index?: number | undefined
) => {
props.onSelectMicrophone(props.microphones[index ?? 0]);
}}
onRenderTitle={(props?: IDropdownOption[]) => onRenderTitle('Microphone', props)}
/>
<Dropdown
placeholder={defaultPlaceHolder}
styles={dropDownStyles(theme)}
disabled={props.speakers.length === 0}
options={getDropDownList(props.speakers)}
defaultSelectedKey={props.selectedSpeaker ? props.selectedSpeaker.id : defaultDeviceId(props.speakers)}
onChange={(
event: React.FormEvent<HTMLDivElement>,
option?: IDropdownOption | undefined,
index?: number | undefined
) => {
props.onSelectSpeaker(props.speakers[index ?? 0]);
}}
onRenderTitle={(props?: IDropdownOption[]) => onRenderTitle('Speaker', props)}
/>
<Stack>
<Label
id={'call-composite-local-sound-settings-label'}
className={mergeStyles(dropDownStyles(theme).label)}
disabled={!props.microphonePermissionGranted || props.speakers.length === 0} // depends on dropdowns disabled state in the sound settings stack
Copy link
Copy Markdown
Contributor

@prprabhu-ms prprabhu-ms Nov 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be &&.

The label should be disabled if both DropDown are disabled.

Copy link
Copy Markdown
Contributor Author

@alcail alcail Nov 29, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why? you can have mic but not speakers, of vise-versa.
And the only condition for "Start" button is if mic permission is granted, so I should not even test the speakers if I really want to follow the "Start" button behaviour.
That's making me realize that I should follow this behaviour LOL

>
{soundLabel}
</Label>
<Stack data-ui-id="call-composite-sound-settings" tokens={mainStackTokens}>
<Dropdown
aria-labelledby={'call-composite-local-sound-settings-label'}
placeholder={defaultPlaceHolder}
styles={dropDownStyles(theme)}
disabled={!props.microphonePermissionGranted}
errorMessage={
props.microphonePermissionGranted === undefined || props.microphonePermissionGranted
? undefined
: locale.strings.call.microphonePermissionDenied
}
options={
props.microphonePermissionGranted
? getDropDownList(props.microphones)
: [{ key: 'deniedOrUnknown', text: '' }]
}
defaultSelectedKey={
props.microphonePermissionGranted
? props.selectedMicrophone
? props.selectedMicrophone.id
: defaultDeviceId(props.microphones)
: 'deniedOrUnknown'
}
onChange={(
event: React.FormEvent<HTMLDivElement>,
option?: IDropdownOption | undefined,
index?: number | undefined
) => {
props.onSelectMicrophone(props.microphones[index ?? 0]);
}}
onRenderTitle={(props?: IDropdownOption[]) => onRenderTitle('Microphone', props)}
/>
<Dropdown
aria-labelledby={'call-composite-local-sound-settings-label'}
placeholder={defaultPlaceHolder}
styles={dropDownStyles(theme)}
disabled={props.speakers.length === 0}
options={getDropDownList(props.speakers)}
defaultSelectedKey={props.selectedSpeaker ? props.selectedSpeaker.id : defaultDeviceId(props.speakers)}
onChange={(
event: React.FormEvent<HTMLDivElement>,
option?: IDropdownOption | undefined,
index?: number | undefined
) => {
props.onSelectSpeaker(props.speakers[index ?? 0]);
}}
onRenderTitle={(props?: IDropdownOption[]) => onRenderTitle('Speaker', props)}
/>
</Stack>
</Stack>
</Stack>
);
};
Expand Down
⚡