Skip to content

feat: add sidebar session expanders and menu sizing #429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benjaminshafii merged 1 commit into from
Feb 3, 2026
Merged

feat: add sidebar session expanders and menu sizing #429

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 56 additions & 3 deletions packages/app/src/app/components/session/sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export type SidebarProps = {
};

export default function SessionSidebar(props: SidebarProps) {
const MAX_SESSIONS_PREVIEW = 8;
const realTodos = createMemo(() => props.todos.filter((todo) => todo.content.trim()));
const WORKSPACE_COLLAPSE_KEY = "openwork.workspace-collapse.v1";
const readWorkspaceCollapse = () => {
Expand All @@ -69,6 +70,9 @@ export default function SessionSidebar(props: SidebarProps) {
const [collapsedById, setCollapsedById] = createSignal<Record<string, boolean>>(readWorkspaceCollapse());
const [draggingWorkspaceId, setDraggingWorkspaceId] = createSignal<string | null>(null);
const [dragOverWorkspaceId, setDragOverWorkspaceId] = createSignal<string | null>(null);
const [showAllSessionsByWorkspaceId, setShowAllSessionsByWorkspaceId] = createSignal<
Record<string, boolean>
>({});

const workspaceLabel = (workspace: WorkspaceInfo) =>
workspace.displayName?.trim() ||
Expand Down Expand Up @@ -106,6 +110,14 @@ export default function SessionSidebar(props: SidebarProps) {
};

const isWorkspaceCollapsed = (workspaceId: string) => Boolean(collapsedById()[workspaceId]);
const isShowingAllSessions = (workspaceId: string) =>
Boolean(showAllSessionsByWorkspaceId()[workspaceId]);
const toggleShowAllSessions = (workspaceId: string) => {
setShowAllSessionsByWorkspaceId((prev) => ({
...prev,
[workspaceId]: !prev[workspaceId],
}));
};

const handleDragStart = (event: DragEvent, workspaceId: string) => {
event.dataTransfer?.setData("text/plain", workspaceId);
Expand Down Expand Up @@ -162,6 +174,8 @@ export default function SessionSidebar(props: SidebarProps) {
x: number;
y: number;
}>(null);
let contextMenuRef: HTMLDivElement | undefined;
const [contextMenuSize, setContextMenuSize] = createSignal({ width: 188, height: 96 });

const closeContextMenu = () => setContextMenu(null);

Expand All @@ -174,8 +188,9 @@ export default function SessionSidebar(props: SidebarProps) {
const contextMenuStyle = createMemo(() => {
const menu = contextMenu();
if (!menu) return undefined;
const width = 188;
const height = 96;
const size = contextMenuSize();
const width = size.width;
const height = size.height;
if (typeof window === "undefined") {
return { left: `${menu.x}px`, top: `${menu.y}px` };
}
Expand Down Expand Up @@ -214,6 +229,28 @@ export default function SessionSidebar(props: SidebarProps) {
writeWorkspaceCollapse(next);
return next;
});
setShowAllSessionsByWorkspaceId((prev) => {
const next: Record<string, boolean> = {};
let changed = false;
for (const [id, value] of Object.entries(prev)) {
if (ids.has(id)) {
next[id] = value;
} else {
changed = true;
}
}
return changed ? next : prev;
});
});

createEffect(() => {
if (!contextMenu()) return;
queueMicrotask(() => {
if (!contextMenuRef || typeof window === "undefined") return;
const rect = contextMenuRef.getBoundingClientRect();
if (!rect.width || !rect.height) return;
setContextMenuSize({ width: rect.width, height: rect.height });
});
});

return (
Expand Down Expand Up @@ -253,6 +290,10 @@ export default function SessionSidebar(props: SidebarProps) {
const allowActions = () => !props.connectingWorkspaceId || isConnecting();
const collapsed = () => isWorkspaceCollapsed(group.workspace.id);
const dragOver = () => dragOverWorkspaceId() === group.workspace.id;
const showingAll = () => isShowingAllSessions(group.workspace.id);
const visibleSessions = () =>
showingAll() ? sessions() : sessions().slice(0, MAX_SESSIONS_PREVIEW);
const hasMoreSessions = () => sessions().length > MAX_SESSIONS_PREVIEW;

return (
<div
Expand Down Expand Up @@ -345,7 +386,7 @@ export default function SessionSidebar(props: SidebarProps) {
</div>
}
>
<For each={sessions().slice(0, 8)}>
<For each={visibleSessions()}>
{(session) => (
<button
class={`w-full text-left px-3 py-2 rounded-lg text-sm transition-colors ${
Expand Down Expand Up @@ -391,6 +432,17 @@ export default function SessionSidebar(props: SidebarProps) {
</button>
)}
</For>
<Show when={hasMoreSessions()}>
<button
type="button"
class="w-full px-3 py-2 rounded-lg text-xs text-gray-9 hover:text-gray-12 hover:bg-gray-2 transition-colors"
onClick={() => toggleShowAllSessions(group.workspace.id)}
>
{showingAll()
? "Show fewer"
: `Show ${sessions().length - MAX_SESSIONS_PREVIEW} more`}
</button>
</Show>
</Show>
</div>
</Show>
Expand Down Expand Up @@ -469,6 +521,7 @@ export default function SessionSidebar(props: SidebarProps) {
style={contextMenuStyle()}
role="menu"
onClick={(event) => event.stopPropagation()}
ref={(el) => (contextMenuRef = el)}
>
<button
class="w-full text-left px-3 py-2 text-sm rounded-lg text-gray-12 hover:bg-gray-2 transition-colors"
Expand Down
Loading