Skip to content

Commit

Permalink
Fix wrong shape on propTypes.tapAction (microsoft#2253)
Browse files Browse the repository at this point in the history
* Fix wrong shape on propTypes.tapAction

* Update PR number

* Should pass language

* Pass language and rename to aria-label
  • Loading branch information
compulim authored and corinagum committed Aug 1, 2019
1 parent 95e4ecd commit 6169f64
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fix [#2193](https://github.com/microsoft/BotFramework-WebChat/issues/2193). Fix Adaptive Card/attachments do not get read by Narrator, by [@corinagum](https://github.com/corinagum) in PR [#2226](https://github.com/microsoft/BotFramework-WebChat/pull/2226)
- Fix [#2150](https://github.com/microsoft/BotFramework-WebChat/issues/2193). Fix timestamps read by Narrator, by [@corinagum](https://github.com/corinagum) in PR [#2226](https://github.com/microsoft/BotFramework-WebChat/pull/2226)
- Fix [#2240](https://github.com/microsoft/BotFramework-WebChat/issues/2240). Fix microphone button should be re-enabled after error, by [@compulim](https://github.com/compulim) in PR [#2241](https://github.com/microsoft/BotFramework-WebChat/pull/2241)
- Fix [#2250](https://github.com/microsoft/BotFramework-WebChat/issues/2250). Fix React warnings related prop types, by [@compulim](https://github.com/compulim) in PR [#2253](https://github.com/microsoft/BotFramework-WebChat/pull/2253)

### Added

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,10 @@ AdaptiveCardRenderer.propTypes = {
styleSet: PropTypes.shape({
adaptiveCardRenderer: PropTypes.any.isRequired
}).isRequired,
tapAction: PropTypes.func
tapAction: PropTypes.shape({
type: PropTypes.string.isRequired,
value: PropTypes.string
})
};

AdaptiveCardRenderer.defaultProps = {
Expand Down
4 changes: 2 additions & 2 deletions packages/component/src/Attachment/TypingActivity.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import TypingAnimation from './Assets/TypingAnimation';

const TypingActivity = ({ language, styleSet }) => (
<div className={styleSet.typingActivity}>
<TypingAnimation ariaLabel={localize('TypingIndicator', language)} />
<TypingAnimation aria-label={localize('TypingIndicator', language)} />
</div>
);

Expand All @@ -18,4 +18,4 @@ TypingActivity.propTypes = {
}).isRequired
};

export default connectToWebChat(({ styleSet }) => ({ styleSet }))(TypingActivity);
export default connectToWebChat(({ language, styleSet }) => ({ language, styleSet }))(TypingActivity);
2 changes: 1 addition & 1 deletion packages/component/src/ErrorBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ ErrorBox.propTypes = {
}).isRequired
};

export default connectToWebChat(({ styleSet }) => ({ styleSet }))(ErrorBox);
export default connectToWebChat(({ language, styleSet }) => ({ language, styleSet }))(ErrorBox);

0 comments on commit 6169f64

Please sign in to comment.