From 7b4e1cfe98e2adf59111e41faab8711633509e1c Mon Sep 17 00:00:00 2001 From: 7w1 Date: Thu, 26 Feb 2026 23:52:23 -0600 Subject: [PATCH] Fix one unpin + new pin not highlighting. --- src/app/features/room/RoomViewHeader.tsx | 6 ++++-- src/app/features/room/room-pin-menu/RoomPinMenu.tsx | 12 +++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/app/features/room/RoomViewHeader.tsx b/src/app/features/room/RoomViewHeader.tsx index cf552b3c..9a468f1b 100644 --- a/src/app/features/room/RoomViewHeader.tsx +++ b/src/app/features/room/RoomViewHeader.tsx @@ -320,8 +320,10 @@ export function RoomViewHeader() { const newPins = pinnedIds.slice(lastSeenIndex + 1); setUnreadPinsCount(newPins.length); } else { - const countDiff = pinnedIds.length - (pinMarker?.count ?? 0); - setUnreadPinsCount(countDiff > 0 ? countDiff : 0); + const oldCount = pinMarker?.count ?? 0; + const startIndex = Math.max(0, oldCount - 1); + const newCount = pinnedIds.length > 0 ? pinnedIds.length - startIndex : 0; + setUnreadPinsCount(Math.max(0, newCount)); } }; checkUnreads(); diff --git a/src/app/features/room/room-pin-menu/RoomPinMenu.tsx b/src/app/features/room/room-pin-menu/RoomPinMenu.tsx index 94d8621b..de1c0f12 100644 --- a/src/app/features/room/room-pin-menu/RoomPinMenu.tsx +++ b/src/app/features/room/room-pin-menu/RoomPinMenu.tsx @@ -298,10 +298,12 @@ export const RoomPinMenu = forwardRef( const pinMarker = useMemo(() => room.getAccountData(AccountDataEvent.SablePinStatus)?.getContent(), [room]); + const lastSeenIndex = useMemo(() => { if (!pinMarker?.last_seen_id) return -1; return pinnedEvents.indexOf(pinMarker.last_seen_id); }, [pinnedEvents, pinMarker]); + const hasNewContent = pinMarker?.hash !== currentHash; const virtualizer = useVirtualizer({ @@ -513,7 +515,15 @@ export const RoomPinMenu = forwardRef( if (!eventId) return null; const originalIndex = pinnedEvents.indexOf(eventId); - const isNew = hasNewContent && (lastSeenIndex === -1 || originalIndex > lastSeenIndex); + let isNew = false; + if (pinMarker?.hash !== currentHash) { + if (lastSeenIndex !== -1) { + isNew = originalIndex > lastSeenIndex; + } else { + const oldCount = pinMarker?.count ?? 0; + isNew = originalIndex >= (oldCount - 1); + } + } return (