@devries-cameron20 / t3code-1 / commits / e7f62ef05d
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

refactor(web): sidebar list markers and draft rows live in their own files (#22729)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

Julius Marminge committed Oct 21, 2026 at 01:24 UTC e7f62ef05daedd08c320da0526b616396d3c6aae
3 files changed +368 -354
apps/web/src/components/Sidebar.tsx
+11 -354
@@ -1,6 +1,5 @@
1 import { type EnvironmentId, type ScopedProjectRef } from "@t3tools/contracts";
2 import type { EnvironmentServerConfig } from "@t3tools/client-runtime/connection";
3 -import { CollapsibleSectionHeader } from "./ui/collapsible-section-header";
3 import { ThreadContextDragGhost } from "./chat/ThreadContextDragGhost";
4 import {
5 dropThreadContext,
@@ -12,7 +11,6 @@ import { requestCustomSnooze } from "./CustomSnoozeDialog";
11 import { useAtomValue } from "@effect/atom-react";
12 import * as Option from "effect/Option";
13 import { Atom } from "effect/reactivity";
15 -import { replaceComposerContextReferences } from "@t3tools/shared/composerContextReferences";
14 import * as Schema from "effect/Schema";
15 import {
16 DndContext,
@@ -23,9 +21,8 @@ import {
21 type DragStartEvent,
22 type Modifier,
23 } from "@dnd-kit/core";
26 -import { SortableContext, useSortable } from "@dnd-kit/sortable";
24 +import { SortableContext } from "@dnd-kit/sortable";
25 import { restrictToFirstScrollableAncestor, restrictToVerticalAxis } from "@dnd-kit/modifiers";
28 -import { CSS } from "@dnd-kit/utilities";
26 import {
27 canSnooze,
28 effectiveSnoozed,
@@ -50,16 +47,8 @@ import {
47 type ThreadId,
48 } from "@t3tools/contracts";
49
50 +import { FolderIcon, ListFilterIcon, PlusIcon, SettingsIcon } from "lucide-react";
51 import {
54 - FolderIcon,
55 - ListFilterIcon,
56 - PlusIcon,
57 - SettingsIcon,
58 - SquarePenIcon,
59 - XIcon,
60 -} from "lucide-react";
61 -import {
62 - memo,
52 useEffect,
53 useLayoutEffect,
54 useReducer,
@@ -139,7 +128,6 @@ import { readEnvironmentScope } from "../state/session";
128 import { buildThreadRouteParams, resolveActiveThreadRouteRef } from "../threadRoutes";
129 import type { SidebarThreadSummary } from "../types";
130 import { isScratchProject } from "@t3tools/client-runtime/state/projects";
142 -import type { EnvironmentProject } from "@t3tools/client-runtime/state/shell";
131 import { cn } from "~/lib/utils";
132 import { ProjectEnvironmentBadge } from "./ProjectEnvironmentBadge";
133 import {
@@ -148,7 +136,6 @@ import {
136 threadActionRequiresOperate,
137 } from "./threadActionMenu.logic";
138 import {
151 - animateSidebarLayoutChanges,
139 applySidebarThreadDrop,
140 filterSidebarV2VisibleThreads,
141 buildBulkTitleRegenerationContextMenuItem,
@@ -167,12 +154,10 @@ import {
154 resolveSidebarDropTarget,
155 resolveSidebarDropVerb,
156 resolveSidebarThreadSection,
170 - resolveSidebarRowAccessibility,
157 searchSidebarThreads,
158 shouldCreateNewThreadInCurrentProject,
159 shouldNavigateAfterThreadPark,
160 sidebarListItemId,
175 - sidebarMarkerId,
161 sidebarThreadKeyAtY,
162 sortInboxThreadsByReturn,
163 sortPinnedThreadsForSidebar,
@@ -180,7 +165,6 @@ import {
165 sortWorkingThreadsBySend,
166 useThreadJumpHintVisibility,
167 type SidebarListItem,
183 - type SidebarListMarker,
168 type SidebarSection,
169 resolveSidebarRowThreadId,
170 } from "./Sidebar.logic";
@@ -192,7 +176,7 @@ import {
176 import { SidebarDragLifecycle, SidebarPointerSensor } from "./Sidebar.pointer";
177 import { createSidebarListMotion } from "./Sidebar.motion";
178 import { resolveSnoozePresets, snoozeWakeLabel, type SnoozePreset } from "./Sidebar.snooze";
195 -import { ProjectFavicon, type ProjectFaviconProject } from "./ProjectFavicon";
179 +import { ProjectFavicon } from "./ProjectFavicon";
180 import { deriveProviderEntriesByEnvironment } from "../providerInstances";
181 import { useStableCallback } from "../hooks/useStableCallback";
182 import { stackedThreadToast, toastManager } from "./ui/toast";
@@ -210,24 +194,21 @@ import {
194 import { SidebarContent, SidebarGroup, useSidebar } from "./ui/sidebar";
195 import { SidebarChromeFooter, SidebarChromeHeader } from "./sidebar/SidebarChrome";
196 import { SidebarHeaderIconButton, SidebarThreadHeader } from "./sidebar/SidebarThreadHeader";
213 -import { Tooltip, TooltipPopup, TooltipProvider, TooltipTrigger } from "./ui/tooltip";
214 -import {
215 - composerDraftHasUserContent,
216 - DraftId,
217 - useComposerDraftStore,
218 - type ComposerThreadDraftState,
219 - type DraftSessionState,
220 -} from "../composerDraftStore";
197 +import { TooltipProvider } from "./ui/tooltip";
198 +import { composerDraftHasUserContent, DraftId, useComposerDraftStore } from "../composerDraftStore";
199 import { useThreadRouteTarget } from "../hooks/useThreadRouteTarget";
200 import {
223 - SIDEBAR_SORTABLE_DRAG_DISABLED,
224 - draftPenClassName,
225 - draftSurfaceClassName,
201 SidebarSearchResultRow,
202 SortableThreadRow,
203 type SidebarProviderEntry,
204 type SidebarSweepAction,
205 } from "./sidebar/SidebarThreadRow";
206 +import { SidebarDraftBlock } from "./sidebar/SidebarDraftBlock";
207 +import {
208 + SidebarDragBoundary,
209 + SidebarSectionHeader,
210 + SidebarSectionPlaceholder,
211 +} from "./sidebar/SidebarListMarkers";
212
213 function sameSidebarProviderEntries(
214 left: ReadonlyMap<string, SidebarProviderEntry>,
@@ -756,334 +737,10 @@ function checkThreadOperations(
737 return false;
738 }
739
759 -function SortableSidebarMarker(props: {
760 - marker: SidebarListMarker;
761 - className?: string;
762 - children?: ReactNode;
763 - "data-testid"?: string;
764 -}) {
765 - const { setNodeRef, transform, transition } = useSortable({
766 - id: sidebarMarkerId(props.marker),
767 - disabled: SIDEBAR_SORTABLE_DRAG_DISABLED,
768 - animateLayoutChanges: animateSidebarLayoutChanges,
769 - });
770 - return (
771 - <li
772 - ref={setNodeRef}
773 - data-thread-selection-safe
774 - data-testid={props["data-testid"]}
775 - className={cn("list-none", props.className)}
776 - style={{
777 - transform: CSS.Translate.toString(transform),
778 - transition: props.marker.endsWith("-placeholder") ? "none" : transition,
779 - visibility: transform?.scaleY === 0 ? "hidden" : undefined,
780 - }}
781 - >
782 - {props.children}
783 - </li>
784 - );
785 -}
786 -
787 -function SidebarSectionPlaceholder(props: {
788 - marker: "active-placeholder" | "settled-placeholder";
789 - label: string;
790 - showHint: boolean;
791 - isDropTarget: boolean;
792 -}) {
793 - return (
794 - <SortableSidebarMarker
795 - marker={props.marker}
796 - data-testid={`sidebar-${props.marker}`}
797 - className="relative mx-0.5 -mb-px h-0"
798 - >
799 - {props.showHint ? (
800 - <div
801 - className={cn(
802 - "absolute inset-x-0 top-0 flex h-9 items-center justify-center rounded-md border border-dashed border-sidebar-foreground/25 text-xs text-sidebar-foreground/80",
803 - props.isDropTarget && "border-primary/40 bg-primary/5 text-primary",
804 - )}
805 - >
806 - {props.label}
807 - </div>
808 - ) : null}
809 - </SortableSidebarMarker>
810 - );
811 -}
812 -
740 const SIDEBAR_DRAG_DISTANCE = 6;
741
742 const SIDEBAR_DRAG_LABEL_HEIGHT = 24;
743
817 -function SidebarDragBoundary(props: {
818 - marker: "pinned-header" | "pinned-divider";
819 - label: string;
820 - visible: boolean;
821 - isDropTarget: boolean;
822 -}) {
823 - return (
824 - <SortableSidebarMarker
825 - marker={props.marker}
826 - data-testid={`sidebar-${props.marker}`}
827 - className="pointer-events-none relative mx-0.5 -mb-px h-0"
828 - >
829 - {props.visible ? (
830 - <div className="sidebar-drag-boundary-label absolute inset-x-2 top-1 flex h-4 items-center gap-2">
831 - <span
832 - className={cn(
833 - "shrink-0 text-xs font-medium",
834 - props.isDropTarget ? "text-primary" : "text-sidebar-foreground/80",
835 - )}
836 - >
837 - {props.label}
838 - </span>
839 - <span
840 - aria-hidden
841 - className={cn(
842 - "h-px flex-1",
843 - props.isDropTarget ? "bg-primary/50" : "bg-sidebar-foreground/25",
844 - )}
845 - />
846 - </div>
847 - ) : null}
848 - </SortableSidebarMarker>
849 - );
850 -}
851 -
852 -function SidebarSectionHeader(props: {
853 - marker: "working-header" | "snoozed-header" | "settled-header";
854 - label: string;
855 - className?: string;
856 - dragging?: boolean;
857 - isDropTarget?: boolean;
858 - toggle: { expanded: boolean; onToggle: () => void };
859 -}) {
860 - const shelf =
861 - props.marker === "working-header"
862 - ? "working"
863 - : props.marker === "snoozed-header"
864 - ? "snoozed"
865 - : "settled";
866 - const snoozed = shelf === "snoozed";
867 - return (
868 - <SortableSidebarMarker
869 - marker={props.marker}
870 - data-testid={`sidebar-${props.marker}`}
871 - className={cn("mx-0.5 h-8", props.className)}
872 - >
873 - <CollapsibleSectionHeader
874 - onClick={props.toggle.onToggle}
875 - expanded={props.toggle.expanded}
876 - tone={
877 - props.isDropTarget ? "accent" : props.dragging ? "emphasized" : snoozed ? "info" : "muted"
878 - }
879 - data-testid={`sidebar-${shelf}-shelf-toggle`}
880 - >
881 - {props.label}
882 - </CollapsibleSectionHeader>
883 - </SortableSidebarMarker>
884 - );
885 -}
886 -
887 -const SidebarDraftRow = memo(function SidebarDraftRow(props: {
888 - draftId: DraftId;
889 - composer: ComposerThreadDraftState;
890 - project: ProjectFaviconProject | null;
891 - projectDisplayName: string | null;
892 - isActive: boolean;
893 - onNavigate: (draftId: DraftId) => void;
894 - onDiscard: (draftId: DraftId) => void;
895 - onContextMenu: (draftId: DraftId, position: { x: number; y: number }) => void;
896 -}) {
897 - const { composer, draftId, onContextMenu, onDiscard, onNavigate } = props;
898 - const promptPreview =
899 - replaceComposerContextReferences(composer.prompt, (occurrence) => occurrence.label)
900 - .trim()
901 - .split("\n", 1)[0] ?? "";
902 - // images mirrors persistedAttachments once rehydration finishes; before
903 - // that only the persisted list is populated, hence max not sum.
904 - const attachmentCount =
905 - Math.max(composer.images.length, composer.persistedAttachments.length) +
906 - composer.files.length +
907 - composer.terminalContexts.length +
908 - composer.previewAnnotations.length +
909 - composer.reviewComments.length;
910 - const preview =
911 - promptPreview.length > 0
912 - ? promptPreview
913 - : `${attachmentCount} attachment${attachmentCount === 1 ? "" : "s"}`;
914 - const accessibility = resolveSidebarRowAccessibility({
915 - title: preview,
916 - statusLabel: "Unsent draft",
917 - projectDisplayName: props.projectDisplayName,
918 - isActive: props.isActive,
919 - });
920 - const handleActivate = () => onNavigate(draftId);
921 - const handleKeyDown = (event: ReactKeyboardEvent) => {
922 - // Keys targeting the nested discard button belong to the button:
923 - // preventDefault here would swallow Space's synthesized click and
924 - // navigate instead of discarding.
925 - if ((event.target as HTMLElement).closest("button")) return;
926 - if (event.key === "ContextMenu" || (event.shiftKey && event.key === "F10")) {
927 - event.preventDefault();
928 - const rect = event.currentTarget.getBoundingClientRect();
929 - onContextMenu(draftId, { x: rect.left, y: rect.bottom });
930 - } else if (event.key === "Enter" || event.key === " ") {
931 - event.preventDefault();
932 - onNavigate(draftId);
933 - }
934 - };
935 - const handleContextMenu = (event: ReactMouseEvent) => {
936 - event.preventDefault();
937 - onContextMenu(draftId, { x: event.clientX, y: event.clientY });
938 - };
939 - const handleDiscard = (event: ReactMouseEvent) => {
940 - event.preventDefault();
941 - event.stopPropagation();
942 - onDiscard(draftId);
943 - };
944 - return (
945 - <li className="list-none py-0.5">
946 - <div
947 - role="button"
948 - tabIndex={0}
949 - aria-label={accessibility.label}
950 - aria-current={accessibility.current}
951 - data-testid="sidebar-draft-row"
952 - className={cn(
953 - "group/sidebar-row relative w-full cursor-pointer overflow-hidden rounded-md text-left text-sidebar-foreground outline-none select-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring",
954 - props.isActive ? "bg-sidebar-row-active" : draftSurfaceClassName,
955 - )}
956 - onClick={handleActivate}
957 - onContextMenu={handleContextMenu}
958 - onKeyDown={handleKeyDown}
959 - >
960 - <span className="sr-only">{preview}</span>
961 - <div className="relative z-10 h-[4.875rem] px-(--sidebar-row-content-inset) py-(--sidebar-content-inset)">
962 - <div className="flex h-5 min-w-0 items-center gap-1.5">
963 - <SquarePenIcon aria-hidden className={draftPenClassName} />
964 - {props.project ? (
965 - <ProjectFavicon project={props.project} className="size-4 shrink-0" />
966 - ) : null}
967 - <span className="min-w-0 flex-1 truncate text-xs font-medium text-secondary-label">
968 - {props.projectDisplayName}
969 - </span>
970 - <span className="ml-auto flex h-5 min-w-5 shrink-0 items-center justify-end">
971 - <Tooltip>
972 - <TooltipTrigger
973 - render={
974 - <button
975 - type="button"
976 - aria-label="Discard draft"
977 - onClick={handleDiscard}
978 - className="pointer-events-none inline-flex cursor-pointer items-center rounded-md bg-transparent px-1 text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:pointer-events-auto focus-visible:opacity-100 group-hover/sidebar-row:pointer-events-auto group-hover/sidebar-row:opacity-100"
979 - >
980 - <XIcon className="size-3" />
981 - </button>
982 - }
983 - />
984 - <TooltipPopup side="top">Discard draft</TooltipPopup>
985 - </Tooltip>
986 - </span>
987 - </div>
988 - <div aria-hidden className="mt-0.5 truncate text-sm font-medium text-foreground/90">
989 - {preview}
990 - </div>
991 - </div>
992 - </div>
993 - </li>
994 - );
995 -});
996 -
997 -interface SidebarDraftRowData {
998 - draftId: DraftId;
999 - session: DraftSessionState;
1000 - composer: ComposerThreadDraftState;
1001 -}
1002 -
1003 -const SidebarDraftBlock = memo(function SidebarDraftBlock(props: {
1004 - projectByKey: ReadonlyMap<string, EnvironmentProject>;
1005 - projectDisplayNameByKey: ReadonlyMap<string, string>;
1006 - scopedProjectKeys: ReadonlySet<string> | null;
1007 - routeDraftId: string | null;
1008 - onNavigateToDraft: (draftId: DraftId) => void;
1009 - onDraftContextMenu: (draftId: DraftId, position: { x: number; y: number }) => void;
1010 -}) {
1011 - const draftThreadsByThreadKey = useComposerDraftStore((store) => store.draftThreadsByThreadKey);
1012 - const draftsByThreadKey = useComposerDraftStore((store) => store.draftsByThreadKey);
1013 - const [frozenActive, setFrozenActive] = useState<{
1014 - routeDraftId: string | null;
1015 - row: SidebarDraftRowData | null;
1016 - }>({ routeDraftId: null, row: null });
1017 - if (frozenActive.routeDraftId !== props.routeDraftId) {
1018 - let row: SidebarDraftRowData | null = null;
1019 - if (props.routeDraftId !== null) {
1020 - const draftId = DraftId.make(props.routeDraftId);
1021 - const session = draftThreadsByThreadKey[draftId];
1022 - const composer = draftsByThreadKey[draftId];
1023 - row =
1024 - session && session.promotedTo == null && composer && composerDraftHasUserContent(composer)
1025 - ? { draftId, session, composer }
1026 - : null;
1027 - }
1028 - setFrozenActive({ routeDraftId: props.routeDraftId, row });
1029 - }
1030 - const drafts = (() => {
1031 - const rows: SidebarDraftRowData[] = [];
1032 - for (const [draftKey, session] of Object.entries(draftThreadsByThreadKey)) {
1033 - if (session.promotedTo != null) {
1034 - continue;
1035 - }
1036 - if (
1037 - props.scopedProjectKeys !== null &&
1038 - !props.scopedProjectKeys.has(`${session.environmentId}:${session.projectId}`)
1039 - ) {
1040 - continue;
1041 - }
1042 - if (draftKey === props.routeDraftId) {
1043 - if (frozenActive.routeDraftId === draftKey && frozenActive.row !== null) {
1044 - rows.push(frozenActive.row);
1045 - }
1046 - continue;
1047 - }
1048 - const composer = draftsByThreadKey[draftKey];
1049 - if (!composer || !composerDraftHasUserContent(composer)) {
1050 - continue;
1051 - }
1052 - rows.push({ draftId: DraftId.make(draftKey), session, composer });
1053 - }
1054 - rows.sort((left, right) => right.session.createdAt.localeCompare(left.session.createdAt));
1055 - return rows;
1056 - })();
1057 - if (drafts.length === 0) {
1058 - return null;
1059 - }
1060 - return (
1061 - <>
1062 - {drafts.map(({ composer, draftId, session }) => {
1063 - const projectKey = `${session.environmentId}:${session.projectId}`;
1064 - return (
1065 - <SidebarDraftRow
1066 - key={draftId}
1067 - draftId={draftId}
1068 - composer={composer}
1069 - project={props.projectByKey.get(projectKey) ?? null}
1070 - projectDisplayName={props.projectDisplayNameByKey.get(projectKey) ?? null}
1071 - isActive={draftId === props.routeDraftId}
1072 - onNavigate={props.onNavigateToDraft}
1073 - onDiscard={discardComposerDraft}
1074 - onContextMenu={props.onDraftContextMenu}
1075 - />
1076 - );
1077 - })}
1078 - <li
1079 - aria-hidden
1080 - data-testid="sidebar-draft-divider"
1081 - className="mx-2.5 my-1.5 h-px list-none bg-sidebar-border/60"
1082 - />
1083 - </>
1084 - );
1085 -});
1086 -
744 export default function Sidebar() {
745 const {
746 projects,
apps/web/src/components/sidebar/SidebarDraftBlock.tsx new
+222
@@ -0,0 +1,222 @@
1 +import { discardComposerDraft } from "../../lib/discardComposerDraft";
2 +import { replaceComposerContextReferences } from "@t3tools/shared/composerContextReferences";
3 +import { SquarePenIcon, XIcon } from "lucide-react";
4 +import {
5 + memo,
6 + useState,
7 + type KeyboardEvent as ReactKeyboardEvent,
8 + type MouseEvent as ReactMouseEvent,
9 +} from "react";
10 +import type { EnvironmentProject } from "@t3tools/client-runtime/state/shell";
11 +import { cn } from "~/lib/utils";
12 +import { resolveSidebarRowAccessibility } from "../Sidebar.logic";
13 +import { ProjectFavicon, type ProjectFaviconProject } from "../ProjectFavicon";
14 +import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
15 +import {
16 + composerDraftHasUserContent,
17 + DraftId,
18 + useComposerDraftStore,
19 + type ComposerThreadDraftState,
20 + type DraftSessionState,
21 +} from "../../composerDraftStore";
22 +import { draftPenClassName, draftSurfaceClassName } from "./SidebarThreadRow";
23 +
24 +const SidebarDraftRow = memo(function SidebarDraftRow(props: {
25 + draftId: DraftId;
26 + composer: ComposerThreadDraftState;
27 + project: ProjectFaviconProject | null;
28 + projectDisplayName: string | null;
29 + isActive: boolean;
30 + onNavigate: (draftId: DraftId) => void;
31 + onDiscard: (draftId: DraftId) => void;
32 + onContextMenu: (draftId: DraftId, position: { x: number; y: number }) => void;
33 +}) {
34 + const { composer, draftId, onContextMenu, onDiscard, onNavigate } = props;
35 + const promptPreview =
36 + replaceComposerContextReferences(composer.prompt, (occurrence) => occurrence.label)
37 + .trim()
38 + .split("\n", 1)[0] ?? "";
39 + // images mirrors persistedAttachments once rehydration finishes; before
40 + // that only the persisted list is populated, hence max not sum.
41 + const attachmentCount =
42 + Math.max(composer.images.length, composer.persistedAttachments.length) +
43 + composer.files.length +
44 + composer.terminalContexts.length +
45 + composer.previewAnnotations.length +
46 + composer.reviewComments.length;
47 + const preview =
48 + promptPreview.length > 0
49 + ? promptPreview
50 + : `${attachmentCount} attachment${attachmentCount === 1 ? "" : "s"}`;
51 + const accessibility = resolveSidebarRowAccessibility({
52 + title: preview,
53 + statusLabel: "Unsent draft",
54 + projectDisplayName: props.projectDisplayName,
55 + isActive: props.isActive,
56 + });
57 + const handleActivate = () => onNavigate(draftId);
58 + const handleKeyDown = (event: ReactKeyboardEvent) => {
59 + // Keys targeting the nested discard button belong to the button:
60 + // preventDefault here would swallow Space's synthesized click and
61 + // navigate instead of discarding.
62 + if ((event.target as HTMLElement).closest("button")) return;
63 + if (event.key === "ContextMenu" || (event.shiftKey && event.key === "F10")) {
64 + event.preventDefault();
65 + const rect = event.currentTarget.getBoundingClientRect();
66 + onContextMenu(draftId, { x: rect.left, y: rect.bottom });
67 + } else if (event.key === "Enter" || event.key === " ") {
68 + event.preventDefault();
69 + onNavigate(draftId);
70 + }
71 + };
72 + const handleContextMenu = (event: ReactMouseEvent) => {
73 + event.preventDefault();
74 + onContextMenu(draftId, { x: event.clientX, y: event.clientY });
75 + };
76 + const handleDiscard = (event: ReactMouseEvent) => {
77 + event.preventDefault();
78 + event.stopPropagation();
79 + onDiscard(draftId);
80 + };
81 + return (
82 + <li className="list-none py-0.5">
83 + <div
84 + role="button"
85 + tabIndex={0}
86 + aria-label={accessibility.label}
87 + aria-current={accessibility.current}
88 + data-testid="sidebar-draft-row"
89 + className={cn(
90 + "group/sidebar-row relative w-full cursor-pointer overflow-hidden rounded-md text-left text-sidebar-foreground outline-none select-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring",
91 + props.isActive ? "bg-sidebar-row-active" : draftSurfaceClassName,
92 + )}
93 + onClick={handleActivate}
94 + onContextMenu={handleContextMenu}
95 + onKeyDown={handleKeyDown}
96 + >
97 + <span className="sr-only">{preview}</span>
98 + <div className="relative z-10 h-[4.875rem] px-(--sidebar-row-content-inset) py-(--sidebar-content-inset)">
99 + <div className="flex h-5 min-w-0 items-center gap-1.5">
100 + <SquarePenIcon aria-hidden className={draftPenClassName} />
101 + {props.project ? (
102 + <ProjectFavicon project={props.project} className="size-4 shrink-0" />
103 + ) : null}
104 + <span className="min-w-0 flex-1 truncate text-xs font-medium text-secondary-label">
105 + {props.projectDisplayName}
106 + </span>
107 + <span className="ml-auto flex h-5 min-w-5 shrink-0 items-center justify-end">
108 + <Tooltip>
109 + <TooltipTrigger
110 + render={
111 + <button
112 + type="button"
113 + aria-label="Discard draft"
114 + onClick={handleDiscard}
115 + className="pointer-events-none inline-flex cursor-pointer items-center rounded-md bg-transparent px-1 text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:pointer-events-auto focus-visible:opacity-100 group-hover/sidebar-row:pointer-events-auto group-hover/sidebar-row:opacity-100"
116 + >
117 + <XIcon className="size-3" />
118 + </button>
119 + }
120 + />
121 + <TooltipPopup side="top">Discard draft</TooltipPopup>
122 + </Tooltip>
123 + </span>
124 + </div>
125 + <div aria-hidden className="mt-0.5 truncate text-sm font-medium text-foreground/90">
126 + {preview}
127 + </div>
128 + </div>
129 + </div>
130 + </li>
131 + );
132 +});
133 +
134 +interface SidebarDraftRowData {
135 + draftId: DraftId;
136 + session: DraftSessionState;
137 + composer: ComposerThreadDraftState;
138 +}
139 +
140 +export const SidebarDraftBlock = memo(function SidebarDraftBlock(props: {
141 + projectByKey: ReadonlyMap<string, EnvironmentProject>;
142 + projectDisplayNameByKey: ReadonlyMap<string, string>;
143 + scopedProjectKeys: ReadonlySet<string> | null;
144 + routeDraftId: string | null;
145 + onNavigateToDraft: (draftId: DraftId) => void;
146 + onDraftContextMenu: (draftId: DraftId, position: { x: number; y: number }) => void;
147 +}) {
148 + const draftThreadsByThreadKey = useComposerDraftStore((store) => store.draftThreadsByThreadKey);
149 + const draftsByThreadKey = useComposerDraftStore((store) => store.draftsByThreadKey);
150 + const [frozenActive, setFrozenActive] = useState<{
151 + routeDraftId: string | null;
152 + row: SidebarDraftRowData | null;
153 + }>({ routeDraftId: null, row: null });
154 + if (frozenActive.routeDraftId !== props.routeDraftId) {
155 + let row: SidebarDraftRowData | null = null;
156 + if (props.routeDraftId !== null) {
157 + const draftId = DraftId.make(props.routeDraftId);
158 + const session = draftThreadsByThreadKey[draftId];
159 + const composer = draftsByThreadKey[draftId];
160 + row =
161 + session && session.promotedTo == null && composer && composerDraftHasUserContent(composer)
162 + ? { draftId, session, composer }
163 + : null;
164 + }
165 + setFrozenActive({ routeDraftId: props.routeDraftId, row });
166 + }
167 + const drafts = (() => {
168 + const rows: SidebarDraftRowData[] = [];
169 + for (const [draftKey, session] of Object.entries(draftThreadsByThreadKey)) {
170 + if (session.promotedTo != null) {
171 + continue;
172 + }
173 + if (
174 + props.scopedProjectKeys !== null &&
175 + !props.scopedProjectKeys.has(`${session.environmentId}:${session.projectId}`)
176 + ) {
177 + continue;
178 + }
179 + if (draftKey === props.routeDraftId) {
180 + if (frozenActive.routeDraftId === draftKey && frozenActive.row !== null) {
181 + rows.push(frozenActive.row);
182 + }
183 + continue;
184 + }
185 + const composer = draftsByThreadKey[draftKey];
186 + if (!composer || !composerDraftHasUserContent(composer)) {
187 + continue;
188 + }
189 + rows.push({ draftId: DraftId.make(draftKey), session, composer });
190 + }
191 + rows.sort((left, right) => right.session.createdAt.localeCompare(left.session.createdAt));
192 + return rows;
193 + })();
194 + if (drafts.length === 0) {
195 + return null;
196 + }
197 + return (
198 + <>
199 + {drafts.map(({ composer, draftId, session }) => {
200 + const projectKey = `${session.environmentId}:${session.projectId}`;
201 + return (
202 + <SidebarDraftRow
203 + key={draftId}
204 + draftId={draftId}
205 + composer={composer}
206 + project={props.projectByKey.get(projectKey) ?? null}
207 + projectDisplayName={props.projectDisplayNameByKey.get(projectKey) ?? null}
208 + isActive={draftId === props.routeDraftId}
209 + onNavigate={props.onNavigateToDraft}
210 + onDiscard={discardComposerDraft}
211 + onContextMenu={props.onDraftContextMenu}
212 + />
213 + );
214 + })}
215 + <li
216 + aria-hidden
217 + data-testid="sidebar-draft-divider"
218 + className="mx-2.5 my-1.5 h-px list-none bg-sidebar-border/60"
219 + />
220 + </>
221 + );
222 +});
apps/web/src/components/sidebar/SidebarListMarkers.tsx new
+135
@@ -0,0 +1,135 @@
1 +import { CollapsibleSectionHeader } from "../ui/collapsible-section-header";
2 +import { useSortable } from "@dnd-kit/sortable";
3 +import { CSS } from "@dnd-kit/utilities";
4 +import { type ReactNode } from "react";
5 +import { cn } from "~/lib/utils";
6 +import {
7 + animateSidebarLayoutChanges,
8 + sidebarMarkerId,
9 + type SidebarListMarker,
10 +} from "../Sidebar.logic";
11 +import { SIDEBAR_SORTABLE_DRAG_DISABLED } from "./SidebarThreadRow";
12 +
13 +function SortableSidebarMarker(props: {
14 + marker: SidebarListMarker;
15 + className?: string;
16 + children?: ReactNode;
17 + "data-testid"?: string;
18 +}) {
19 + const { setNodeRef, transform, transition } = useSortable({
20 + id: sidebarMarkerId(props.marker),
21 + disabled: SIDEBAR_SORTABLE_DRAG_DISABLED,
22 + animateLayoutChanges: animateSidebarLayoutChanges,
23 + });
24 + return (
25 + <li
26 + ref={setNodeRef}
27 + data-thread-selection-safe
28 + data-testid={props["data-testid"]}
29 + className={cn("list-none", props.className)}
30 + style={{
31 + transform: CSS.Translate.toString(transform),
32 + transition: props.marker.endsWith("-placeholder") ? "none" : transition,
33 + visibility: transform?.scaleY === 0 ? "hidden" : undefined,
34 + }}
35 + >
36 + {props.children}
37 + </li>
38 + );
39 +}
40 +
41 +export function SidebarSectionPlaceholder(props: {
42 + marker: "active-placeholder" | "settled-placeholder";
43 + label: string;
44 + showHint: boolean;
45 + isDropTarget: boolean;
46 +}) {
47 + return (
48 + <SortableSidebarMarker
49 + marker={props.marker}
50 + data-testid={`sidebar-${props.marker}`}
51 + className="relative mx-0.5 -mb-px h-0"
52 + >
53 + {props.showHint ? (
54 + <div
55 + className={cn(
56 + "absolute inset-x-0 top-0 flex h-9 items-center justify-center rounded-md border border-dashed border-sidebar-foreground/25 text-xs text-sidebar-foreground/80",
57 + props.isDropTarget && "border-primary/40 bg-primary/5 text-primary",
58 + )}
59 + >
60 + {props.label}
61 + </div>
62 + ) : null}
63 + </SortableSidebarMarker>
64 + );
65 +}
66 +
67 +export function SidebarDragBoundary(props: {
68 + marker: "pinned-header" | "pinned-divider";
69 + label: string;
70 + visible: boolean;
71 + isDropTarget: boolean;
72 +}) {
73 + return (
74 + <SortableSidebarMarker
75 + marker={props.marker}
76 + data-testid={`sidebar-${props.marker}`}
77 + className="pointer-events-none relative mx-0.5 -mb-px h-0"
78 + >
79 + {props.visible ? (
80 + <div className="sidebar-drag-boundary-label absolute inset-x-2 top-1 flex h-4 items-center gap-2">
81 + <span
82 + className={cn(
83 + "shrink-0 text-xs font-medium",
84 + props.isDropTarget ? "text-primary" : "text-sidebar-foreground/80",
85 + )}
86 + >
87 + {props.label}
88 + </span>
89 + <span
90 + aria-hidden
91 + className={cn(
92 + "h-px flex-1",
93 + props.isDropTarget ? "bg-primary/50" : "bg-sidebar-foreground/25",
94 + )}
95 + />
96 + </div>
97 + ) : null}
98 + </SortableSidebarMarker>
99 + );
100 +}
101 +
102 +export function SidebarSectionHeader(props: {
103 + marker: "working-header" | "snoozed-header" | "settled-header";
104 + label: string;
105 + className?: string;
106 + dragging?: boolean;
107 + isDropTarget?: boolean;
108 + toggle: { expanded: boolean; onToggle: () => void };
109 +}) {
110 + const shelf =
111 + props.marker === "working-header"
112 + ? "working"
113 + : props.marker === "snoozed-header"
114 + ? "snoozed"
115 + : "settled";
116 + const snoozed = shelf === "snoozed";
117 + return (
118 + <SortableSidebarMarker
119 + marker={props.marker}
120 + data-testid={`sidebar-${props.marker}`}
121 + className={cn("mx-0.5 h-8", props.className)}
122 + >
123 + <CollapsibleSectionHeader
124 + onClick={props.toggle.onToggle}
125 + expanded={props.toggle.expanded}
126 + tone={
127 + props.isDropTarget ? "accent" : props.dragging ? "emphasized" : snoozed ? "info" : "muted"
128 + }
129 + data-testid={`sidebar-${shelf}-shelf-toggle`}
130 + >
131 + {props.label}
132 + </CollapsibleSectionHeader>
133 + </SortableSidebarMarker>
134 + );
135 +}