@remit/web-client 0.0.310 → 0.0.312

package/src/routes/mail/$mailboxId/$threadId/$messageId/$mode.{-$outboxMessageId}.tsx

@@ -8,7 +8,8 @@
  * The conversation reads it off the address and opens it at its head.
  */
 import { createFileRoute } from "@tanstack/react-router";
+import { replySearchSchemas } from "@/lib/mail-search";
 
 export const Route = createFileRoute(
 	"/mail/$mailboxId/$threadId/$messageId/$mode/{-$outboxMessageId}",
-)({});
+)({ validateSearch: replySearchSchemas.mailbox });

package/src/routes/mail/brief/$threadId/$messageId/$mode.{-$outboxMessageId}.tsx

@@ -20,7 +20,8 @@
  * the pane reads the reply off the address, the way the shell reads compose.
  */
 import { createFileRoute } from "@tanstack/react-router";
+import { replySearchSchemas } from "@/lib/mail-search";
 
 export const Route = createFileRoute(
 	"/mail/brief/$threadId/$messageId/$mode/{-$outboxMessageId}",
-)({});
+)({ validateSearch: replySearchSchemas.brief });

package/src/routes/mail/flagged/$threadId/$messageId/$mode.{-$outboxMessageId}.tsx

@@ -8,7 +8,8 @@
  * The conversation reads it off the address and opens it at its head.
  */
 import { createFileRoute } from "@tanstack/react-router";
+import { replySearchSchemas } from "@/lib/mail-search";
 
 export const Route = createFileRoute(
 	"/mail/flagged/$threadId/$messageId/$mode/{-$outboxMessageId}",
-)({});
+)({ validateSearch: replySearchSchemas.flagged });

package/src/routing/compose.ts

@@ -1,5 +1,6 @@
 import { useNavigate, useParams } from "@tanstack/react-router";
 import { useCallback } from "react";
+import { withoutComposeSeed } from "@/lib/mail-search";
 import { useBrowsedList, useNavigateToBrowsedList } from "./browsed-list";
 import { useRetainOpenPanels } from "./fragment";
 
@@ -108,7 +109,7 @@ function useComposeNavigate(): (
 		) => {
 			navigate({
 				...composeTarget(list, mailboxId, outboxMessageId),
-				search: (prev: Record<string, unknown>) => prev,
+				search: withoutComposeSeed,
 				// Opening or closing the surface is going somewhere, so the panes the
 				// reader keeps up travel and the overlays they were reading over do
 				// not. Recording the draft is not going anywhere — the address is

package/src/routing/outbox-draft.ts

@@ -1,5 +1,6 @@
 import { useNavigate, useParams } from "@tanstack/react-router";
 import { useCallback } from "react";
+import { withoutComposeSeed } from "@/lib/mail-search";
 import { useNavigateToBrowsedList } from "./browsed-list";
 import { useRetainOpenPanels } from "./fragment";
 
@@ -29,7 +30,7 @@ export function useOpenOutboxDraft(): (outboxMessageId: string) => void {
 			navigate({
 				to: "/mail/outbox/draft/$outboxMessageId",
 				params: { outboxMessageId },
-				search: (prev: Record<string, unknown>) => prev,
+				search: withoutComposeSeed,
 				hash: retainPanels,
 			});
 		},

package/src/routing/reply.ts

@@ -1,7 +1,8 @@
-import { useNavigate, useParams } from "@tanstack/react-router";
+import { useNavigate, useParams, useSearch } from "@tanstack/react-router";
 import { useCallback, useMemo } from "react";
 import { z } from "zod";
 import type { MailListRoute } from "@/lib/mail-route";
+import { type ComposeSeed, withoutComposeSeed } from "@/lib/mail-search";
 import { useBrowsedList } from "./browsed-list";
 import { useRetainOpenPanels } from "./fragment";
 
@@ -53,6 +54,7 @@ export interface ReplyAddress {
 	sourceMessageId: string;
 	/** The draft it writes to, once the first autosave has made one. */
 	outboxMessageId: string | undefined;
+	seed: ComposeSeed | undefined;
 }
 
 export type ReplySurface =
@@ -79,6 +81,20 @@ function useReplyParams(): ReplyParams | undefined {
 	return brief ?? flagged ?? mailbox;
 }
 
+function useReplySeed(): string | undefined {
+	const brief = useSearch({ from: BRIEF_REPLY, shouldThrow: false });
+	const flagged = useSearch({ from: FLAGGED_REPLY, shouldThrow: false });
+	const mailbox = useSearch({ from: MAILBOX_REPLY, shouldThrow: false });
+	return (brief ?? flagged ?? mailbox)?.body;
+}
+
+const seededSearch =
+	(seed: ComposeSeed | undefined) =>
+	(prev: Record<string, unknown>): Record<string, unknown> =>
+		seed === undefined
+			? withoutComposeSeed(prev)
+			: { ...withoutComposeSeed(prev), body: seed.body };
+
 /**
  * The reply surface the address names, or none.
  *
@@ -89,6 +105,7 @@ function useReplyParams(): ReplyParams | undefined {
  */
 export function useReplySurface(): ReplySurface | undefined {
 	const params = useReplyParams();
+	const seedBody = useReplySeed();
 	return useMemo(() => {
 		if (!params) return undefined;
 		const mode = replyModeSchema.safeParse(params.mode);
@@ -99,8 +116,9 @@ export function useReplySurface(): ReplySurface | undefined {
 			threadId: params.threadId,
 			sourceMessageId: params.messageId,
 			outboxMessageId: params.outboxMessageId,
+			seed: seedBody === undefined ? undefined : { body: seedBody },
 		};
-	}, [params]);
+	}, [params, seedBody]);
 }
 
 /**
@@ -183,17 +201,25 @@ function inheritedDraft(
  * A push, so Back leaves the reply and returns the message it was written
  * under, and the query travels with it.
  */
-export function useOpenReply(): (target: ReplyTarget) => void {
+export function useOpenReply(): (
+	target: ReplyTarget,
+	seed?: ComposeSeed,
+) => void {
 	const navigate = useNavigate();
 	const retainPanels = useRetainOpenPanels();
 	const { list, mailboxId } = useBrowsedList();
 	const open = useReplySurface();
 
 	return useCallback(
-		(target: ReplyTarget) => {
+		(target: ReplyTarget, seed?: ComposeSeed) => {
 			navigate({
-				...replyTarget(list, mailboxId, target, inheritedDraft(open, target)),
-				search: (prev: Record<string, unknown>) => prev,
+				...replyTarget(
+					list,
+					mailboxId,
+					target,
+					seed === undefined ? inheritedDraft(open, target) : undefined,
+				),
+				search: seededSearch(seed),
 				hash: retainPanels,
 			});
 		},
@@ -254,7 +280,7 @@ export function useAdoptReplyDraft(): (outboxMessageId: string) => void {
 					},
 					outboxMessageId,
 				),
-				search: (prev: Record<string, unknown>) => prev,
+				search: seededSearch(undefined),
 				hash: true,
 				replace: true,
 			});
@@ -278,7 +304,7 @@ export function useCloseReply(): () => void {
 
 	return useCallback(() => {
 		if (!params) return;
-		const search = (prev: Record<string, unknown>) => prev;
+		const search = seededSearch(undefined);
 		const hash = retainPanels;
 		const message = { threadId: params.threadId, messageId: params.messageId };
 		if (list === "flagged") {