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] Unintended "Reply on thread" button showing on thread's first message #27716

Merged
merged 11 commits into from Jan 25, 2023
Merged

[FIX] Unintended "Reply on thread" button showing on thread's first message #27716

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
55a5991
[FIX]Reply on thread button showing unintendedly
Educg550 Jan 10, 2023
f77c4a0
Fix on message context flagging
Educg550 Jan 10, 2023
9ce6a7e
Requested changes made
Educg550 Jan 12, 2023
84ee601
Fixed lint issue
Educg550 Jan 12, 2023
e2d1c04
Requested changes still in progress
Educg550 Jan 13, 2023
66e022b
Refined code with requested changes
Educg550 Jan 13, 2023
26b24ab
Removed prop from core typing - parsed through components
Educg550 Jan 16, 2023
38eb124
New type for message context and minor fixes
Educg550 Jan 17, 2023
0f13dd6
Merge branch 'develop' into tc-128
Educg550 Jan 17, 2023
44c0538
Merge branch 'develop' into tc-128
kodiakhq[bot] Jan 24, 2023
dfc490e
Merge branch 'develop' into tc-128
hugocostadev Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions apps/meteor/client/components/message/ToolboxHolder.tsx
View file
Open in desktop
Expand Up @@ -8,14 +8,15 @@ import Toolbox from './toolbox/Toolbox';

type ToolboxHolderProps = {
message: IMessage;
context?: 'message' | 'thread' | 'federated';
};

export const ToolboxHolder = (props: ToolboxHolderProps): ReactElement => {
export const ToolboxHolder = ({ message, context }: ToolboxHolderProps): ReactElement => {
const ref = useRef(null);

const [visible] = useIsVisible(ref);

return <MessageToolboxWrapper ref={ref}>{visible && <Toolbox {...props} />}</MessageToolboxWrapper>;
return <MessageToolboxWrapper ref={ref}>{visible && <Toolbox message={message} messageContext={context} />}</MessageToolboxWrapper>;
};

export default memo(ToolboxHolder);
12 changes: 7 additions & 5 deletions apps/meteor/client/components/message/toolbox/Toolbox.tsx
View file
Open in desktop
@@ -1,4 +1,4 @@
import type { IMessage, IUser, IRoom } from '@rocket.chat/core-typings';
import type { IUser, IRoom, IMessage } from '@rocket.chat/core-typings';
import { isThreadMessage, isRoomFederated } from '@rocket.chat/core-typings';
import { MessageToolbox, MessageToolboxItem } from '@rocket.chat/fuselage';
import { useUser, useUserSubscription, useSettings, useTranslation } from '@rocket.chat/ui-contexts';
Expand All @@ -14,24 +14,25 @@ import { useRoom } from '../../../views/room/contexts/RoomContext';
import { useToolboxContext } from '../../../views/room/contexts/ToolboxContext';
import MessageActionMenu from './MessageActionMenu';

const getMessageContext = (message: IMessage, room: IRoom): MessageActionContext => {
const getMessageContext = (message: IMessage, room: IRoom, context?: 'message' | 'thread' | 'federated'): MessageActionContext => {
if (message.t === 'videoconf') {
return 'videoconf';
}
if (isRoomFederated(room)) {
return 'federated';
}
if (isThreadMessage(message)) {
if (isThreadMessage(message) || (context && context === 'thread')) {
Educg550 marked this conversation as resolved.
Show resolved Hide resolved
return 'threads';
}
return 'message';
};

type ToolboxProps = {
message: IMessage;
messageContext?: 'message' | 'thread' | 'federated';
Educg550 marked this conversation as resolved.
Show resolved Hide resolved
};

const Toolbox = ({ message }: ToolboxProps): ReactElement | null => {
const Toolbox = ({ message, messageContext }: ToolboxProps): ReactElement | null => {
const t = useTranslation();

const room = useRoom();
Expand All @@ -40,7 +41,8 @@ const Toolbox = ({ message }: ToolboxProps): ReactElement | null => {
const settings = useSettings();
const user = useUser() as IUser;

const context = getMessageContext(message, room);
console.log(messageContext);
Educg550 marked this conversation as resolved.
Show resolved Hide resolved
const context = getMessageContext(message, room, messageContext);

const mapSettings = useMemo(() => Object.fromEntries(settings.map((setting) => [setting._id, setting.value])), [settings]);

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/components/message/variants/ThreadMessage.tsx
View file
Open in desktop
Expand Up @@ -85,7 +85,7 @@ const ThreadMessage = ({ message, sequential, unread }: ThreadMessageProps): Rea

{ignored ? <IgnoredContent onShowMessageIgnored={toggleIgnoring} /> : <ThreadMessageContent message={normalizedMessage} />}
</MessageContainer>
{!message.private && <ToolboxHolder message={message} />}
{!message.private && <ToolboxHolder message={message} context={'thread'} />}
</Message>
);
};
Expand Down