@remit/web-client 0.0.230 → 0.0.231

package/src/routing/fragment.ts

@@ -27,6 +27,25 @@ export type OverlayPanel = (typeof overlayPanels)[number];
 export const isOverlayPanel = (panel: PanelFragment): panel is OverlayPanel =>
 	(overlayPanels as readonly PanelFragment[]).includes(panel);
 
+/**
+ * The set an overlay opening or closing leaves behind it.
+ *
+ * A write states the whole set, so raising the nav slide-over has to say what
+ * else is up or it takes it down. The panes stay and the previous overlay goes,
+ * because two overlays cannot both be up — which is how a reader crossing from
+ * their mail into the calendar and reaching for the folders keeps the rail they
+ * arrived with.
+ */
+export function panelsWithOverlay(
+	open: readonly PanelFragment[],
+	overlay: OverlayPanel | undefined,
+): PanelFragment[] {
+	return [
+		...open.filter((panel) => !isOverlayPanel(panel)),
+		...(overlay ? [overlay] : []),
+	];
+}
+
 const panelFragmentSchema = z.enum(panelFragments);
 
 /**

package/src/routing/index.ts

@@ -3,6 +3,15 @@ export {
 	useBrowsedList,
 	useOpensDetail,
 } from "./browsed-list";
+export {
+	type CalendarAddress,
+	type CalendarNavigation,
+	type OpenCalendarEvent,
+	useCalendarAddress,
+	useCalendarNavigation,
+	useIsWritingEvent,
+	useOpenCalendarEvent,
+} from "./calendar";
 export {
 	useAdoptComposeDraft,
 	useCloseCompose,
@@ -18,6 +27,7 @@ export {
 	overlayPanels,
 	type PanelFragment,
 	panelFragments,
+	panelsWithOverlay,
 	parseOpenPanels,
 	retainOpenPanelsAtTier,
 	useOpenPanels,

package/src/routing/nav-selection.ts

@@ -5,6 +5,7 @@ import { locationIsOnList } from "@/lib/mail-route";
  * The nav entry the address selects, or `""` where none does.
  *
  *   - `/settings/*` → "settings"
+ *   - `/calendar/*` → "calendar"
  *   - `/mail/outbox`, `/mail/flagged`, `/mail/brief` → that list
  *   - `/mail/$mailboxId` → the mailbox id, which is what the sidebar keys on
  *
@@ -17,6 +18,7 @@ export function useSelectedNavId(): string {
 	const mailbox = useParams({ from: "/mail/$mailboxId", shouldThrow: false });
 
 	if (locationIsOnList(pathname, "/settings")) return "settings";
+	if (locationIsOnList(pathname, "/calendar")) return "calendar";
 	if (locationIsOnList(pathname, "/mail/outbox")) return "outbox";
 	if (locationIsOnList(pathname, "/mail/flagged")) return "flagged";
 	if (locationIsOnList(pathname, "/mail/brief")) return "brief";