diff --git a/src/app/hooks/timeline/useProcessedTimeline.ts b/src/app/hooks/timeline/useProcessedTimeline.ts index 5a80ce1d9..59e99cd58 100644 --- a/src/app/hooks/timeline/useProcessedTimeline.ts +++ b/src/app/hooks/timeline/useProcessedTimeline.ts @@ -148,37 +148,46 @@ const computeCollapseAndDividers = ( const mergeDraftsAndExtras = ( result: ProcessedEvent[], - extras: { mEvent: MatrixEvent; timelineSet: EventTimelineSet }[] + extras: { mEvent: MatrixEvent; timelineSet: EventTimelineSet; parentTs: number }[] ): ProcessedEventDraft[] => { const resultDrafts = result.map( ({ collapsed: _c, willRenderNewDivider: _n, willRenderDayDivider: _d, ...draft }) => draft ); const extraDrafts = extras - .map(({ mEvent, timelineSet }) => ({ - id: mEvent.getId()!, - itemIndex: -1, - mEvent, - timelineSet, - eventSender: mEvent.getSender() ?? null, + .map(({ mEvent, timelineSet, parentTs }) => ({ + draft: { + id: mEvent.getId()!, + itemIndex: -1, + mEvent, + timelineSet, + eventSender: mEvent.getSender() ?? null, + }, + effectiveTs: Math.max(mEvent.getTs(), parentTs), })) - .toSorted((a, b) => a.mEvent.getTs() - b.mEvent.getTs()); + .toSorted((a, b) => a.effectiveTs - b.effectiveTs); - const mergedDrafts: ProcessedEventDraft[] = []; - let resultIdx = 0; + const buckets: ProcessedEventDraft[][] = Array.from( + { length: resultDrafts.length + 1 }, + () => [] + ); for (const extra of extraDrafts) { - const extraTs = extra.mEvent.getTs(); - while (resultIdx < resultDrafts.length && resultDrafts[resultIdx]!.mEvent.getTs() <= extraTs) { - mergedDrafts.push(resultDrafts[resultIdx]!); - resultIdx += 1; + const extraTs = extra.effectiveTs; + let insertIdx = 0; + for (let i = resultDrafts.length - 1; i >= 0; i -= 1) { + if (resultDrafts[i]!.mEvent.getTs() <= extraTs) { + insertIdx = i + 1; + break; + } } - mergedDrafts.push(extra); + buckets[insertIdx]!.push(extra.draft); } - while (resultIdx < resultDrafts.length) { - mergedDrafts.push(resultDrafts[resultIdx]!); - resultIdx += 1; + const mergedDrafts: ProcessedEventDraft[] = [...buckets[0]!]; + for (let i = 0; i < resultDrafts.length; i += 1) { + mergedDrafts.push(resultDrafts[i]!); + mergedDrafts.push(...buckets[i + 1]!); } return mergedDrafts; diff --git a/src/app/utils/room.ts b/src/app/utils/room.ts index b081b99cc..4e79900c1 100644 --- a/src/app/utils/room.ts +++ b/src/app/utils/room.ts @@ -758,10 +758,10 @@ export const collectRelationReactionEvents = ( ignoredUsersSet: Set, showReactions: boolean, showReactionTombstones: boolean -): { mEvent: MatrixEvent; timelineSet: EventTimelineSet }[] => { +): { mEvent: MatrixEvent; timelineSet: EventTimelineSet; parentTs: number }[] => { if (!showReactions && !showReactionTombstones) return []; - const extras: { mEvent: MatrixEvent; timelineSet: EventTimelineSet }[] = []; + const extras: { mEvent: MatrixEvent; timelineSet: EventTimelineSet; parentTs: number }[] = []; const seen = new Set(existingIds); for (const timeline of linkedTimelines) { @@ -785,7 +785,7 @@ export const collectRelationReactionEvents = ( if (redacted && !showReactionTombstones) continue; if (!redacted && !showReactions) continue; - extras.push({ mEvent: reaction, timelineSet }); + extras.push({ mEvent: reaction, timelineSet, parentTs: parent.getTs() }); } } } @@ -798,10 +798,10 @@ export const collectRelationEditEvents = ( existingIds: ReadonlySet, ignoredUsersSet: Set, showEdits: boolean -): { mEvent: MatrixEvent; timelineSet: EventTimelineSet }[] => { +): { mEvent: MatrixEvent; timelineSet: EventTimelineSet; parentTs: number }[] => { if (!showEdits) return []; - const extras: { mEvent: MatrixEvent; timelineSet: EventTimelineSet }[] = []; + const extras: { mEvent: MatrixEvent; timelineSet: EventTimelineSet; parentTs: number }[] = []; const seen = new Set(existingIds); for (const timeline of linkedTimelines) { @@ -821,7 +821,7 @@ export const collectRelationEditEvents = ( const sender = editEvent.getSender(); if (sender && ignoredUsersSet.has(sender)) continue; - extras.push({ mEvent: editEvent, timelineSet }); + extras.push({ mEvent: editEvent, timelineSet, parentTs: parent.getTs() }); } } }