From b4f4c8f3436b7d69336076b94c48facab65bddad Mon Sep 17 00:00:00 2001 From: Shea Date: Fri, 12 Jun 2026 16:24:06 +0300 Subject: [PATCH 1/3] fix root element in thread looking wrongly selected Signed-off-by: Shea --- src/app/features/room/ThreadDrawer.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/app/features/room/ThreadDrawer.tsx b/src/app/features/room/ThreadDrawer.tsx index 070cdaf58..bc8593c42 100644 --- a/src/app/features/room/ThreadDrawer.tsx +++ b/src/app/features/room/ThreadDrawer.tsx @@ -229,8 +229,7 @@ export function ThreadDrawer({ room, threadRootId, onClose, overlay }: ThreadDra // Reply draft (keyed by threadRootId to match RoomInput's draftKey logic) const setReplyDraft = useSetAtom(roomIdToReplyDraftAtomFamily(threadRootId)); const replyDraft = useAtomValue(roomIdToReplyDraftAtomFamily(threadRootId)); - const activeReplyId = replyDraft?.eventId; - + const activeReplyId = replyDraft?.body ? replyDraft?.eventId : undefined; // User profile popup const openUserRoomProfile = useOpenUserRoomProfile(); From 7fd1ac006e32a554570363b0b5ab33919c288d07 Mon Sep 17 00:00:00 2001 From: Shea Date: Fri, 12 Jun 2026 16:25:34 +0300 Subject: [PATCH 2/3] fix root element in thread looking wrongly selected Signed-off-by: Shea --- src/app/features/room/ThreadDrawer.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/features/room/ThreadDrawer.tsx b/src/app/features/room/ThreadDrawer.tsx index bc8593c42..36ff9c227 100644 --- a/src/app/features/room/ThreadDrawer.tsx +++ b/src/app/features/room/ThreadDrawer.tsx @@ -230,6 +230,7 @@ export function ThreadDrawer({ room, threadRootId, onClose, overlay }: ThreadDra const setReplyDraft = useSetAtom(roomIdToReplyDraftAtomFamily(threadRootId)); const replyDraft = useAtomValue(roomIdToReplyDraftAtomFamily(threadRootId)); const activeReplyId = replyDraft?.body ? replyDraft?.eventId : undefined; + // User profile popup const openUserRoomProfile = useOpenUserRoomProfile(); From 30a4abbad134b661c6469daa6aec8c8b0c1986c2 Mon Sep 17 00:00:00 2001 From: Shea Date: Fri, 12 Jun 2026 17:07:56 +0300 Subject: [PATCH 3/3] add full new key to avoid weird edgecase Signed-off-by: Shea --- src/app/features/room/ThreadDrawer.tsx | 5 +++-- src/app/hooks/timeline/useTimelineEventRenderer.tsx | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/app/features/room/ThreadDrawer.tsx b/src/app/features/room/ThreadDrawer.tsx index 36ff9c227..31758237d 100644 --- a/src/app/features/room/ThreadDrawer.tsx +++ b/src/app/features/room/ThreadDrawer.tsx @@ -229,7 +229,8 @@ export function ThreadDrawer({ room, threadRootId, onClose, overlay }: ThreadDra // Reply draft (keyed by threadRootId to match RoomInput's draftKey logic) const setReplyDraft = useSetAtom(roomIdToReplyDraftAtomFamily(threadRootId)); const replyDraft = useAtomValue(roomIdToReplyDraftAtomFamily(threadRootId)); - const activeReplyId = replyDraft?.body ? replyDraft?.eventId : undefined; + const activeReplyId = replyDraft?.eventId; + const suppressMark = !replyDraft?.body; // User profile popup const openUserRoomProfile = useOpenUserRoomProfile(); @@ -711,7 +712,7 @@ export function ThreadDrawer({ room, threadRootId, onClose, overlay }: ThreadDra showHiddenEvents, hideThreadChip: true, }, - state: { focusItem, editId, activeReplyId, openThreadId: threadRootId }, + state: { focusItem, editId, activeReplyId, openThreadId: threadRootId, suppressMark }, permissions: { canRedact, canDeleteOwn, diff --git a/src/app/hooks/timeline/useTimelineEventRenderer.tsx b/src/app/hooks/timeline/useTimelineEventRenderer.tsx index 750f4c281..d9f43df63 100644 --- a/src/app/hooks/timeline/useTimelineEventRenderer.tsx +++ b/src/app/hooks/timeline/useTimelineEventRenderer.tsx @@ -286,6 +286,7 @@ export interface TimelineEventRendererOptions { editId?: string; activeReplyId?: string; openThreadId?: string; + suppressMark?: boolean; }; permissions: { canRedact: boolean; @@ -337,7 +338,7 @@ export function useTimelineEventRenderer({ showHiddenEvents, hideThreadChip, }, - state: { focusItem, editId, activeReplyId, openThreadId }, + state: { focusItem, editId, activeReplyId, openThreadId, suppressMark }, permissions: { canRedact, canDeleteOwn, canSendReaction, canPinEvent }, callbacks: { onUserClick, @@ -375,7 +376,7 @@ export function useTimelineEventRenderer({ const reactions = reactionRelations?.getSortedAnnotationsByKey(); const hasReactions = reactions && reactions.length > 0; const highlighted = focusItem?.index === item && focusItem.highlight; - const marked = activeReplyId === mEventId; + const marked = activeReplyId === mEventId && suppressMark !== true; const pushActions = pushProcessor.actionsForEvent(mEvent); let notifyHighlight: 'silent' | 'loud' | undefined;