fix: presence ring shape mismatch, edit history (no text) on E2EE, reaction count
CI / Build & Quality Checks (push) Successful in 10m36s
CI / Build & Quality Checks (push) Successful in 10m36s
- PresenceRingAvatar: replace circular wrapper div (borderRadius 50%) with React.cloneElement injecting outline+outlineOffset directly onto the child Avatar element — outline follows the child's actual border-radius so the ring matches the avatar shape in every context - EditHistoryModal: use getClearContent() for the Original entry instead of evt.event.content, which is still the ciphertext for E2EE messages and has no body field. getClearContent() returns decrypted content bypassing the _replacingEvent chain, fixing the "(no text)" shown for encrypted originals - MessageQuickReactions: 5 → 3 emoji (toolbar too wide with 5) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
import React, { ReactNode } from 'react';
|
import React, { CSSProperties } from 'react';
|
||||||
import { color } from 'folds';
|
import { color } from 'folds';
|
||||||
import { Presence, useUserPresence } from '../../hooks/useUserPresence';
|
import { Presence, useUserPresence } from '../../hooks/useUserPresence';
|
||||||
|
|
||||||
@@ -12,7 +12,7 @@ function presenceRingColor(presence: Presence | undefined, status?: string): str
|
|||||||
|
|
||||||
type PresenceRingAvatarProps = {
|
type PresenceRingAvatarProps = {
|
||||||
userId: string;
|
userId: string;
|
||||||
children: ReactNode;
|
children: React.ReactElement<{ style?: CSSProperties }>;
|
||||||
};
|
};
|
||||||
|
|
||||||
export function PresenceRingAvatar({ userId, children }: PresenceRingAvatarProps) {
|
export function PresenceRingAvatar({ userId, children }: PresenceRingAvatarProps) {
|
||||||
@@ -21,16 +21,14 @@ export function PresenceRingAvatar({ userId, children }: PresenceRingAvatarProps
|
|||||||
|
|
||||||
if (!ringColor) return <>{children}</>;
|
if (!ringColor) return <>{children}</>;
|
||||||
|
|
||||||
return (
|
// Apply outline directly to the child so it follows the child's actual border-radius.
|
||||||
<div
|
// outline follows border-radius in Chrome 94+, Firefox 88+, Safari 16.4+.
|
||||||
style={{
|
// This avoids the mismatch of a circular wrapper around a rounded-square avatar.
|
||||||
display: 'inline-flex',
|
return React.cloneElement(children, {
|
||||||
borderRadius: '50%',
|
style: {
|
||||||
boxShadow: `0 0 0 2px ${ringColor}`,
|
...children.props.style,
|
||||||
flexShrink: 0,
|
outline: `2px solid ${ringColor}`,
|
||||||
}}
|
outlineOffset: '2px',
|
||||||
>
|
},
|
||||||
{children}
|
});
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -72,9 +72,14 @@ function renderContent(source: Record<string, unknown>): ReactNode {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function getOriginalContent(evt: MatrixEvent): ReactNode {
|
function getOriginalContent(evt: MatrixEvent): ReactNode {
|
||||||
// mEvent.getContent() returns the SDK-applied post-edit content.
|
// For E2EE events, evt.event.content is the ciphertext (no body field) — "(no text)" bug.
|
||||||
// Read the raw server event to get the actual original pre-edit text.
|
// getClearContent() returns the decrypted original content, bypassing _replacingEvent,
|
||||||
const raw = (evt.event as { content?: Record<string, unknown> }).content ?? {};
|
// so it gives us the pre-edit body even when the SDK has an edit applied.
|
||||||
|
// For unencrypted events, getClearContent() returns null, so we fall back to event.content.
|
||||||
|
const raw =
|
||||||
|
(evt.getClearContent() as Record<string, unknown> | null) ??
|
||||||
|
(evt.event as { content?: Record<string, unknown> }).content ??
|
||||||
|
{};
|
||||||
return renderContent(raw);
|
return renderContent(raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user