diff --git a/CHANGELOG.md b/CHANGELOG.md index 214abbbb..ccce174c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Sable Client Changelog +## Version 1.1.5 + +- Various performance improvements. See commits for details. +- Fix typing indicator z index on mobile. +- Fix room nicknames not displaying. +- Fix rare crash with colorMXID [(#15)](https://github.com/7w1/sable/pull/15) +- Fix crash from long pronoun pills [(#16)](https://github.com/7w1/sable/pull/16) + ## Version 1.1.4 - Various performance improvements diff --git a/package-lock.json b/package-lock.json index 58a8e20b..d588d230 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "sable", - "version": "1.1.4", + "version": "1.1.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "sable", - "version": "1.1.4", + "version": "1.1.5", "license": "AGPL-3.0-only", "dependencies": { "@atlaskit/pragmatic-drag-and-drop": "1.1.6", diff --git a/package.json b/package.json index 0976f42e..f84f3c15 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sable", - "version": "1.1.4", + "version": "1.1.5", "description": "Yet another matrix client fork", "main": "index.js", "type": "module", diff --git a/src/app/components/RenderMessageContent.tsx b/src/app/components/RenderMessageContent.tsx index 691ed689..5666cb5d 100644 --- a/src/app/components/RenderMessageContent.tsx +++ b/src/app/components/RenderMessageContent.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import React, { useMemo, useCallback } from 'react'; import { MsgType } from 'matrix-js-sdk'; import { HTMLReactParserOptions } from 'html-react-parser'; import { Opts } from 'linkifyjs'; @@ -30,7 +30,6 @@ import { ImageViewer } from './image-viewer'; import { PdfViewer } from './Pdf-viewer'; import { TextViewer } from './text-viewer'; import { testMatrixTo } from '../plugins/matrix-to'; -import { IImageContent } from '../../types/matrix/common'; type RenderMessageContentProps = { displayName: string; @@ -46,7 +45,6 @@ type RenderMessageContentProps = { outlineAttachment?: boolean; }; -// Checks for supported direct preview file types const getMediaType = (url: string) => { const cleanUrl = url.toLowerCase(); if (cleanUrl.match(/\.(mp4|webm|ogg)$/i)) return 'video'; @@ -57,7 +55,9 @@ const getMediaType = (url: string) => { return null; }; -export function RenderMessageContent({ +const CAPTION_STYLE = { marginTop: config.space.S200 }; + +function RenderMessageContentInternal({ displayName, msgType, ts, @@ -70,7 +70,18 @@ export function RenderMessageContent({ linkifyOpts, outlineAttachment, }: RenderMessageContentProps) { - const renderUrlsPreview = (urls: string[]) => { + const content = useMemo(() => getContent(), [getContent]); + + const renderBody = useCallback((props: any) => ( + + ), [highlightRegex, htmlReactParserOptions, linkifyOpts]); + + const renderUrlsPreview = useCallback((urls: string[]) => { const filteredUrls = urls.filter((url) => !testMatrixTo(url)); if (filteredUrls.length === 0) return undefined; @@ -80,10 +91,7 @@ export function RenderMessageContent({ })); const mediaLinks = analyzed.filter(item => item.type !== null); - - const toRender = mediaLinks.length > 0 - ? mediaLinks - : [analyzed[0]]; + const toRender = mediaLinks.length > 0 ? mediaLinks : [analyzed[0]]; return ( @@ -97,23 +105,16 @@ export function RenderMessageContent({ ))} ); - }; + }, [ts]); + const renderCaption = () => { - const content: IImageContent = getContent(); if (content.filename && content.filename !== content.body) { return ( ( - - )} + renderBody={renderBody} renderUrlsPreview={urlPreview ? renderUrlsPreview : undefined} /> ); @@ -124,7 +125,7 @@ export function RenderMessageContent({ const renderFile = () => ( <> ( ( - - )} + content={content} + renderBody={renderBody} renderUrlsPreview={urlPreview ? renderUrlsPreview : undefined} /> ); @@ -180,15 +174,8 @@ export function RenderMessageContent({ ( - - )} + content={content} + renderBody={renderBody} renderUrlsPreview={urlPreview ? renderUrlsPreview : undefined} /> ); @@ -198,15 +185,8 @@ export function RenderMessageContent({ return ( ( - - )} + content={content} + renderBody={renderBody} renderUrlsPreview={urlPreview ? renderUrlsPreview : undefined} /> ); @@ -216,10 +196,10 @@ export function RenderMessageContent({ return ( <> ( + content={content} + renderImageContent={(imageProps) => ( } renderViewer={(p) => } @@ -236,13 +216,13 @@ export function RenderMessageContent({ return ( <> ( + renderVideoContent={({ body, info, ...videoProps }) => ( ( @@ -269,10 +249,10 @@ export function RenderMessageContent({ return ( <> ( - } /> + renderAudioContent={(audioProps) => ( + } /> )} outlined={outlineAttachment} /> @@ -281,17 +261,11 @@ export function RenderMessageContent({ ); } - if (msgType === MsgType.File) { - return renderFile(); - } - - if (msgType === MsgType.Location) { - return ; - } - - if (msgType === 'm.bad.encrypted') { - return ; - } + if (msgType === MsgType.File) return renderFile(); + if (msgType === MsgType.Location) return ; + if (msgType === 'm.bad.encrypted') return ; return ; } + +export const RenderMessageContent = React.memo(RenderMessageContentInternal); \ No newline at end of file diff --git a/src/app/components/SwipeableMessageWrapper.tsx b/src/app/components/SwipeableMessageWrapper.tsx index 1c6121e8..195e6858 100644 --- a/src/app/components/SwipeableMessageWrapper.tsx +++ b/src/app/components/SwipeableMessageWrapper.tsx @@ -1,41 +1,24 @@ import { useMotionValue, useSpring, useTransform, motion } from 'framer-motion'; import { useDrag } from '@use-gesture/react'; -import React, { useState } from 'react'; +import React, { useState, useMemo } from 'react'; import { useAtomValue } from 'jotai'; import { config, Icon, Icons } from 'folds'; import { mobileOrTablet } from '../utils/user-agent'; import { RightSwipeAction, settingsAtom } from '../state/settings'; -export function SwipeableMessageWrapper({ - children, - onReply -}: { - children: React.ReactNode; - onReply: () => void; -}) { - const settings = useAtomValue(settingsAtom); +function ActiveSwipeWrapper({ children, onReply }: { children: React.ReactNode; onReply: () => void }) { const x = useMotionValue(0); - const springX = useSpring(x, { stiffness: 400, damping: 40 }); + const springX = useSpring(x, { stiffness: 300, damping: 35 }); const [isReady, setIsReady] = useState(false); - const iconOpacity = useTransform(x, [0, -8], [0, 1]); - const isSwipeToReplyEnabled = - settings.mobileGestures && - mobileOrTablet() && - settings.rightSwipeAction !== RightSwipeAction.Members; - const bind = useDrag(({ active, movement: [mx] }) => { - if (!isSwipeToReplyEnabled) return; - if (active) { const val = mx < 0 ? mx : 0; x.set(Math.max(-80, val)); - setIsReady(mx < -50); + if (mx < -50 !== isReady) setIsReady(mx < -50); } else { - if (mx < -50) { - onReply(); - } + if (mx < -50) onReply(); x.set(0); setIsReady(false); } @@ -43,18 +26,12 @@ export function SwipeableMessageWrapper({ axis: 'x', bounds: { right: 0 }, rubberband: true, - filterTaps: true + filterTaps: true, + eventOptions: { passive: true } }); - if (!isSwipeToReplyEnabled) { - return <>{children}; - } - return ( -
+
- {children}
); -} \ No newline at end of file +} + +export function SwipeableMessageWrapper({ + children, + onReply +}: { + children: React.ReactNode; + onReply: () => void; +}) { + const settings = useAtomValue(settingsAtom); + + const isSwipeToReplyEnabled = useMemo(() => + settings.mobileGestures && + mobileOrTablet() && + settings.rightSwipeAction !== RightSwipeAction.Members, + [settings.mobileGestures, settings.rightSwipeAction]); + + if (!isSwipeToReplyEnabled) { + return <>{children}; + } + + return {children}; +} diff --git a/src/app/components/message/modals/GlobalModalManager.tsx b/src/app/components/message/modals/GlobalModalManager.tsx new file mode 100644 index 00000000..e4a9c587 --- /dev/null +++ b/src/app/components/message/modals/GlobalModalManager.tsx @@ -0,0 +1,52 @@ +import React from 'react'; +import { useAtom } from 'jotai'; +import { Overlay, OverlayBackdrop, OverlayCenter, Box } from 'folds'; +import FocusTrap from 'focus-trap-react'; +import { MessageReportInternal } from './MessageReport'; +import { MessageDeleteInternal } from './MessageDelete'; +import { MessageSourceInternal } from './MessageSource'; +import { MessageAllReactionInternal } from './MessageReactions'; +import { stopPropagation } from '../../../utils/keyboard'; +import { modalAtom, ModalType } from '../../../state/modal'; +import { MessageReadReceiptInternal } from './MessageReadRecipts'; + +export function GlobalModalManager() { + const [modal, setModal] = useAtom(modalAtom); + + if (!modal) return null; + + const close = () => setModal(null); + + return ( + }> + + + + {modal.type === ModalType.Report && ( + + )} + {modal.type === ModalType.Delete && ( + + )} + {modal.type === ModalType.Source && ( + + )} + {modal.type === ModalType.Reactions && ( + + )} + {modal.type === ModalType.ReadReceipts && ( + + )} + + + + + ); +} \ No newline at end of file diff --git a/src/app/components/message/modals/MessageDelete.tsx b/src/app/components/message/modals/MessageDelete.tsx new file mode 100644 index 00000000..9f28400f --- /dev/null +++ b/src/app/components/message/modals/MessageDelete.tsx @@ -0,0 +1,131 @@ +import React, { useCallback, FormEventHandler } from 'react'; +import { Room, MatrixEvent } from 'matrix-js-sdk'; +import { useSetAtom } from 'jotai'; +import { + Box, Dialog, Header, IconButton, Icon, Icons, + Text, Input, Button, Spinner, MenuItem, config, color +} from 'folds'; +import { useMatrixClient } from '../../../hooks/useMatrixClient'; +import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback'; +import { modalAtom, ModalType } from '../../../state/modal'; +import * as css from '../../../features/room/message/styles.css'; + +export function MessageDeleteItem({ room, mEvent }: { room: Room; mEvent: MatrixEvent }) { + const setModal = useSetAtom(modalAtom); + + return ( + } + radii="300" + variant="Critical" + onClick={(e: React.MouseEvent) => { + e.preventDefault(); + e.stopPropagation(); + setModal({ + type: ModalType.Delete, + room, + mEvent + }); + }} + > + + Delete + + + ); +} + +type MessageDeleteInternalProps = { + room: Room; + mEvent: MatrixEvent; + onClose: () => void; +}; + +export function MessageDeleteInternal({ room, mEvent, onClose }: MessageDeleteInternalProps) { + const mx = useMatrixClient(); + + const [deleteState, deleteMessage] = useAsyncCallback( + useCallback( + (eventId: string, reason?: string) => + mx.redactEvent(room.roomId, eventId, undefined, reason ? { reason } : undefined), + [mx, room] + ) + ); + + const handleSubmit: FormEventHandler = (evt) => { + evt.preventDefault(); + const eventId = mEvent.getId(); + if ( + !eventId || + deleteState.status === AsyncStatus.Loading || + deleteState.status === AsyncStatus.Success + ) + return; + + const target = evt.target as HTMLFormElement | undefined; + const reasonInput = target?.reasonInput as HTMLInputElement | undefined; + const reason = reasonInput && reasonInput.value.trim(); + + deleteMessage(eventId, reason); + }; + + return ( + +
+ + Delete Message + + + + +
+ + + This action is irreversible! Are you sure that you want to delete this message? + + + + Reason{' '} + + (optional) + + + + {deleteState.status === AsyncStatus.Error && ( + + Failed to delete message! Please try again. + + )} + + + +
+ ); +} \ No newline at end of file diff --git a/src/app/components/message/modals/MessageReactions.tsx b/src/app/components/message/modals/MessageReactions.tsx new file mode 100644 index 00000000..8b54ba2a --- /dev/null +++ b/src/app/components/message/modals/MessageReactions.tsx @@ -0,0 +1,52 @@ +import React from 'react'; +import { Room } from 'matrix-js-sdk'; +import { Relations } from 'matrix-js-sdk/lib/models/relations'; +import { useSetAtom } from 'jotai'; +import { + Icon, Icons, Text, MenuItem +} from 'folds'; +import { modalAtom, ModalType } from '../../../state/modal'; +import * as css from '../../../features/room/message/styles.css'; +import { ReactionViewer } from '../../../features/room/reaction-viewer'; + + +export function MessageAllReactionItem({ room, relations }: { room: Room; relations: Relations }) { + const setModal = useSetAtom(modalAtom); + + return ( + } + radii="300" + onClick={(e: React.MouseEvent) => { + e.preventDefault(); + e.stopPropagation(); + setModal({ + type: ModalType.Reactions, + room, + relations + }) + }} + > + + View Reactions + + + ); +} + +type MessageAllReactionInternalProps = { + room: Room; + relations: Relations; + onClose: () => void; +}; + +export function MessageAllReactionInternal({ room, relations, onClose }: MessageAllReactionInternalProps) { + return ( + + ); +} \ No newline at end of file diff --git a/src/app/components/message/modals/MessageReadRecipts.tsx b/src/app/components/message/modals/MessageReadRecipts.tsx new file mode 100644 index 00000000..61736903 --- /dev/null +++ b/src/app/components/message/modals/MessageReadRecipts.tsx @@ -0,0 +1,50 @@ +import React from 'react'; +import { Room } from 'matrix-js-sdk'; +import { useSetAtom } from 'jotai'; +import { MenuItem, Icon, Icons, Text } from 'folds'; +import { modalAtom, ModalType } from '../../../state/modal'; +import { EventReaders } from '../../../components/event-readers'; +import * as css from '../../../features/room/message/styles.css'; + +export function MessageReadReceiptItem({ room, eventId }: { room: Room; eventId: string }) { + const setModal = useSetAtom(modalAtom); + + return ( + } + radii="300" + + onClick={(e: React.MouseEvent) => { + e.preventDefault(); + e.stopPropagation(); + setModal({ + + type: ModalType.ReadReceipts, + room, + eventId + }) + }} + > + + Read Receipts + + + ); +} + +type MessageReadReceiptInternalProps = { + room: Room; + eventId: string; + onClose: () => void; +}; + +export function MessageReadReceiptInternal({ room, eventId, onClose }: MessageReadReceiptInternalProps) { + return ( + + ); +} \ No newline at end of file diff --git a/src/app/components/message/modals/MessageReport.tsx b/src/app/components/message/modals/MessageReport.tsx new file mode 100644 index 00000000..1fccb6dd --- /dev/null +++ b/src/app/components/message/modals/MessageReport.tsx @@ -0,0 +1,136 @@ +import React, { useCallback, FormEventHandler } from 'react'; +import { Room, MatrixEvent } from 'matrix-js-sdk'; +import { useSetAtom } from 'jotai'; +import { + Box, Dialog, Header, IconButton, Icon, Icons, + Text, Input, Button, Spinner, MenuItem, config, color +} from 'folds'; +import { useMatrixClient } from '../../../hooks/useMatrixClient'; +import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback'; +import * as css from '../../../features/room/message/styles.css'; +import { modalAtom, ModalType } from '../../../state/modal'; + +export function MessageReportItem({ room, mEvent }: { room: Room; mEvent: MatrixEvent }) { + const setModal = useSetAtom(modalAtom); + + return ( + } + radii="300" + onClick={(e: React.MouseEvent) => { + e.preventDefault(); + e.stopPropagation(); + setModal({ + type: ModalType.Report, + room, + mEvent + }); + }} + > + + Report + + + ); +} + +type MessageReportInternalProps = { + room: Room; + mEvent: MatrixEvent; + onClose: () => void; +}; + +export function MessageReportInternal({ room, mEvent, onClose }: MessageReportInternalProps) { + const mx = useMatrixClient(); + + const [reportState, reportMessage] = useAsyncCallback( + useCallback( + (eventId: string, score: number, reason: string) => + mx.reportEvent(room.roomId, eventId, score, reason), + [mx, room] + ) + ); + + const handleSubmit: FormEventHandler = (evt) => { + evt.preventDefault(); + const eventId = mEvent.getId(); + if ( + !eventId || + reportState.status === AsyncStatus.Loading || + reportState.status === AsyncStatus.Success + ) + return; + + const target = evt.target as HTMLFormElement | undefined; + const reasonInput = target?.reasonInput as HTMLInputElement | undefined; + const reason = reasonInput && reasonInput.value.trim(); + + reportMessage(eventId, reason ? -100 : -50, reason || 'No reason provided'); + }; + + return ( + +
+ + Report Message + + + + +
+ + + Report this message to the server, which may then notify the appropriate people to + take action. + + + Reason + + + {reportState.status === AsyncStatus.Error && ( + + Failed to report message! Please try again. + + )} + {reportState.status === AsyncStatus.Success && ( + + Message has been reported to server. + + )} + + + +
+ ); +} \ No newline at end of file diff --git a/src/app/components/message/modals/MessageSource.tsx b/src/app/components/message/modals/MessageSource.tsx new file mode 100644 index 00000000..c2b0043d --- /dev/null +++ b/src/app/components/message/modals/MessageSource.tsx @@ -0,0 +1,78 @@ +import React from 'react'; +import { Room, MatrixEvent } from 'matrix-js-sdk'; +import { useSetAtom } from 'jotai'; +import { MenuItem, Icon, Icons, Text } from 'folds'; +import { TextViewer } from '../../../components/text-viewer'; +import { getEventEdits } from '../../../utils/room'; +import { modalAtom, ModalType } from '../../../state/modal'; +import * as css from '../../../features/room/message/styles.css'; + +export function MessageSourceCodeItem({ room, mEvent }: { room: Room; mEvent: MatrixEvent }) { + const setModal = useSetAtom(modalAtom); + + return ( + } + radii="300" + onClick={(e: React.MouseEvent) => { + e.preventDefault(); + e.stopPropagation(); + setModal({ + type: ModalType.Source, + room, + mEvent + }) + }} + > + + View Source + + + ); +} + +type MessageSourceInternalProps = { + room: Room; + mEvent: MatrixEvent; + onClose: () => void; +}; + +export function MessageSourceInternal({ room, mEvent, onClose }: MessageSourceInternalProps) { + const getContent = (evt: MatrixEvent) => + evt.isEncrypted() + ? { + [`<== DECRYPTED_EVENT ==>`]: evt.getEffectiveEvent(), + [`<== ORIGINAL_EVENT ==>`]: evt.event, + } + : evt.event; + + const getText = (): string => { + const evtId = mEvent.getId()!; + const evtTimeline = room.getTimelineForEvent(evtId); + const edits = + evtTimeline && + getEventEdits(evtTimeline.getTimelineSet(), evtId, mEvent.getType())?.getRelations(); + + if (!edits) return JSON.stringify(getContent(mEvent), null, 2); + + const content: Record = { + '<== MAIN_EVENT ==>': getContent(mEvent), + }; + + edits.forEach((editEvt, index) => { + content[`<== REPLACEMENT_EVENT_${index + 1} ==>`] = getContent(editEvt); + }); + + return JSON.stringify(content, null, 2); + }; + + return ( + + ); +} \ No newline at end of file diff --git a/src/app/components/typing-indicator/TypingIndicator.css.ts b/src/app/components/typing-indicator/TypingIndicator.css.ts index 2cab5965..662fe055 100644 --- a/src/app/components/typing-indicator/TypingIndicator.css.ts +++ b/src/app/components/typing-indicator/TypingIndicator.css.ts @@ -16,7 +16,6 @@ export const TypingDot = recipe({ display: 'inline-block', backgroundColor: 'currentColor', borderRadius: '50%', - zIndex: 10, transform: 'translateY(15%)', }, ], diff --git a/src/app/components/typing-indicator/TypingIndicator.tsx b/src/app/components/typing-indicator/TypingIndicator.tsx index f8daa45e..ccb9e43f 100644 --- a/src/app/components/typing-indicator/TypingIndicator.tsx +++ b/src/app/components/typing-indicator/TypingIndicator.tsx @@ -13,7 +13,11 @@ export const TypingIndicator = as<'div', TypingIndicatorProps>( as="span" alignItems="Center" shrink="No" - style={{ gap: toRem(size === '300' ? 1 : 2), ...style }} + style={{ + gap: toRem(size === '300' ? 1 : 2), + zIndex: 10, + ...style + }} {...props} ref={ref} > diff --git a/src/app/features/room/RoomTimeline.tsx b/src/app/features/room/RoomTimeline.tsx index ac27b819..6b758c1a 100644 --- a/src/app/features/room/RoomTimeline.tsx +++ b/src/app/features/room/RoomTimeline.tsx @@ -1141,6 +1141,7 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli onReplyClick={handleReplyClick} onReactionToggle={handleReactionToggle} senderId={senderId} + senderDisplayName={senderDisplayName} onEditId={handleEdit} reply={ replyEventId && ( @@ -1197,6 +1198,9 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli const { replyEventId, threadRootId } = mEvent; const highlighted = focusItem?.index === item && focusItem.highlight; const senderId = mEvent.getSender() ?? ''; + const senderDisplayName = + getMemberDisplayName(room, senderId, nicknames) ?? getMxIdLocalPart(senderId) ?? senderId; + return ( 0; const highlighted = focusItem?.index === item && focusItem.highlight; const senderId = mEvent.getSender() ?? ''; + const senderDisplayName = + getMemberDisplayName(room, senderId, nicknames) ?? getMxIdLocalPart(senderId) ?? senderId; return ( { @@ -128,6 +129,7 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) { editor={editor} /> +
diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx index ebe829e7..02f147c2 100644 --- a/src/app/features/room/message/Message.tsx +++ b/src/app/features/room/message/Message.tsx @@ -1,30 +1,19 @@ import { Avatar, Box, - Button, - Dialog, - Header, Icon, IconButton, Icons, - Input, Line, Menu, MenuItem, - Modal, - Overlay, - OverlayBackdrop, - OverlayCenter, PopOut, RectCords, - Spinner, Text, as, - color, config, } from 'folds'; import React, { - FormEventHandler, MouseEventHandler, ReactNode, useCallback, @@ -38,7 +27,6 @@ import { useHover, useFocusWithin } from 'react-aria'; import { MatrixEvent, Room } from 'matrix-js-sdk'; import { Relations } from 'matrix-js-sdk/lib/models/relations'; import classNames from 'classnames'; -import parse from 'html-react-parser'; import { useAtomValue, useSetAtom } from 'jotai'; import { RoomPinnedEventsEventContent } from 'matrix-js-sdk/lib/types'; import { @@ -53,13 +41,10 @@ import { } from '../../../components/message'; import { canEditEvent, - getEventEdits, getMemberAvatarMxc, - getMemberDisplayName, } from '../../../utils/room'; import { getCanonicalAliasOrRoomId, - getMxIdLocalPart, isRoomAlias, mxcUrlToHttp, } from '../../../utils/matrix'; @@ -68,11 +53,7 @@ import { nicknamesAtom, setNicknameAtom } from '../../../state/nicknames'; import { useMatrixClient } from '../../../hooks/useMatrixClient'; import { useRecentEmoji } from '../../../hooks/useRecentEmoji'; import * as css from './styles.css'; -import { EventReaders } from '../../../components/event-readers'; -import { TextViewer } from '../../../components/text-viewer'; -import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback'; import { EmojiBoard } from '../../../components/emoji-board'; -import { ReactionViewer } from '../reaction-viewer'; import { MessageEditor } from './MessageEditor'; import { UserAvatar } from '../../../components/user-avatar'; import { copyToClipboard } from '../../../utils/dom'; @@ -90,6 +71,11 @@ import { mobileOrTablet } from '../../../utils/user-agent'; import { useUserProfile } from '../../../hooks/useUserProfile'; import { useSetting } from '../../../state/hooks/settings'; import { useBlobCache } from '../../../hooks/useBlobCache'; +import { MessageAllReactionItem } from '../../../components/message/modals/MessageReactions'; +import { MessageReadReceiptItem } from '../../../components/message/modals/MessageReadRecipts'; +import { MessageSourceCodeItem } from '../../../components/message/modals/MessageSource'; +import { MessageDeleteItem } from '../../../components/message/modals/MessageDelete'; +import { MessageReportItem } from '../../../components/message/modals/MessageReport'; export type ReactionHandler = (keyOrMxc: string, shortcode: string) => void; @@ -136,200 +122,6 @@ export const MessageQuickReactions = as<'div', MessageQuickReactionsProps>( } ); -export const MessageAllReactionItem = as< - 'button', - { - room: Room; - relations: Relations; - onClose?: () => void; - } ->(({ room, relations, onClose, ...props }, ref) => { - const [open, setOpen] = useState(false); - - const handleClose = () => { - setOpen(false); - onClose?.(); - }; - - return ( - <> - { - evt.stopPropagation(); - }} - open={open} - backdrop={} - > - - handleClose(), - clickOutsideDeactivates: true, - escapeDeactivates: stopPropagation, - }} - > - - setOpen(false)} - /> - - - - - } - radii="300" - onClick={() => setOpen(true)} - {...props} - ref={ref} - aria-pressed={open} - > - - View Reactions - - - - ); -}); - -export const MessageReadReceiptItem = as< - 'button', - { - room: Room; - eventId: string; - onClose?: () => void; - } ->(({ room, eventId, onClose, ...props }, ref) => { - const [open, setOpen] = useState(false); - - const handleClose = () => { - setOpen(false); - onClose?.(); - }; - - return ( - <> - }> - - - - - - - - - } - radii="300" - onClick={() => setOpen(true)} - {...props} - ref={ref} - aria-pressed={open} - > - - Read Receipts - - - - ); -}); - -export const MessageSourceCodeItem = as< - 'button', - { - room: Room; - mEvent: MatrixEvent; - onClose?: () => void; - } ->(({ room, mEvent, onClose, ...props }, ref) => { - const [open, setOpen] = useState(false); - - const getContent = (evt: MatrixEvent) => - evt.isEncrypted() - ? { - [`<== DECRYPTED_EVENT ==>`]: evt.getEffectiveEvent(), - [`<== ORIGINAL_EVENT ==>`]: evt.event, - } - : evt.event; - - const getText = (): string => { - const evtId = mEvent.getId()!; - const evtTimeline = room.getTimelineForEvent(evtId); - const edits = - evtTimeline && - getEventEdits(evtTimeline.getTimelineSet(), evtId, mEvent.getType())?.getRelations(); - - if (!edits) return JSON.stringify(getContent(mEvent), null, 2); - - const content: Record = { - '<== MAIN_EVENT ==>': getContent(mEvent), - }; - - edits.forEach((editEvt, index) => { - content[`<== REPLACEMENT_EVENT_${index + 1} ==>`] = getContent(editEvt); - }); - - return JSON.stringify(content, null, 2); - }; - - const handleClose = () => { - setOpen(false); - onClose?.(); - }; - - return ( - <> - }> - - - - - - - - - } - radii="300" - onClick={() => setOpen(true)} - {...props} - ref={ref} - aria-pressed={open} - > - - View Source - - - - ); -}); - export const MessageCopyLinkItem = as< 'button', { @@ -405,269 +197,6 @@ export const MessagePinItem = as< ); }); -export const MessageDeleteItem = as< - 'button', - { - room: Room; - mEvent: MatrixEvent; - onClose?: () => void; - } ->(({ room, mEvent, onClose, ...props }, ref) => { - const mx = useMatrixClient(); - const [open, setOpen] = useState(false); - - const [deleteState, deleteMessage] = useAsyncCallback( - useCallback( - (eventId: string, reason?: string) => - mx.redactEvent(room.roomId, eventId, undefined, reason ? { reason } : undefined), - [mx, room] - ) - ); - - const handleSubmit: FormEventHandler = (evt) => { - evt.preventDefault(); - const eventId = mEvent.getId(); - if ( - !eventId || - deleteState.status === AsyncStatus.Loading || - deleteState.status === AsyncStatus.Success - ) - return; - const target = evt.target as HTMLFormElement | undefined; - const reasonInput = target?.reasonInput as HTMLInputElement | undefined; - const reason = reasonInput && reasonInput.value.trim(); - deleteMessage(eventId, reason); - }; - - const handleClose = () => { - setOpen(false); - onClose?.(); - }; - - return ( - <> - }> - - - -
- - Delete Message - - - - -
- - - This action is irreversible! Are you sure that you want to delete this message? - - - - Reason{' '} - - (optional) - - - - {deleteState.status === AsyncStatus.Error && ( - - Failed to delete message! Please try again. - - )} - - - -
-
-
-
- - - ); -}); - -export const MessageReportItem = as< - 'button', - { - room: Room; - mEvent: MatrixEvent; - onClose?: () => void; - } ->(({ room, mEvent, onClose, ...props }, ref) => { - const mx = useMatrixClient(); - const [open, setOpen] = useState(false); - - const [reportState, reportMessage] = useAsyncCallback( - useCallback( - (eventId: string, score: number, reason: string) => - mx.reportEvent(room.roomId, eventId, score, reason), - [mx, room] - ) - ); - - const handleSubmit: FormEventHandler = (evt) => { - evt.preventDefault(); - const eventId = mEvent.getId(); - if ( - !eventId || - reportState.status === AsyncStatus.Loading || - reportState.status === AsyncStatus.Success - ) - return; - const target = evt.target as HTMLFormElement | undefined; - const reasonInput = target?.reasonInput as HTMLInputElement | undefined; - const reason = reasonInput && reasonInput.value.trim(); - if (reasonInput) reasonInput.value = ''; - reportMessage(eventId, reason ? -100 : -50, reason || 'No reason provided'); - }; - - const handleClose = () => { - setOpen(false); - onClose?.(); - }; - - return ( - <> - }> - - - -
- - Report Message - - - - -
- - - Report this message to server, which may then notify the appropriate people to - take action. - - - Reason - - {reportState.status === AsyncStatus.Error && ( - - Failed to report message! Please try again. - - )} - {reportState.status === AsyncStatus.Success && ( - - Message has been reported to server. - - )} - - - -
-
-
-
- - - ); -}); - export type MessageProps = { room: Room; mEvent: MatrixEvent; @@ -697,6 +226,7 @@ export type MessageProps = { hour24Clock: boolean; dateFormatString: string; senderId: string; + senderDisplayName: string; content?: string; }; @@ -781,6 +311,7 @@ function MessageInternal( dateFormatString, children, senderId, + senderDisplayName, ...props }: MessageProps & { className?: string; children?: ReactNode }, ref: any @@ -817,13 +348,6 @@ function MessageInternal( const nicknames = useAtomValue(nicknamesAtom); const setNickname = useSetAtom(setNicknameAtom); - const senderDisplayName = - nicknames[senderId] ?? - profile.displayName ?? - getMemberDisplayName(room, senderId) ?? - getMxIdLocalPart(senderId) ?? - senderId; - const tagIconSrc = memberPowerTag?.icon ? getPowerTagIconSrc(mx, useAuthentication, memberPowerTag.icon) : undefined; @@ -921,8 +445,10 @@ function MessageInternal( return mEvent.getContent().body || ''; }, [mEvent]); + const MSG_CONTENT_STYLE = { maxWidth: '100%' }; + const msgContentJSX = ( - + {reply} {edit && onEditId ? ( = (evt) => { const target = evt.currentTarget.parentElement?.parentElement ?? evt.currentTarget; - setMenuAnchor(target.getBoundingClientRect()); + const rect = target.getBoundingClientRect(); + + window.requestAnimationFrame(() => { + setMenuAnchor(rect); + }); }; const closeMenu = () => { @@ -1142,13 +672,7 @@ function MessageInternal( )} - {relations && ( - - )} + {relations && } } @@ -1211,18 +735,10 @@ function MessageInternal( )} {!hideReadReceipts && ( - + )} {showDeveloperTools && ( - + )} {canPinEvent && ( @@ -1286,28 +802,25 @@ function MessageInternal( ) )} - {((!mEvent.isRedacted() && canDelete) || - mEvent.getSender() !== mx.getUserId()) && ( - <> - - - {!mEvent.isRedacted() && canDelete && ( - - )} - {mEvent.getSender() !== mx.getUserId() && ( - - )} - - - )} + {((!mEvent.isRedacted() && canDelete) || mEvent.getSender() !== mx.getUserId()) && ( + <> + + + {!mEvent.isRedacted() && canDelete && ( + + )} + {mEvent.getSender() !== mx.getUserId() && ( + + )} + + + )} } @@ -1415,7 +928,11 @@ export const Event = as<'div', EventProps>( const handleOpenMenu: MouseEventHandler = (evt) => { const target = evt.currentTarget.parentElement?.parentElement ?? evt.currentTarget; - setMenuAnchor(target.getBoundingClientRect()); + const rect = target.getBoundingClientRect(); + + window.requestAnimationFrame(() => { + setMenuAnchor(rect); + }); }; const closeMenu = () => { diff --git a/src/app/features/settings/about/About.tsx b/src/app/features/settings/about/About.tsx index 67132a1f..4c61e44d 100644 --- a/src/app/features/settings/about/About.tsx +++ b/src/app/features/settings/about/About.tsx @@ -46,7 +46,7 @@ export function About({ requestClose }: AboutProps) { Sable - v1.1.4 + v1.1.5 Yet another matrix client fork(ed from cinny). diff --git a/src/app/pages/auth/AuthFooter.tsx b/src/app/pages/auth/AuthFooter.tsx index 877617b0..9ab1bf05 100644 --- a/src/app/pages/auth/AuthFooter.tsx +++ b/src/app/pages/auth/AuthFooter.tsx @@ -15,7 +15,7 @@ export function AuthFooter() { target="_blank" rel="noreferrer" > - v1.1.4 + v1.1.5 Twitter diff --git a/src/app/pages/client/WelcomePage.tsx b/src/app/pages/client/WelcomePage.tsx index 2b960b75..10e6d84c 100644 --- a/src/app/pages/client/WelcomePage.tsx +++ b/src/app/pages/client/WelcomePage.tsx @@ -24,7 +24,7 @@ export function WelcomePage() { target="_blank" rel="noreferrer noopener" > - v1.1.4 + v1.1.5 } diff --git a/src/app/state/modal.ts b/src/app/state/modal.ts new file mode 100644 index 00000000..3ca49fb0 --- /dev/null +++ b/src/app/state/modal.ts @@ -0,0 +1,21 @@ +import { atom } from 'jotai'; +import { MatrixEvent, Room } from 'matrix-js-sdk'; +import { Relations } from 'matrix-js-sdk/lib/models/relations'; + +export enum ModalType { + Delete = 'delete', + Report = 'report', + Source = 'source', + Reactions = 'reactions', + ReadReceipts = 'read_receipts', +} + +export type ModalState = + | { type: ModalType.Delete; room: Room; mEvent: MatrixEvent } + | { type: ModalType.Report; room: Room; mEvent: MatrixEvent } + | { type: ModalType.Source; room: Room; mEvent: MatrixEvent } + | { type: ModalType.Reactions; room: Room; relations: Relations } + | { type: ModalType.ReadReceipts; room: Room; eventId: string } + | null; + +export const modalAtom = atom(null); \ No newline at end of file