Skip to content

Regression: Fix reply button not working when hideFlexTab is enabled #25306

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
filipemarins merged 2 commits into from
Apr 26, 2022
Merged

Regression: Fix reply button not working when hideFlexTab is enabled #25306

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
1508e80
fix: add stop propagation on open thread
Apr 26, 2022
2f41414
Fix type
gabriellsh Apr 26, 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
4 changes: 2 additions & 2 deletions apps/meteor/client/components/Message/Metrics/Thread.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Message, MessageMetricsItem, MessageBlock } from '@rocket.chat/fuselage';
import React, { useCallback, FC } from 'react';
import React, { useCallback, FC, MouseEvent as ReactMouseEvent } from 'react';

import { useEndpoint } from '../../../contexts/ServerContext';
import { useTranslation } from '../../../contexts/TranslationContext';
Expand All @@ -17,7 +17,7 @@ type ThreadReplyOptions = {
counter: number;
participants: number;
following: boolean;
openThread: () => any;
openThread: (e: ReactMouseEvent<Element, MouseEvent>) => void;
};

const ThreadMetric: FC<ThreadReplyOptions> = ({ unread, mention, all, rid, mid, counter, participants, following, lm, openThread }) => {
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/room/contexts/MessageContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export type MessageContextValue = {
actions: {
openUserCard: (username: string) => (e: MouseEvent<HTMLDivElement>) => void;
openRoom: (id: string) => () => void;
openThread: (tmid: string, jump?: string) => () => void;
openThread: (tmid: string, jump?: string) => (e: MouseEvent) => void;
runActionLink: (message: IMessage) => (action: string) => () => void;
replyBroadcast: (message: IMessage) => void;
};
Expand Down
6 changes: 4 additions & 2 deletions apps/meteor/client/views/room/providers/MessageProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ export const MessageProvider = memo(function MessageProvider({
const dateAndTime = useFormatDateAndTime();
const context = useMemo(() => {
const openThread =
(tmid: string, jump?: string): (() => void) =>
(): void => {
(tmid: string, jump?: string): ((e: MouseEvent) => void) =>
(e: MouseEvent): void => {
e.stopPropagation();

router.replace(
{
...params,
Expand Down