diff --git a/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx b/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx index a1fe41e76b8f..46fa4136f94c 100644 --- a/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx +++ b/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx @@ -29,6 +29,8 @@ export const MessageActionMenu: FC<{ [key: string]: MessageActionConfigOption[]; }; + const messagesContainer = document.querySelector('.messages-container') || document.body; + return ( {visible && ( - + {Object.entries(groupOptions).map(([, options], index, arr) => ( {options.map((option) => ( diff --git a/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxDropdown.tsx b/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxDropdown.tsx index d0e6c17e56b7..cb8ee09c921e 100644 --- a/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxDropdown.tsx +++ b/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxDropdown.tsx @@ -14,10 +14,12 @@ const style = css` `; export const ToolboxDropdown = ({ reference, + container, children, ...rest }: { reference: React.RefObject; + container: Element; children: ReactNode; }): ReactElement => { const { isMobile } = useLayout(); @@ -27,7 +29,7 @@ export const ToolboxDropdown = ({ return ( <> - + {children} diff --git a/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxDropdownDesktop.tsx b/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxDropdownDesktop.tsx index 953cda600012..18674f6305bf 100644 --- a/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxDropdownDesktop.tsx +++ b/apps/meteor/client/views/room/MessageList/components/Toolbox/ToolboxDropdownDesktop.tsx @@ -7,11 +7,13 @@ export const ToolboxDropdownDesktop = forwardRef< { reference: RefObject; children: ReactNode; + container: Element; } ->(function ToolboxDropdownDesktop({ reference, children, ...rest }, ref) { +>(function ToolboxDropdownDesktop({ reference, container, children, ...rest }, ref) { const { style: s } = usePosition(reference, ref as RefObject, { watch: true, placement: 'bottom-end', + container, }); return (