Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

Fix project drag clicks and sidebar collapse/scroll behavior

Julius Marmingea6b22ec1c9b2
diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsx
index 447307965..914480d07 100644
--- a/apps/web/src/components/Sidebar.tsx
+++ b/apps/web/src/components/Sidebar.tsx
@@ -61,6 +61,7 @@ import {
} from "./desktopUpdate.logic";
import { Alert, AlertAction, AlertDescription, AlertTitle } from "./ui/alert";
import { Button } from "./ui/button";
+import { Collapsible, CollapsibleContent } from "./ui/collapsible";
import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip";
import {
SidebarContent,
@@ -231,18 +232,20 @@ function SortableProjectItem({
const { attributes, listeners, setNodeRef, transform, transition, isDragging, isOver } =
useSortable({ id: projectId });
return (
- <div
+ <li
ref={setNodeRef}
style={{
transform: CSS.Translate.toString(transform),
transition,
}}
- className={`rounded-md ${
+ className={`group/menu-item relative rounded-md ${
isDragging ? "z-20 opacity-80" : ""
} ${isOver && !isDragging ? "ring-1 ring-primary/40" : ""}`}
+ data-sidebar="menu-item"
+ data-slot="sidebar-menu-item"
>
{children({ attributes, listeners })}
- </div>
+ </li>
);
}
@@ -294,14 +297,7 @@ export default function Sidebar() {
const renamingCommittedRef = useRef(false);
const renamingInputRef = useRef<HTMLInputElement | null>(null);
const dragInProgressRef = useRef(false);
- const suppressProjectClickFromGestureRef = useRef(false);
- const suppressProjectClickResetTimerRef = useRef<number | null>(null);
- const projectTitlePointerRef = useRef<{
- pointerId: number;
- startX: number;
- startY: number;
- moved: boolean;
- } | null>(null);
+ const suppressProjectClickAfterDragRef = useRef(false);
const [desktopUpdateState, setDesktopUpdateState] = useState<DesktopUpdateState | null>(null);
const shouldBrowseForProjectImmediately = isElectron;
const shouldShowProjectPathEntry = addingProject && !shouldBrowseForProjectImmediately;
@@ -861,64 +857,20 @@ export default function Sidebar() {
const handleProjectDragStart = useCallback((_event: DragStartEvent) => {
dragInProgressRef.current = true;
+ suppressProjectClickAfterDragRef.current = true;
}, []);
const handleProjectDragCancel = useCallback((_event: DragCancelEvent) => {
dragInProgressRef.current = false;
}, []);
- const handleProjectTitlePointerDownCapture = useCallback(
- (event: React.PointerEvent<HTMLButtonElement>) => {
- projectTitlePointerRef.current = {
- pointerId: event.pointerId,
- startX: event.clientX,
- startY: event.clientY,
- moved: false,
- };
- },
- [],
- );
-
- const handleProjectTitlePointerMoveCapture = useCallback(
- (event: React.PointerEvent<HTMLButtonElement>) => {
- const pointer = projectTitlePointerRef.current;
- if (!pointer || pointer.pointerId !== event.pointerId) return;
- const movedX = Math.abs(event.clientX - pointer.startX);
- const movedY = Math.abs(event.clientY - pointer.startY);
- if (movedX > 3 || movedY > 3) {
- pointer.moved = true;
- }
- },
- [],
- );
-
- const handleProjectTitlePointerUpCapture = useCallback(
- (event: React.PointerEvent<HTMLButtonElement>) => {
- const pointer = projectTitlePointerRef.current;
- if (pointer?.pointerId === event.pointerId) {
- if (pointer.moved) {
- suppressProjectClickFromGestureRef.current = true;
- if (suppressProjectClickResetTimerRef.current !== null) {
- window.clearTimeout(suppressProjectClickResetTimerRef.current);
- }
- suppressProjectClickResetTimerRef.current = window.setTimeout(() => {
- suppressProjectClickFromGestureRef.current = false;
- suppressProjectClickResetTimerRef.current = null;
- }, 0);
- }
- projectTitlePointerRef.current = null;
- }
- },
- [],
- );
-
- const handleProjectTitlePointerCancelCapture = useCallback(() => {
- projectTitlePointerRef.current = null;
+ const handleProjectTitlePointerDownCapture = useCallback(() => {
+ suppressProjectClickAfterDragRef.current = false;
}, []);
const handleProjectTitleClick = useCallback(
(event: React.MouseEvent<HTMLButtonElement>, projectId: ProjectId) => {
- if (dragInProgressRef.current || suppressProjectClickFromGestureRef.current) {
+ if (dragInProgressRef.current || suppressProjectClickAfterDragRef.current) {
event.preventDefault();
event.stopPropagation();
return;
@@ -940,14 +892,6 @@ export default function Sidebar() {
[toggleProject],
);
- useEffect(() => {
- return () => {
- if (suppressProjectClickResetTimerRef.current !== null) {
- window.clearTimeout(suppressProjectClickResetTimerRef.current);
- }
- };
- }, []);
-
useEffect(() => {
const onWindowKeyDown = (event: KeyboardEvent) => {
const activeThread = routeThreadId
@@ -1318,7 +1262,10 @@ export default function Sidebar() {
return (
<SortableProjectItem key={project.id} projectId={project.id}>
{(dragHandleProps) => (
- <SidebarMenuItem className="group/collapsible">
+ <Collapsible
+ className="group/collapsible"
+ open={project.expanded}
+ >
<div className="group/project-header relative">
<SidebarMenuButton
size="sm"
@@ -1326,9 +1273,6 @@ export default function Sidebar() {
{...dragHandleProps.attributes}
{...dragHandleProps.listeners}
onPointerDownCapture={handleProjectTitlePointerDownCapture}
- onPointerMoveCapture={handleProjectTitlePointerMoveCapture}
- onPointerUpCapture={handleProjectTitlePointerUpCapture}
- onPointerCancelCapture={handleProjectTitlePointerCancelCapture}
onClick={(event) => handleProjectTitleClick(event, project.id)}
onKeyDown={(event) => handleProjectTitleKeyDown(event, project.id)}
onContextMenu={(event) => {
@@ -1379,15 +1323,8 @@ export default function Sidebar() {
</Tooltip>
</div>
- <div
- className={`grid transition-[grid-template-rows,opacity] duration-200 ease-out ${
- project.expanded
- ? "grid-rows-[1fr] opacity-100"
- : "pointer-events-none grid-rows-[0fr] opacity-0"
- }`}
- >
- <div className="min-h-0 overflow-hidden">
- <SidebarMenuSub className="mx-1 my-0 w-full translate-x-0 gap-0 px-1.5 py-0">
+ <CollapsibleContent keepMounted>
+ <SidebarMenuSub className="mx-1 my-0 w-full translate-x-0 gap-0 px-1.5 py-0">
{visibleThreads.map((thread) => {
const isActive = routeThreadId === thread.id;
const threadStatus = resolveThreadStatusPill({
@@ -1558,9 +1495,8 @@ export default function Sidebar() {
</SidebarMenuSubItem>
)}
</SidebarMenuSub>
- </div>
- </div>
- </SidebarMenuItem>
+ </CollapsibleContent>
+ </Collapsible>
)}
</SortableProjectItem>
);
diff --git a/apps/web/src/components/ui/collapsible.tsx b/apps/web/src/components/ui/collapsible.tsx
index 180d0a95b..e5f3db03c 100644
--- a/apps/web/src/components/ui/collapsible.tsx
+++ b/apps/web/src/components/ui/collapsible.tsx
@@ -22,7 +22,7 @@ function CollapsiblePanel({ className, ...props }: CollapsiblePrimitive.Panel.Pr
return (
<CollapsiblePrimitive.Panel
className={cn(
- "h-(--collapsible-panel-height) overflow-hidden transition-[height] duration-200 data-ending-style:h-0 data-starting-style:h-0",
+ "h-(--collapsible-panel-height) overflow-hidden transition-[height] duration-200 data-ending-style:h-0 data-starting-style:h-0 data-open:data-ending-style:[height:var(--collapsible-panel-height)]",
className,
)}
data-slot="collapsible-panel"
diff --git a/apps/web/src/components/ui/scroll-area.tsx b/apps/web/src/components/ui/scroll-area.tsx
index 0d28d9593..f8d2670b2 100644
--- a/apps/web/src/components/ui/scroll-area.tsx
+++ b/apps/web/src/components/ui/scroll-area.tsx
@@ -9,10 +9,12 @@ function ScrollArea({
children,
scrollFade = false,
scrollbarGutter = false,
+ hideScrollbars = false,
...props
}: ScrollAreaPrimitive.Root.Props & {
scrollFade?: boolean;
scrollbarGutter?: boolean;
+ hideScrollbars?: boolean;
}) {
return (
<ScrollAreaPrimitive.Root className={cn("size-full min-h-0", className)} {...props}>
@@ -22,14 +24,19 @@ function ScrollArea({
scrollFade &&
"mask-t-from-[calc(100%-min(var(--fade-size),var(--scroll-area-overflow-y-start)))] mask-b-from-[calc(100%-min(var(--fade-size),var(--scroll-area-overflow-y-end)))] mask-l-from-[calc(100%-min(var(--fade-size),var(--scroll-area-overflow-x-start)))] mask-r-from-[calc(100%-min(var(--fade-size),var(--scroll-area-overflow-x-end)))] [--fade-size:1.5rem]",
scrollbarGutter && "data-has-overflow-y:pe-2.5 data-has-overflow-x:pb-2.5",
+ hideScrollbars && "[-ms-overflow-style:none] [scrollbar-width:none] [&::-webkit-scrollbar]:hidden",
)}
data-slot="scroll-area-viewport"
>
{children}
</ScrollAreaPrimitive.Viewport>
- <ScrollBar orientation="vertical" />
- <ScrollBar orientation="horizontal" />
- <ScrollAreaPrimitive.Corner data-slot="scroll-area-corner" />
+ {!hideScrollbars && (
+ <>
+ <ScrollBar orientation="vertical" />
+ <ScrollBar orientation="horizontal" />
+ <ScrollAreaPrimitive.Corner data-slot="scroll-area-corner" />
+ </>
+ )}
</ScrollAreaPrimitive.Root>
);
}
diff --git a/apps/web/src/components/ui/sidebar.tsx b/apps/web/src/components/ui/sidebar.tsx
index 16b9ec4ed..3876d3513 100644
--- a/apps/web/src/components/ui/sidebar.tsx
+++ b/apps/web/src/components/ui/sidebar.tsx
@@ -651,10 +651,10 @@ function SidebarSeparator({ className, ...props }: React.ComponentProps<typeof S
function SidebarContent({ className, ...props }: React.ComponentProps<"div">) {
return (
- <ScrollArea className="**:data-[slot=scroll-area-scrollbar]:hidden" scrollFade>
+ <ScrollArea hideScrollbars scrollFade className="h-auto min-h-0 flex-1">
<div
className={cn(
- "flex min-h-0 flex-1 flex-col gap-2 overflow-auto group-data-[collapsible=icon]:overflow-hidden",
+ "flex w-full min-w-0 flex-col gap-2 group-data-[collapsible=icon]:overflow-hidden",
className,
)}
data-sidebar="content"