Skip to content

Commit

Permalink
Fix render card without tap (#1577)
Browse files Browse the repository at this point in the history
  • Loading branch information
compulim authored Jan 11, 2019
1 parent 164a155 commit 1143da5
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- by [@corinagum](https://github.com/corinagum) in PR [#1528](https://github.com/Microsoft/BotFramework-WebChat/pull/1528)
- `component`: Fix [#1560](https://github.com/Microsoft/BotFramework-WebChat/issues/1560). Fixed carousel layout did not show date and alignment issues, by [@compulim](https://github.com/compulim) in PR [#1561](https://github.com/Microsoft/BotFramework-WebChat/pull/1561)
- `playground`: Fix [#1562](https://github.com/Microsoft/BotFramework-WebChat/issues/1562). Fixed timestamp grouping "Don't group" and added "Don't show timestamp", by [@compulim](https://github.com/compulim) in PR [#1563](https://github.com/Microsoft/BotFramework-WebChat/pull/1563)
- `component`: Fix [#1576](https://github.com/Microsoft/BotFramework-WebChat/issues/1576). Rich card without `tap` should be rendered properly, by [@compulim](https://github.com/compulim) in PR [#1577](https://github.com/Microsoft/BotFramework-WebChat/pull/1577)

### Removed
- `botAvatarImage` and `userAvatarImage` props, as they are moved inside `styleOptions`, in PR [#1486](https://github.com/Microsoft/BotFramework-WebChat/pull/1486)
Expand Down
2 changes: 1 addition & 1 deletion packages/component/src/Attachment/CommonCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default class extends React.Component {
return (
<AdaptiveCardRenderer
adaptiveCard={ content && this.buildCard(adaptiveCards, content) }
tapAction={ content.tap }
tapAction={ content && content.tap }
/>
);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/component/src/Attachment/HeroCardAttachment.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default class extends React.Component {
return (
<AdaptiveCardRenderer
adaptiveCard={ content && this.buildCard(adaptiveCards, content) }
tapAction={ content.tap }
tapAction={ content && content.tap }
/>
);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/component/src/Attachment/ReceiptCardAttachment.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class ReceiptCardAttachment extends React.Component {
return (
<AdaptiveCardRenderer
adaptiveCard={ content && this.buildCard(adaptiveCards, content, language) }
tapAction={ content.tap }
tapAction={ content && content.tap }
/>
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default class extends React.Component {
return (
<AdaptiveCardRenderer
adaptiveCard={ content && this.buildCard(adaptiveCards, content) }
tapAction={ content.tap }
tapAction={ content && content.tap }
/>
);
}
Expand Down

0 comments on commit 1143da5

Please sign in to comment.