Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 2 deletions src/components/MessageActions/MessageActions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { useBaseMessageActionSetFilter, useSplitMessageActionSet } from './hooks
import { defaultMessageActionSet } from './defaults';
import { ActionsIcon, type MESSAGE_ACTIONS } from '../Message';
import { Button } from '../Button';
import { ReactionSelector } from '../Reactions';

type BaseMessageActionSetItem = {
placement: 'quick' | 'dropdown';
Expand Down Expand Up @@ -49,7 +50,7 @@ export const MessageActions = ({
messageActionSet = defaultMessageActionSet,
}: MessageActionsProps) => {
const { theme } = useChatContext();
const { isMyMessage, message } = useMessageContext();
const { isMyMessage, message, threadList } = useMessageContext();
const { t } = useTranslationContext();
const [actionsBoxButtonElement, setActionsBoxButtonElement] =
useState<HTMLSpanElement | null>(null);
Expand All @@ -64,7 +65,10 @@ export const MessageActions = ({
);

const dropdownDialogId = `message-actions--${message.id}`;
const reactionSelectorDialogId = `reaction-selector--${message.id}`;
const reactionSelectorDialogId = ReactionSelector.getReactionSelectorDialogId({
messageId: message.id,
threadList,
});
const { dialog, dialogManager } = useDialogOnNearestManager({ id: dropdownDialogId });
const dropdownDialogIsOpen = useDialogIsOpen(dropdownDialogId, dialogManager?.id);
const reactionSelectorDialogIsOpen = useDialogIsOpen(
Expand Down
28 changes: 19 additions & 9 deletions src/components/Reactions/ReactionSelector.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useMemo, useState } from 'react';
import React, { type JSX, useMemo, useState } from 'react';
import clsx from 'clsx';

import { useDialog } from '../Dialog';
Expand All @@ -20,9 +20,17 @@ export type ReactionSelectorProps = {
own_reactions?: ReactionResponse[];
};

interface ReactionSelectorInterface {
(props: ReactionSelectorProps): JSX.Element;
getReactionSelectorDialogId: (_: {
messageId: string;
threadList?: boolean;
}) => `reaction-selector${'-thread' | ''}--${string}`;
}

const stableOwnReactions: ReactionResponse[] = [];

const UnMemoizedReactionSelector = (props: ReactionSelectorProps) => {
export const ReactionSelector: ReactionSelectorInterface = (props) => {
const { handleReaction: propHandleReaction, own_reactions: propOwnReactions } = props;
const [extendedListOpen, setExtendedListOpen] = useState(false);

Expand All @@ -33,8 +41,12 @@ const UnMemoizedReactionSelector = (props: ReactionSelectorProps) => {
closeReactionSelectorOnClick,
handleReaction: contextHandleReaction,
message,
threadList,
} = useMessageContext('ReactionSelector');
const dialogId = `reaction-selector--${message.id}`;
const dialogId = ReactionSelector.getReactionSelectorDialogId({
messageId: message.id,
threadList,
});
const dialog = useDialog({ id: dialogId });

const handleReaction = propHandleReaction ?? contextHandleReaction;
Expand Down Expand Up @@ -136,9 +148,7 @@ const UnMemoizedReactionSelector = (props: ReactionSelectorProps) => {
);
};

/**
* Component that allows a user to select a reaction.
*/
export const ReactionSelector = React.memo(
UnMemoizedReactionSelector,
) as typeof UnMemoizedReactionSelector;
ReactionSelector.getReactionSelectorDialogId = (({ messageId, threadList }) => {
const dialogIdNamespace = threadList ? '-thread' : '';
return `reaction-selector${dialogIdNamespace}--${messageId}`;
}) satisfies ReactionSelectorInterface['getReactionSelectorDialogId'];
6 changes: 4 additions & 2 deletions src/components/Reactions/ReactionSelectorWithButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ export const ReactionSelectorWithButton = ({
const { ReactionSelector = DefaultReactionSelector } =
useComponentContext('MessageOptions');
const buttonRef = useRef<ElementRef<'button'>>(null);
const dialogIdNamespace = threadList ? '-thread-' : '';
const dialogId = `reaction-selector${dialogIdNamespace}--${message.id}`;
const dialogId = DefaultReactionSelector.getReactionSelectorDialogId({
messageId: message.id,
threadList,
});
const { dialog, dialogManager } = useDialogOnNearestManager({ id: dialogId });
const dialogIsOpen = useDialogIsOpen(dialogId, dialogManager?.id);

Expand Down
Loading