Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions src/features/messages/use-message-selection.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
// @vitest-environment jsdom
import { cleanup, render } from "@testing-library/react";
import { useRef } from "react";
import { afterEach, expect, it } from "vitest";
import type { ChannelMessage } from "../relay/contracts";
import type { RelaySession } from "../relay/session";
import { selectNewestMessage } from "./message-selection";
import { useMessageSelection } from "./use-message-selection";

afterEach(cleanup);

const message = (id: string, createdAt: number, createdAtMs?: number) =>
({ id, createdAt, createdAtMs }) as ChannelMessage;

function List({ rows }: { rows: readonly ChannelMessage[] }) {
const list = useRef<HTMLElement>(null);
useMessageSelection(list, rows, {} as RelaySession);
return (
<section ref={list} aria-label="Messages">
{rows.map((row) => (
<div key={row.id} data-message-id={row.id}>
<div data-layout="timeline">{row.id}</div>
</div>
))}
</section>
);
}

function newestSelected(rows: readonly ChannelMessage[]) {
const { getByRole } = render(<List rows={rows} />, { reactStrictMode: true });
expect(selectNewestMessage(getByRole("region", { name: "Messages" }))).toBe(
true,
);
return document.activeElement?.closest<HTMLElement>("[data-message-id]")
?.dataset.messageId;
}

it("selects the latest message of a same-second burst by send ms, then id", () => {
expect(
newestSelected([message("z", 100, 100_100), message("a", 100, 100_200)]),
).toBe("a");
cleanup();
expect(newestSelected([message("a", 100), message("b", 100)])).toBe("b");
});

it("selects the latest message across seconds and skips membership notices", () => {
const notice = {
...message("notice", 300),
membership: {},
} as ChannelMessage;
expect(
newestSelected([message("old", 100), message("new", 200), notice]),
).toBe("new");
});
3 changes: 2 additions & 1 deletion src/features/messages/use-message-selection.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useLayoutEffect, useRef, type RefObject } from "react";
import type { ChannelMessage } from "../relay/contracts";
import { compareMessages } from "../relay/message-order";
import type { RelaySession } from "../relay/session";
import { useMessageEditScope } from "./MessageEditScope";
import { useMessageKeyActions } from "./MessageManagement";
Expand All @@ -26,7 +27,7 @@ export function useMessageSelection(
newest: () =>
latest.current.reduce<ChannelMessage | undefined>(
(newest, row) =>
!row.membership && (!newest || row.createdAt > newest.createdAt)
!row.membership && (!newest || compareMessages(row, newest) > 0)
? row
: newest,
undefined,
Expand Down
Loading