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

Regression: Broken room and message composer events #27754

Merged
merged 2 commits into from
Jan 14, 2023
Merged

Regression: Broken room and message composer events #27754

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
54142f5
Pass `tmid` to templates
tassoevan Jan 13, 2023
24419cd
Workaround legacy events in `RoomBody`
tassoevan Jan 13, 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
5 changes: 4 additions & 1 deletion apps/meteor/client/views/room/components/body/RoomBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,10 @@ const RoomBody = (): ReactElement => {
useLegacyMessageEvents({
messageListRef: {
get current() {
if (!useLegacyMessageTemplate) {
return null;
}

return wrapperRef.current?.querySelector('ul') ?? null;
},
},
Expand Down Expand Up @@ -619,7 +623,6 @@ const RoomBody = (): ReactElement => {
<ComposerContainer
rid={room._id}
subscription={subscription}
chatMessagesInstance={chat}
onResize={handleComposerResize}
onNavigateToPreviousMessage={handleNavigateToPreviousMessage}
onNavigateToNextMessage={handleNavigateToNextMessage}
Expand Down
49 changes: 17 additions & 32 deletions apps/meteor/client/views/room/components/body/composer/ComposerMessage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import type { IRoom, ISubscription } from '@rocket.chat/core-typings';
import type { IMessage, IRoom, ISubscription } from '@rocket.chat/core-typings';
import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
import type { ContextType, ReactElement, ReactNode } from 'react';
import type { ReactElement, ReactNode } from 'react';
import React, { memo, useCallback, useMemo } from 'react';

import { RoomManager } from '../../../../../../app/ui-utils/client';
import { useReactiveValue } from '../../../../../hooks/useReactiveValue';
import ComposerSkeleton from '../../../Room/ComposerSkeleton';
import type { ChatContext } from '../../../contexts/ChatContext';
import { useChat } from '../../../contexts/ChatContext';
import MessageBox from './messageBox/MessageBox';

export type ComposerMessageProps = {
rid: IRoom['_id'];
tmid?: IMessage['_id'];
children?: ReactNode;
subscription?: ISubscription;
readOnly?: boolean;
tshow?: boolean;
chatMessagesInstance: ContextType<typeof ChatContext>;
onResize?: () => void;
onEscape?: () => void;
onSend?: () => void;
Expand All @@ -24,14 +24,15 @@ export type ComposerMessageProps = {
onUploadFiles?: (files: readonly File[]) => void;
};

const ComposerMessage = ({ rid, chatMessagesInstance, readOnly, onSend, ...props }: ComposerMessageProps): ReactElement => {
const ComposerMessage = ({ rid, tmid, readOnly, onSend, ...props }: ComposerMessageProps): ReactElement => {
const chat = useChat();
const dispatchToastMessage = useToastMessageDispatch();

const composerProps = useMemo(
() => ({
onJoin: async (): Promise<void> => {
try {
await chatMessagesInstance?.data?.joinRoom();
await chat?.data?.joinRoom();
} catch (error) {
dispatchToastMessage({ type: 'error', message: error });
throw error;
Expand All @@ -40,8 +41,8 @@ const ComposerMessage = ({ rid, chatMessagesInstance, readOnly, onSend, ...props

onSend: async ({ value: text, tshow }: { value: string; tshow?: boolean }): Promise<void> => {
try {
await chatMessagesInstance?.flows.action.stop('typing');
const newMessageSent = await chatMessagesInstance?.flows.sendMessage({
await chat?.flows.action.stop('typing');
const newMessageSent = await chat?.flows.sendMessage({
text,
tshow,
});
Expand All @@ -51,26 +52,19 @@ const ComposerMessage = ({ rid, chatMessagesInstance, readOnly, onSend, ...props
}
},
onTyping: async (): Promise<void> => {
if (chatMessagesInstance?.composer?.text?.trim() === '') {
await chatMessagesInstance?.flows.action.stop('typing');
if (chat?.composer?.text?.trim() === '') {
await chat?.flows.action.stop('typing');
return;
}
await chatMessagesInstance?.flows.action.start('typing');
await chat?.flows.action.start('typing');
},
onNavigateToPreviousMessage: () => chatMessagesInstance?.messageEditing.toPreviousMessage(),
onNavigateToNextMessage: () => chatMessagesInstance?.messageEditing.toNextMessage(),
onNavigateToPreviousMessage: () => chat?.messageEditing.toPreviousMessage(),
onNavigateToNextMessage: () => chat?.messageEditing.toNextMessage(),
onUploadFiles: (files: readonly File[]) => {
return chatMessagesInstance?.flows.uploadFiles(files);
return chat?.flows.uploadFiles(files);
},
}),
[
chatMessagesInstance?.data,
chatMessagesInstance?.flows,
chatMessagesInstance?.composer?.text,
chatMessagesInstance?.messageEditing,
dispatchToastMessage,
onSend,
],
[chat?.data, chat?.flows, chat?.composer?.text, chat?.messageEditing, dispatchToastMessage, onSend],
);

const publicationReady = useReactiveValue(useCallback(() => RoomManager.getOpenedRoomByRid(rid)?.streamActive ?? false, [rid]));
Expand All @@ -83,16 +77,7 @@ const ComposerMessage = ({ rid, chatMessagesInstance, readOnly, onSend, ...props
);
}

return (
<MessageBox
readOnly={readOnly ?? false}
rid={rid}
{...composerProps}
showFormattingTips={true}
{...props}
chatContext={chatMessagesInstance}
/>
);
return <MessageBox readOnly={readOnly ?? false} rid={rid} tmid={tmid} {...composerProps} showFormattingTips={true} {...props} />;
};

export default memo(ComposerMessage);
6 changes: 3 additions & 3 deletions apps/meteor/client/views/room/components/body/composer/messageBox/MessageBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ import { useAutoGrow } from '../RoomComposer/hooks/useAutoGrow';
import MessageBoxFormattingToolbar from './MessageBoxFormattingToolbar';
import MessageBoxReplies from './MessageBoxReplies';

type MessageBoxProps = MessageBoxTemplateInstance['data'];

const reducer = (_: unknown, event: FormEvent<HTMLInputElement>): boolean => {
const target = event.target as HTMLInputElement;

Expand Down Expand Up @@ -81,7 +79,9 @@ const getEmptyFalse = () => false;
const a: any[] = [];
const getEmptyArray = () => a;

export const MessageBox = ({
type MessageBoxProps = Omit<MessageBoxTemplateInstance['data'], 'chatContext'>;

const MessageBox = ({
rid,
tmid,
onSend,
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/room/contextualBar/Threads/components/ThreadChat.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ const ThreadChat: VFC<ThreadChatProps> = ({ mainMessage }) => {

<ComposerContainer
rid={mainMessage.rid}
tmid={mainMessage._id}
subscription={subscription}
chatMessagesInstance={chat}
onSend={handleSend}
onEscape={handleComposerEscape}
onNavigateToPreviousMessage={handleNavigateToPreviousMessage}
Expand Down