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.

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

[ISSUE#1890][Functional - Open Bot Dialog] The focus goes on the disabled controls and functioning by space/return. #1999

Merged
merged 5 commits into from Nov 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Expand Up @@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [1993](https://github.com/microsoft/BotFramework-Emulator/pull/1993)
- [1994](https://github.com/microsoft/BotFramework-Emulator/pull/1994)
- [1997](https://github.com/microsoft/BotFramework-Emulator/pull/1997)
- [1999](https://github.com/microsoft/BotFramework-Emulator/pull/1999)
- [2000](https://github.com/microsoft/BotFramework-Emulator/pull/2000)

- [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 Expand Up @@ -99,7 +100,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [1934](https://github.com/microsoft/BotFramework-Emulator/pull/1934)
- [1935](https://github.com/microsoft/BotFramework-Emulator/pull/1935)
- [1936](https://github.com/microsoft/BotFramework-Emulator/pull/1936)

- [client] Fixed an issue with the transcripts path input inside of the resource settings dialog in PR [1836](https://github.com/microsoft/BotFramework-Emulator/pull/1836)
- [client] Implemented HTML app menu for Windows in PR [1893](https://github.com/microsoft/BotFramework-Emulator/pull/1893)
- [client/main] Migrated from Bing Speech API to Cognitive Services Speech API in PR [1878](https://github.com/microsoft/BotFramework-Emulator/pull/1878)
Expand Down
1 change: 1 addition & 0 deletions packages/sdk/ui-react/src/widget/button/linkButton.tsx
Expand Up @@ -64,6 +64,7 @@ export class LinkButton extends React.Component<LinkButtonProps, {}> {
className={className}
ref={this.setButtonRef}
role={linkRole ? 'link' : 'button'}
aria-hidden={this.props.disabled ? 'true' : undefined}
>
{text}
{this.props.children}
Expand Down
7 changes: 6 additions & 1 deletion packages/sdk/ui-react/src/widget/button/primaryButton.tsx
Expand Up @@ -44,7 +44,12 @@ export class PrimaryButton extends React.Component<PrimaryButtonProps, {}> {
const { className: propsClassName = '', text, buttonRef, ...buttonProps } = this.props;
const className = `${propsClassName} ${styles.button} ${styles.primaryButton}`;
return (
<button {...buttonProps} className={className} ref={this.setButtonRef}>
<button
{...buttonProps}
className={className}
ref={this.setButtonRef}
aria-hidden={this.props.disabled ? 'true' : undefined}
>
{text}
{this.props.children}
</button>
Expand Down