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

UI: Fix React BriefMessage breaking toast display. (backport #5085) #5086

Merged
merged 2 commits into from
Feb 16, 2023
Merged

UI: Fix React BriefMessage breaking toast display. (backport #5085) #5086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2244ab7
UI: Fix React BriefMessage breaking toast display. (#5085)
raplemie Feb 16, 2023
cfbc936
rush change
raplemie Feb 16, 2023
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
10 changes: 10 additions & 0 deletions common/changes/@itwin/appui-react/mergify-bp-release-3.6.x-pr-5085_2023-02-16-19-08.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/appui-react",
"comment": "Fix react briefMessage in toasts",
"type": "none"
}
],
"packageName": "@itwin/appui-react"
}
7 changes: 2 additions & 5 deletions ui/appui-react/src/appui-react/messages/MessageManager.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,12 +254,9 @@ export class MessageManager {
};
toaster.setSettings({ placement: "bottom", order: "ascending", ...settings });
const content = <>
{message.briefMessage}
{(message.briefMessage as ReactMessage).reactNode || message.briefMessage}
{message.detailedMessage &&
<>
<br/>
<Small>{(message.detailedMessage as ReactMessage).reactNode || message.detailedMessage}</Small>
</>
<Small style={{display: "block"}}>{(message.detailedMessage as ReactMessage).reactNode || message.detailedMessage}</Small>
}
</>;
switch (message.priority) {
Expand Down