Skip to content

regression: UiKitMessage refreshing room #31603

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

Merged
ggazzo merged 1 commit into from
Feb 1, 2024
Merged

regression: UiKitMessage refreshing room #31603

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions apps/meteor/client/components/message/uikit/UiKitMessageBlock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { IMessage, IRoom } from '@rocket.chat/core-typings';
import { MessageBlock } from '@rocket.chat/fuselage';
import { MessageBlock, Skeleton } from '@rocket.chat/fuselage';
import { UiKitComponent, UiKitMessage as UiKitMessageSurfaceRender, UiKitContext } from '@rocket.chat/fuselage-ui-kit';
import type { MessageSurfaceLayout } from '@rocket.chat/ui-kit';
import React from 'react';
import React, { Suspense } from 'react';

import { useMessageBlockContextValue } from '../../../uikit/hooks/useMessageBlockContextValue';
import GazzodownText from '../../GazzodownText';
Expand All @@ -20,7 +20,9 @@ const UiKitMessageBlock = ({ rid, mid, blocks }: UiKitMessageBlockProps) => {
<MessageBlock fixedWidth>
<UiKitContext.Provider value={contextValue}>
<GazzodownText>
<UiKitComponent render={UiKitMessageSurfaceRender} blocks={blocks} />
<Suspense fallback={<Skeleton />}>
<UiKitComponent render={UiKitMessageSurfaceRender} blocks={blocks} />
</Suspense>
</GazzodownText>
</UiKitContext.Provider>
</MessageBlock>
Expand Down