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

Jump to bottom

[FIX] Fix max-width message block #25686

Merged
merged 3 commits into from
May 31, 2022
Merged

[FIX] Fix max-width message block #25686

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b84b3d
fix max-width message block
ggazzo May 30, 2022
4495af2
ci
ggazzo May 30, 2022
864c17b
add alias and avatar
ggazzo May 31, 2022
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: 6 additions & 4 deletions .yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ nodeLinker: node-modules

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: "@yarnpkg/plugin-workspace-tools"
spec: '@yarnpkg/plugin-workspace-tools'
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"
spec: '@yarnpkg/plugin-interactive-tools'
- path: .yarn/plugins/@yarnpkg/plugin-engines.cjs
spec: "https://raw.githubusercontent.com/devoto13/yarn-plugin-engines/main/bundles/%40yarnpkg/plugin-engines.js"
spec: 'https://raw.githubusercontent.com/devoto13/yarn-plugin-engines/main/bundles/%40yarnpkg/plugin-engines.js'
- path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
spec: "@yarnpkg/plugin-typescript"
spec: '@yarnpkg/plugin-typescript'

yarnPath: .yarn/releases/yarn-3.2.0.cjs

checksumBehavior: 'update'
10 changes: 7 additions & 3 deletions apps/meteor/client/views/room/MessageList/components/MessageContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable complexity */
import { IMessage, isDiscussionMessage, isThreadMainMessage, ISubscription } from '@rocket.chat/core-typings';
import { MessageBody } from '@rocket.chat/fuselage';
import { MessageBody, MessageBlock } from '@rocket.chat/fuselage';
import { useTranslation, useUserId, TranslationKey } from '@rocket.chat/ui-contexts';
import React, { FC, memo } from 'react';

Expand All @@ -12,7 +12,7 @@ import DiscussionMetric from '../../../../components/Message/Metrics/Discussion'
import ThreadMetric from '../../../../components/Message/Metrics/Thread';
import { useUserData } from '../../../../hooks/useUserData';
import { UserPresence } from '../../../../lib/presence';
import MessageBlock from '../../../blocks/MessageBlock';
import MessageBlockUiKit from '../../../blocks/MessageBlock';
import MessageLocation from '../../../location/MessageLocation';
import { useMessageActions, useMessageOembedIsEnabled, useMessageRunActionLink } from '../../contexts/MessageContext';
import { useMessageListShowReadReceipt } from '../contexts/MessageListContext';
Expand Down Expand Up @@ -54,7 +54,11 @@ const MessageContent: FC<{ message: IMessage; sequential: boolean; subscription?
{isEncryptedMessage && message.e2e === 'pending' && t('E2E_message_encrypted_placeholder')}
</MessageBody>
)}
{message.blocks && <MessageBlock mid={message._id} blocks={message.blocks} appId rid={message.rid} />}
{message.blocks && (
<MessageBlock fixedWidth>
<MessageBlockUiKit mid={message._id} blocks={message.blocks} appId rid={message.rid} />
</MessageBlock>
)}
{message.attachments && <Attachments attachments={message.attachments} file={message.file} />}

{oembedIsEnabled && !!message.urls?.length && <PreviewList urls={message.urls} />}
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
"@rocket.chat/emitter": "~0.31.12",
"@rocket.chat/forked-matrix-appservice-bridge": "^4.0.1",
"@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.2",
"@rocket.chat/fuselage": "~0.31.12",
"@rocket.chat/fuselage": "^0.32.0-dev.46",
"@rocket.chat/fuselage-hooks": "~0.31.12",
"@rocket.chat/fuselage-polyfills": "~0.31.12",
"@rocket.chat/fuselage-tokens": "~0.31.12",
Expand Down
86 changes: 83 additions & 3 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4299,6 +4299,19 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/css-in-js@npm:~0.31.13-dev.5":
version: 0.31.13-dev.5
resolution: "@rocket.chat/css-in-js@npm:0.31.13-dev.5"
dependencies:
"@emotion/hash": ^0.8.0
"@rocket.chat/css-supports": ~0.31.13-dev.5
"@rocket.chat/memo": ~0.31.13-dev.5
"@rocket.chat/stylis-logical-props-middleware": ~0.31.13-dev.5
stylis: ~4.0.13
checksum: 03a55822dfe6e73a3e639a86ea6aee40b8f729b48242aab27d85020051605828e32e0a71b4be751cf1f9c952025f73a93fe921ce18899ff6571d202d26db94e8
languageName: node
linkType: hard

"@rocket.chat/css-supports@npm:^0.31.11":
version: 0.31.11
resolution: "@rocket.chat/css-supports@npm:0.31.11"
Expand All @@ -4317,6 +4330,15 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/css-supports@npm:~0.31.13-dev.5":
version: 0.31.13-dev.5
resolution: "@rocket.chat/css-supports@npm:0.31.13-dev.5"
dependencies:
"@rocket.chat/memo": ~0.31.13-dev.5
checksum: eb8c516ac773cd3807af9ee71ad88ee6967a4f71a01831d356e81f8ac36343024292c2ba6af0701423bdc280a2077a39e9b435e275b753c50ca3ce09a8d80281
languageName: node
linkType: hard

"@rocket.chat/ddp-streamer@workspace:ee/apps/ddp-streamer":
version: 0.0.0-use.local
resolution: "@rocket.chat/ddp-streamer@workspace:ee/apps/ddp-streamer"
Expand Down Expand Up @@ -4510,6 +4532,13 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/fuselage-tokens@npm:~0.31.13-dev.5":
version: 0.31.13-dev.5
resolution: "@rocket.chat/fuselage-tokens@npm:0.31.13-dev.5"
checksum: dde50c140f77fbd47cc9dc1d0138e5c88069bc491e9a7ae3b5461a40eef6e5170877db9b7573d171593f4179c454b81473c8d0a469e473893106534f31f20a4e
languageName: node
linkType: hard

