diff --git a/src/app/components/event-history/EventHistory.tsx b/src/app/components/event-history/EventHistory.tsx index 6cc59126c..d1c5b1916 100644 --- a/src/app/components/event-history/EventHistory.tsx +++ b/src/app/components/event-history/EventHistory.tsx @@ -50,6 +50,136 @@ import { useSettingsLinkBaseUrl } from '$features/settings/useSettingsLinkBaseUr import * as css from './EventHistory.css'; import { EventType, RelationType } from '$types/matrix-sdk'; +type MenuOptionsProps = { + mEvent: MatrixEvent; + room: Room; + canDelete: boolean; + triggerReply: (replyId: string, startThread?: boolean) => void; + requestClose: () => void; +}; + +function MenuOptions({ + mEvent, + room, + canDelete, + triggerReply, + requestClose, +}: Readonly) { + const setModal = useSetAtom(modalAtom); + return ( + + { + e.preventDefault(); + e.stopPropagation(); + if (mEvent.event.event_id) { + triggerReply(mEvent.event.event_id, false); + requestClose(); + } + }} + /> + { + e.preventDefault(); + e.stopPropagation(); + if (mEvent.event.event_id) { + triggerReply(mEvent.event.event_id, true); + requestClose(); + } + }} + /> + {canDelete && ( + { + e.preventDefault(); + e.stopPropagation(); + setModal({ + type: ModalType.Delete, + room, + mEvent, + }); + }} + /> + )} + + ); +} + +type EventItemProps = { + mEvent: MatrixEvent; + EventContent: IContent; + hour24Clock: boolean; + dateFormatString: string; + htmlReactParserOptions: HTMLReactParserOptions; + linkifyOpts: LinkifyOpts; + room: Room; + canDelete: boolean; + triggerReply: (replyId: string, startThread?: boolean) => void; + requestClose: () => void; +}; + +function EventItem({ + mEvent, + EventContent, + hour24Clock, + dateFormatString, + htmlReactParserOptions, + linkifyOpts, + room, + canDelete, + triggerReply, + requestClose, +}: Readonly) { + const [isHovered, setIsHovered] = useState(false); + return ( + setIsHovered(true)} + onMouseLeave={() => setIsHovered(false)} + onClick={() => setIsHovered(!isHovered)} + > + + + {isHovered && ( + + )} + + ); +} + type EventHistoryProps = { room: Room; mEvents: MatrixEvent[]; @@ -130,99 +260,6 @@ export const EventHistory = as<'div', EventHistoryProps>( [room, setReplyDraft] ); - function MenuOptions({ mEvent }: Readonly<{ mEvent: MatrixEvent }>) { - const setModal = useSetAtom(modalAtom); - return ( - - { - e.preventDefault(); - e.stopPropagation(); - if (mEvent.event.event_id) { - triggerReply(mEvent.event.event_id, false); - requestClose(); - } - }} - /> - { - e.preventDefault(); - e.stopPropagation(); - if (mEvent.event.event_id) { - triggerReply(mEvent.event.event_id, true); - requestClose(); - } - }} - /> - {canDelete && ( - { - e.preventDefault(); - e.stopPropagation(); - setModal({ - type: ModalType.Delete, - room, - mEvent, - }); - }} - /> - )} - - ); - } - - function EventItem({ - mEvent, - EventContent, - }: Readonly<{ mEvent: MatrixEvent; EventContent: IContent }>) { - const [isHovered, setIsHovered] = useState(false); - return ( - setIsHovered(true)} - onMouseLeave={() => setIsHovered(false)} - onClick={() => setIsHovered(!isHovered)} - > - - - {isHovered && } - - ); - } - return ( ( color: color.Surface.ContainerLine, }} /> - + ); })}