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

[ISSUE#1909][MAS1.3.1][Screen Reader-Connect the bot] Voiceover announces the same name on the two control with different role #2012

Merged
merged 6 commits into from
Dec 2, 2019
Merged

[ISSUE#1909][MAS1.3.1][Screen Reader-Connect the bot] Voiceover announces the same name on the two control with different role #2012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6d84f2d
Add auxiliary label for splitButton
ceciliaavila Nov 26, 2019
02c1e19
Fix imports order
ceciliaavila Nov 26, 2019
ccd610b
Merge branch 'master' into fix/same-name-for-different-controls
denscollo Nov 26, 2019
a199b61
Update changelog
denscollo Nov 26, 2019
3eb66c8
Rename property and change default value
ceciliaavila Nov 27, 2019
aa62412
Remove extra space in CHANGELOG
ceciliaavila Nov 27, 2019
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [2002](https://github.com/microsoft/BotFramework-Emulator/pull/2002)
- [2009](https://github.com/microsoft/BotFramework-Emulator/pull/2009)
- [2010](https://github.com/microsoft/BotFramework-Emulator/pull/2010)
- [2012](https://github.com/microsoft/BotFramework-Emulator/pull/2012)

- [main] Increased ngrok spawn timeout to 15 seconds to be more forgiving to slower networks in PR [1998](https://github.com/microsoft/BotFramework-Emulator/pull/1998)

Expand Down
2 changes: 2 additions & 0 deletions packages/app/client/src/ui/editor/emulator/emulator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ import {

import { Document, SplitterSize } from '../../../state/reducers/editor';
import { debounce } from '../../../utils';
import { isMac } from '../../../../../main/src/utils/platform';

import { ChatPanelContainer } from './chatPanel';
import LogPanel from './logPanel/logPanel';
Expand Down Expand Up @@ -304,6 +305,7 @@ export class Emulator extends React.Component<EmulatorProps, {}> {
options={[NewUserId, SameUserId]}
>
buttonRef={this.setRestartButtonRef}
submenuLabel={isMac() ? 'Restart conversation sub menu' : ''}
/>
<button
role={'menuitem'}
Expand Down
12 changes: 10 additions & 2 deletions packages/sdk/ui-react/src/widget/splitButton/splitButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export interface SplitButtonProps {
options?: string[];
buttonRef?: (ref: HTMLButtonElement) => void;
selected?: number;
submenuLabel?: string;
}

export interface SplitButtonState {
Expand All @@ -66,7 +67,14 @@ export class SplitButton extends React.Component<SplitButtonProps, SplitButtonSt
}

public render(): JSX.Element {
const { buttonClass = '', defaultLabel = '', disabled = false, id = '', options = [] } = this.props;
const {
buttonClass = '',
defaultLabel = '',
disabled = false,
id = '',
options = [],
submenuLabel = '',
} = this.props;
const { expanded, selected } = this.state;
const {
caretRef,
Expand Down Expand Up @@ -95,7 +103,7 @@ export class SplitButton extends React.Component<SplitButtonProps, SplitButtonSt
</button>
<div className={styles.separator} aria-hidden={'true'} />
<button
aria-label={defaultLabel}
aria-label={submenuLabel || defaultLabel}
className={styles.caretButton + expandedClass}
ref={setCaretRef}
>
Expand Down