Skip to content

Commit

Permalink
Chore: Bump Fuselage packages (#25015)
Browse files Browse the repository at this point in the history
* chore: bump version

* Bump to 0.31.9

* Workaround misuse of `Box`'s `withRichContent` prop

Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>
  • Loading branch information
dougfabris and tassoevan authored Apr 1, 2022
1 parent de2f943 commit cb69a3e
Show file tree
Hide file tree
Showing 3 changed files with 112 additions and 105 deletions.
8 changes: 6 additions & 2 deletions client/components/MarkdownText.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ const MarkdownText: FC<Partial<MarkdownTextParams>> = ({

let markedOptions: {};

const withRichContent = variant;
switch (variant) {
case 'inline':
markedOptions = inlineOptions;
Expand Down Expand Up @@ -112,7 +111,12 @@ const MarkdownText: FC<Partial<MarkdownTextParams>> = ({
}, [content, preserveHtml, sanitizer, markedOptions, parseEmoji]);

return __html ? (
<Box dangerouslySetInnerHTML={{ __html }} withTruncatedText={withTruncatedText} withRichContent={withRichContent} {...props} />
<Box
dangerouslySetInnerHTML={{ __html }}
withTruncatedText={withTruncatedText}
withRichContent={variant === 'inlineWithoutBreaks' ? 'inlineWithoutBreaks' : true}
{...props}
/>
) : null;
};

Expand Down
181 changes: 92 additions & 89 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -178,21 +178,21 @@
"@nivo/line": "0.62.0",
"@nivo/pie": "0.73.0",
"@rocket.chat/apps-engine": "^1.31.0",
"@rocket.chat/css-in-js": "~0.31.6",
"@rocket.chat/emitter": "~0.31.6",
"@rocket.chat/fuselage": "~0.31.6",
"@rocket.chat/fuselage-hooks": "~0.31.6",
"@rocket.chat/fuselage-polyfills": "~0.31.6",
"@rocket.chat/fuselage-tokens": "~0.31.6",
"@rocket.chat/fuselage-ui-kit": "~0.31.6",
"@rocket.chat/icons": "^0.6.3-dev.455",
"@rocket.chat/logo": "~0.31.6",
"@rocket.chat/memo": "~0.31.6",
"@rocket.chat/message-parser": "~0.31.6",
"@rocket.chat/css-in-js": "~0.31.9",
"@rocket.chat/emitter": "~0.31.9",
"@rocket.chat/fuselage": "~0.31.9",
"@rocket.chat/fuselage-hooks": "~0.31.9",
"@rocket.chat/fuselage-polyfills": "~0.31.9",
"@rocket.chat/fuselage-tokens": "~0.31.9",
"@rocket.chat/fuselage-ui-kit": "~0.31.9",
"@rocket.chat/icons": "~0.31.9",
"@rocket.chat/logo": "~0.31.9",
"@rocket.chat/memo": "~0.31.9",
"@rocket.chat/message-parser": "~0.31.9",
"@rocket.chat/mp3-encoder": "^0.24.0",
"@rocket.chat/onboarding-ui": "~0.31.6",
"@rocket.chat/string-helpers": "~0.31.6",
"@rocket.chat/ui-kit": "~0.31.6",
"@rocket.chat/onboarding-ui": "~0.31.9",
"@rocket.chat/string-helpers": "~0.31.9",
"@rocket.chat/ui-kit": "~0.31.9",
"@slack/client": "^4.12.0",
"@types/cookie": "^0.4.1",
"@types/lodash": "^4.14.177",
Expand Down

0 comments on commit cb69a3e

Please sign in to comment.