jerry/buzz
1
0
Fork 0
mirror of https://github.com/block/buzz.git synced 2026-11-03 07:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(messages): resolve persisted reply edits

Browse Source 
Co-authored-by: Rizz <302abe414ca6e3134763d2539bfcf145aea2a63fe5f8455204ed602fd40cf381@buzz.block.builderlab.xyz>
Signed-off-by: Taylor Ho <taylorkmho@gmail.com>
This commit is contained in:
Taylor Ho
2026-08-22 11:33:09 -07:00
committed by Carl
parent efef6b7090
commit 3562cbe520
2 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
desktop/src/features/channels/ui/ChannelScreen.tsx
View File

@@ -462,8 +462,10 @@ export function ChannelScreen({
});
const editTargetMessage = React.useMemo(
() =>
timelineMessages.find((message) => message.id === editTargetId) ?? null,
[editTargetId, timelineMessages],
timelineMessages.find((message) => message.id === editTargetId) ??
threadPanelData.messages.find((message) => message.id === editTargetId) ??
null,
[editTargetId, threadPanelData.messages, timelineMessages],
);
const [emptyDeleteId, setEmptyDeleteId] = React.useState<string | null>(null);
const {

46
desktop/tests/e2e/messaging.spec.ts
View File

@@ -3004,39 +3004,47 @@ test("editing the thread root uses and focuses the main composer", async ({
await expect(mainInput).toBeFocused();
});
test("editing a thread reply uses and focuses the thread composer", async ({
test("editing a pre-seeded thread reply uses and focuses the thread composer", async ({
page,
}) => {
const root = `Reply edit routing root ${Date.now()}`;
const reply = `Reply edit routing ${Date.now()}`;
await page.goto("/");
await page.waitForFunction(
() => typeof window.__BUZZ_E2E_EMIT_MOCK_MESSAGE__ === "function",
);
const { replyId, rootId } = await page.evaluate(
({ replyContent, rootContent }) => {
const emit = window.__BUZZ_E2E_EMIT_MOCK_MESSAGE__;
if (!emit) throw new Error("Mock message emitter is unavailable.");
const rootEvent = emit({
channelName: "general",
content: rootContent,
});
const replyEvent = emit({
channelName: "general",
content: replyContent,
parentEventId: rootEvent.id,
});
return { replyId: replyEvent.id, rootId: rootEvent.id };
},
{ replyContent: reply, rootContent: root },
);
await page.getByTestId("channel-general").click();
await expect(page.getByTestId("chat-title")).toHaveText("general");
const mainInput = page
.getByTestId("channel-composer-overlay")
.getByTestId("message-input");
await mainInput.fill(root);
await mainInput.press("Enter");
const timelineRoot = page
.getByTestId("message-timeline")
.getByTestId("message-row")
.last();
await timelineRoot.scrollIntoViewIfNeeded();
.locator(`[data-message-id="${rootId}"]`);
await expect(timelineRoot).toContainText(root);
await timelineRoot.hover();
await timelineRoot.getByRole("button", { name: "Reply" }).click({
force: true,
});
await timelineRoot.getByRole("button", { name: "Reply" }).click();
const threadPanel = page.getByTestId("message-thread-panel");
const threadInput = threadPanel.getByTestId("message-input");
await threadInput.fill(reply);
await threadInput.press("Enter");
await expect(threadPanel).toContainText(reply);
const threadReply = threadPanel.getByTestId("message-row").last();
const threadReply = threadPanel.locator(`[data-message-id="${replyId}"]`);
await expect(threadReply).toContainText(reply);
await threadReply.hover();
await threadReply.getByRole("button", { name: "More actions" }).click();
await page.getByRole("menuitem", { name: "Edit message" }).click();