Post-merge fixes: remove duplicate IncomingCallNotification, restore PiP touch drag + grip dots, show redacted message content

- Router.tsx: remove IncomingCallNotification (CallEmbedProvider.IncomingCallListener now handles all calls)
- CallEmbedProvider: restore touch drag (handlePipTouchStart), grip dots on resize handles, fix normaliseToTopLeft width/height
- FallbackContent/MsgTypeRenderers: add originalBody prop to show struck-through original text on deleted messages
- RoomTimeline: cache text message bodies so they can be shown after redaction
This commit is contained in:
root
2026-05-15 14:13:41 -04:00
parent 8ebb1a8d8c
commit 243a1c78c1
5 changed files with 67 additions and 12 deletions
@@ -40,11 +40,12 @@ export function MBadEncrypted() {
type RedactedContentProps = {
reason?: string;
originalBody?: string;
};
export function RedactedContent({ reason }: RedactedContentProps) {
export function RedactedContent({ reason, originalBody }: RedactedContentProps) {
return (
<Text>
<MessageDeletedContent reason={reason} />
<MessageDeletedContent reason={reason} originalBody={originalBody} />
</Text>
);
}
@@ -4,11 +4,13 @@ import React from 'react';
const warningStyle = { color: color.Warning.Main, opacity: config.opacity.P300 };
const criticalStyle = { color: color.Critical.Main, opacity: config.opacity.P300 };
export const MessageDeletedContent = as<'div', { children?: never; reason?: string }>(
({ reason, ...props }, ref) => (
export const MessageDeletedContent = as<'div', { children?: never; reason?: string; originalBody?: string }>(
({ reason, originalBody, ...props }, ref) => (
<Box as="span" alignItems="Center" gap="100" style={warningStyle} {...props} ref={ref}>
<Icon size="50" src={Icons.Delete} />
{reason ? (
{originalBody ? (
<s>{originalBody.length > 80 ? `${originalBody.slice(0, 80)}` : originalBody}</s>
) : reason ? (
<i>This message has been deleted. {reason}</i>
) : (
<i>This message has been deleted</i>