"@rocket.chat/fuselage-ui-kit@npm:~0.31.12":
version: 0.31.12
resolution: "@rocket.chat/fuselage-ui-kit@npm:0.31.12"
Expand All @@ -4528,7 +4557,7 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/fuselage@npm:^0.31.12, @rocket.chat/fuselage@npm:~0.31.12":
"@rocket.chat/fuselage@npm:^0.31.12":
version: 0.31.12
resolution: "@rocket.chat/fuselage@npm:0.31.12"
dependencies:
Expand All @@ -4550,6 +4579,28 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/fuselage@npm:^0.32.0-dev.46":
version: 0.32.0-dev.46
resolution: "@rocket.chat/fuselage@npm:0.32.0-dev.46"
dependencies:
"@rocket.chat/css-in-js": ~0.31.13-dev.5
"@rocket.chat/css-supports": ~0.31.13-dev.5
"@rocket.chat/fuselage-tokens": ~0.31.13-dev.5
"@rocket.chat/memo": ~0.31.13-dev.5
"@rocket.chat/styled": ~0.31.13-dev.5
invariant: ^2.2.4
react-keyed-flatten-children: ^1.3.0
peerDependencies:
"@rocket.chat/fuselage-hooks": "*"
"@rocket.chat/fuselage-polyfills": "*"
"@rocket.chat/icons": "*"
react: ^17.0.2
react-dom: ^17.0.2
react-virtuoso: 1.2.4
checksum: 5bbefbba3b9311b77b91c90cb11ff4928addf429216bb2ec4fbeb2b6659cf79f3e4d33bdcd8041dd05b4edccde90d4b482efce44bb53e08a76237b4b2dd09f3d
languageName: node
linkType: hard

"@rocket.chat/icons@npm:^0.31.0, @rocket.chat/icons@npm:^0.31.9":
version: 0.31.9
resolution: "@rocket.chat/icons@npm:0.31.9"
Expand Down Expand Up @@ -4688,6 +4739,13 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/memo@npm:~0.31.13-dev.5":
version: 0.31.13-dev.5
resolution: "@rocket.chat/memo@npm:0.31.13-dev.5"
checksum: 0702548d28a02dcce111be0cdf019f5e67a5ead1c2e98e576ea5bc3bd8c686fef9edf59eae66ae2bca39a48190dce6cb62b77fa948df9fde6a75e11404d9d55f
languageName: node
linkType: hard

"@rocket.chat/message-parser@npm:next":
version: 0.31.12-dev.10
resolution: "@rocket.chat/message-parser@npm:0.31.12-dev.10"
Expand Down Expand Up @@ -4729,7 +4787,7 @@ __metadata:
"@rocket.chat/eslint-config": "workspace:^"
"@rocket.chat/forked-matrix-appservice-bridge": ^4.0.1
"@rocket.chat/forked-matrix-bot-sdk": ^0.6.0-beta.2
"@rocket.chat/fuselage": ~0.31.12
"@rocket.chat/fuselage": ^0.32.0-dev.46
"@rocket.chat/fuselage-hooks": ~0.31.12
"@rocket.chat/fuselage-polyfills": ~0.31.12
"@rocket.chat/fuselage-tokens": ~0.31.12
Expand Down Expand Up @@ -5100,6 +5158,16 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/styled@npm:~0.31.13-dev.5":
version: 0.31.13-dev.5
resolution: "@rocket.chat/styled@npm:0.31.13-dev.5"
dependencies:
"@rocket.chat/css-in-js": ~0.31.13-dev.5
tslib: ^2.3.1
checksum: 8e61fdd9f9c546b28ebdd6c1ef4218dbc5e6e53e9d4478dfa0f131f8c6e8603d1843cc3325092abf26bd0072ec79e79b1acb5f63b6219b89bd7af920077c463b
languageName: node
linkType: hard

"@rocket.chat/stylis-logical-props-middleware@npm:^0.31.11":
version: 0.31.11
resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.11"
Expand All @@ -5124,6 +5192,18 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/stylis-logical-props-middleware@npm:~0.31.13-dev.5":
version: 0.31.13-dev.5
resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.13-dev.5"
dependencies:
"@rocket.chat/css-supports": ~0.31.13-dev.5
tslib: ^2.3.1
peerDependencies:
stylis: 4.0.10
checksum: 8077536c3ee4b3ff96269502fe9a999acbd76b5eff5f3e7afb006bf837e914b09f754a7235c89c78abe4df3aca31dc406c2d32d8ef483e3fdfc537ccb766622c
languageName: node
linkType: hard

"@rocket.chat/ui-contexts@workspace:^, @rocket.chat/ui-contexts@workspace:packages/ui-contexts":
version: 0.0.0-use.local
resolution: "@rocket.chat/ui-contexts@workspace:packages/ui-contexts"
Expand Down Expand Up @@ -8607,7 +8687,7 @@ __metadata:
human-interval: ~1.0.0
moment-timezone: ~0.5.27
mongodb: ~3.5.0
checksum: acb4ebb7e7356f6e53e810d821eb6aa3d88bbfb9e85183e707517bee6d1eea1f189f38bdf0dd2b91360492ab7643134d510c320d2523d86596498ab98e59735b
checksum: f5f68008298f9482631f1f494e392cd6b8ba7971a3b0ece81ae2abe60f53d67973ff4476156fa5c9c41b8b58c4ccd284e95c545e0523996dfd05f9a80b843e07
languageName: node
linkType: hard

Expand Down