Skip to content

fix: display message actions dialogs for thread replies sent to channel #2823

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
merged 1 commit into from
Sep 11, 2025
Merged

fix: display message actions dialogs for thread replies sent to channel #2823

Show file tree
Hide file tree
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
13 changes: 11 additions & 2 deletions src/components/Message/MessageOptions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,18 @@ const UnMemoizedMessageOptions = (props: MessageOptionsProps) => {
} = useMessageContext('MessageOptions');

const { t } = useTranslationContext('MessageOptions');
const messageActionsDialogIsOpen = useDialogIsOpen(`message-actions--${message.id}`);

// It is necessary to namespace the dialog IDs because a message with the same ID
// can appear in the main message list as well as in the thread message list.
// Without the namespace, the search for dialog would be performed by the message ID only
// which could return the dialog for a message in another message list (which would not be rendered).
const dialogIdNamespace = threadList ? '-thread-' : '';

const messageActionsDialogIsOpen = useDialogIsOpen(
`message-actions${dialogIdNamespace}--${message.id}`,
);
const reactionSelectorDialogIsOpen = useDialogIsOpen(
`reaction-selector--${message.id}`,
`reaction-selector${dialogIdNamespace}--${message.id}`,
);
const handleOpenThread = propHandleOpenThread || contextHandleOpenThread;

Expand Down
3 changes: 2 additions & 1 deletion src/components/MessageActions/MessageActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ export const MessageActions = (props: MessageActionsProps) => {

const isMuted = useCallback(() => isUserMuted(message, mutes), [message, mutes]);

const dialogId = `message-actions--${message.id}`;
const dialogIdNamespace = threadList ? '-thread-' : '';
const dialogId = `message-actions${dialogIdNamespace}--${message.id}`;
const dialog = useDialog({ id: dialogId });
const dialogIsOpen = useDialogIsOpen(dialogId);

Expand Down
5 changes: 3 additions & 2 deletions src/components/Reactions/ReactionSelectorWithButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ export const ReactionSelectorWithButton = ({
ReactionIcon,
}: ReactionSelectorWithButtonProps) => {
const { t } = useTranslationContext('ReactionSelectorWithButton');
const { isMyMessage, message } = useMessageContext('MessageOptions');
const { isMyMessage, message, threadList } = useMessageContext('MessageOptions');
const { ReactionSelector = DefaultReactionSelector } =
useComponentContext('MessageOptions');
const buttonRef = useRef<ElementRef<'button'>>(null);
const dialogId = `reaction-selector--${message.id}`;
const dialogIdNamespace = threadList ? '-thread-' : '';
const dialogId = `reaction-selector${dialogIdNamespace}--${message.id}`;
const dialog = useDialog({ id: dialogId });
const dialogIsOpen = useDialogIsOpen(dialogId);
return (
Expand Down