added menu options for replies

This commit is contained in:
Shea Duma committed 2026-03-10 17:08:09 +02:00
1 parent f79d124fd2
commit bbf8cf5348
4 files changed
+180 -26

No files matched your search

@@ -1,5 +1,5 @@
import { style } from '@vanilla-extract/css';
import { DefaultReset, color, config } from 'folds';
import { DefaultReset, color, config, toRem } from 'folds';
export const EventHistory = style([
DefaultReset,
@@ -22,6 +22,7 @@ export const Content = style({
export const EventItem = style({
padding: `${config.space.S200} ${config.space.S200}`,
height: 'unset',
width: '100%',
borderRadius: '5px',
border: '2px hidden',
backgroundColor: 'inherit',
@@ -31,3 +32,25 @@ export const EventItem = style({
},
},
});
export const MessageOptionsBase = style([
DefaultReset,
{
position: 'absolute',
top: toRem(-30),
right: 0,
zIndex: 1,
},
]);
export const MessageOptionsBar = style([
DefaultReset,
{
padding: config.space.S100,
},
]);
export const MenuOptions = style({
position: 'absolute',
right: '0',
top: '0',
display: 'flex',
transform: 'translateY(-75%)',
});
+132 -22
View File
@@ -6,6 +6,7 @@ import {
Icon,
IconButton,
Icons,
Menu,
MenuItem,
Scroll,
Text,
@@ -13,7 +14,7 @@ import {
color,
config,
} from 'folds';
import { MatrixEvent, Room } from '$types/matrix-sdk';
import { IContent, MatrixEvent, Room } from '$types/matrix-sdk';
import { getMemberDisplayName } from '$utils/room';
import { getMxIdLocalPart } from '$utils/matrix';
import { useMatrixClient } from '$hooks/useMatrixClient';
@@ -21,17 +22,19 @@ import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useOpenUserRoomProfile } from '$state/hooks/userRoomProfile';
import { useSpaceOptionally } from '$hooks/useSpace';
import { getMouseEventCords } from '$utils/dom';
import { useAtomValue } from 'jotai';
import { useAtomValue, useSetAtom } from 'jotai';
import { nicknamesAtom } from '$state/nicknames';
import { UserAvatar } from '$components/user-avatar';
import { RenderBody, Time } from '$components/message';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
import { useMemo } from 'react';
import { useCallback, useMemo, useState } from 'react';
import { getReactCustomHtmlParser, LINKIFY_OPTS } from '$plugins/react-custom-html-parser';
import { Opts as LinkifyOpts } from 'linkifyjs';
import { HTMLReactParserOptions } from 'html-react-parser';
import { useSpoilerClickHandler } from '$hooks/useSpoilerClickHandler';
import { modalAtom, ModalType } from '$state/modal';
import { roomIdToReplyDraftAtomFamily } from '$state/room/roomInputDrafts';
import * as css from './EventHistory.css';
export type EventHistoryProps = {
@@ -71,6 +74,131 @@ export const EventHistory = as<'div', EventHistoryProps>(
}),
[linkifyOpts, mEvents, mx, spoilerClickHandler, useAuthentication]
);
const setReplyDraft = useSetAtom(roomIdToReplyDraftAtomFamily(room.roomId));
const triggerReply = useCallback(
(replyId: string, startThread = false) => {
const replyEvt = room.findEventById(replyId);
if (!replyEvt) return;
const content: IContent = replyEvt.getOriginalContent();
const body = content?.['m.new_content']?.body ?? content?.body ?? '';
const formattedBody =
content?.['m.new_content']?.formatted_body ?? content?.formatted_body ?? '';
const { 'm.relates_to': relation } = startThread
? { 'm.relates_to': { rel_type: 'm.thread', event_id: replyId } }
: replyEvt.getWireContent();
const senderId = replyEvt.getSender();
if (senderId) {
if (typeof body === 'string') {
setReplyDraft({
userId: senderId,
eventId: replyId,
body,
formattedBody,
relation,
});
} else {
setReplyDraft({
userId: senderId,
eventId: replyId,
body: '',
formattedBody: '',
relation,
});
}
}
},
[room, setReplyDraft]
);
function MenuOptions({ mEvent }: { mEvent: MatrixEvent }) {
const setModal = useSetAtom(modalAtom);
return (
<Menu className={css.MenuOptions}>
<MenuItem
size="300"
after={<Icon size="100" src={Icons.ReplyArrow} />}
radii="300"
fill="None"
variant="Secondary"
onClick={(e) => {
e.preventDefault();
e.stopPropagation();
if (mEvent.event.event_id) {
triggerReply(mEvent.event.event_id, false);
requestClose();
}
}}
/>
<MenuItem
size="300"
after={<Icon size="100" src={Icons.ThreadReply} />}
radii="300"
fill="None"
variant="Secondary"
onClick={(e) => {
e.preventDefault();
e.stopPropagation();
if (mEvent.event.event_id) {
triggerReply(mEvent.event.event_id, true);
requestClose();
}
}}
/>
<MenuItem
size="300"
after={<Icon size="100" src={Icons.Delete} />}
radii="300"
fill="None"
variant="Critical"
onClick={(e) => {
e.preventDefault();
e.stopPropagation();
setModal({
type: ModalType.Delete,
room,
mEvent,
});
}}
/>
</Menu>
);
}
function EventItem({ mEvent, EventContent }: { mEvent: MatrixEvent; EventContent: IContent }) {
const [isHovered, setIsHovered] = useState(false);
return (
<Box
style={{ position: 'relative', width: '100%' }}
onMouseEnter={() => setIsHovered(true)}
onMouseLeave={() => setIsHovered(false)}
onClick={() => setIsHovered(!isHovered)}
>
<Box className={css.EventItem}>
<Time
ts={mEvent.getTs()}
hour24Clock={hour24Clock}
dateFormatString={dateFormatString}
/>
<Text size="T400" style={{ paddingLeft: '10px', wordBreak: 'break-word' }}>
<RenderBody
body={EventContent?.['m.new_content']?.body ?? EventContent?.body ?? ''}
customBody={
EventContent?.['m.new_content']?.formatted_body ??
EventContent?.formatted_body ??
''
}
htmlReactParserOptions={htmlReactParserOptions}
linkifyOpts={linkifyOpts}
/>
</Text>
</Box>
{isHovered && <MenuOptions mEvent={mEvent} />}
</Box>
);
}
return (
<Box
className={classNames(css.EventHistory, className)}
@@ -128,25 +256,7 @@ export const EventHistory = as<'div', EventHistoryProps>(
return (
<>
<hr style={{ width: '100%', color: color.Surface.ContainerLine }} />
<Box className={css.EventItem}>
<Time
ts={mEvent.getTs()}
hour24Clock={hour24Clock}
dateFormatString={dateFormatString}
/>
<Text size="T400" style={{ paddingLeft: '10px', wordBreak: 'break-word' }}>
<RenderBody
body={EventContent?.['m.new_content']?.body ?? EventContent?.body ?? ''}
customBody={
EventContent?.['m.new_content']?.formatted_body ??
EventContent?.formatted_body ??
''
}
htmlReactParserOptions={htmlReactParserOptions}
linkifyOpts={linkifyOpts}
/>
</Text>
</Box>
<EventItem mEvent={mEvent} EventContent={EventContent} />
</>
);
})}
@@ -7,7 +7,15 @@ import { modalAtom, ModalType } from '$state/modal';
import * as css from '$features/room/message/styles.css';
import { EventHistory } from '$components/event-history';
export function MessageEditHistoryItem({ room, mEvent }: { room: Room; mEvent: MatrixEvent }) {
export function MessageEditHistoryItem({
room,
mEvent,
closeMenu,
}: {
room: Room;
mEvent: MatrixEvent;
closeMenu: () => void;
}) {
const setModal = useSetAtom(modalAtom);
return (
@@ -18,6 +26,7 @@ export function MessageEditHistoryItem({ room, mEvent }: { room: Room; mEvent: M
onClick={(e: MouseEvent) => {
e.preventDefault();
e.stopPropagation();
closeMenu();
setModal({
type: ModalType.EditHistory,
room,
+14 -2
View File
@@ -877,7 +877,13 @@ function MessageInternal(
{!hideReadReceipts && (
<MessageReadReceiptItem room={room} eventId={mEvent.getId() ?? ''} />
)}
{isEdited && <MessageEditHistoryItem room={room} mEvent={mEvent} />}
{isEdited && (
<MessageEditHistoryItem
room={room}
mEvent={mEvent}
closeMenu={closeMenu}
/>
)}
{showDeveloperTools && (
<MessageSourceCodeItem room={room} mEvent={mEvent} />
)}
@@ -1179,7 +1185,13 @@ export const Event = as<'div', EventProps>(
{!hideReadReceipts && (
<MessageReadReceiptItem room={room} eventId={mEvent.getId() ?? ''} />
)}
{isEdited && <MessageEditHistoryItem room={room} mEvent={mEvent} />}
{isEdited && (
<MessageEditHistoryItem
room={room}
mEvent={mEvent}
closeMenu={closeMenu}
/>
)}
{showDeveloperTools && (
<MessageSourceCodeItem room={room} mEvent={mEvent} />
)}