Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Simplify sidebar and some layout improvements

Hakan Shehuba12969aff2a
diff --git a/apps/desktop/src/renderer/components/databases/database-views.tsx b/apps/desktop/src/renderer/components/databases/database-views.tsx
index 1f519f5d..3ea1ab4a 100644
--- a/apps/desktop/src/renderer/components/databases/database-views.tsx
+++ b/apps/desktop/src/renderer/components/databases/database-views.tsx
@@ -1,7 +1,8 @@
import React from 'react';
+import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area';
import { View } from '@/renderer/components/databases/view';
-import { ScrollArea } from '@/renderer/components/ui/scroll-area';
+import { ScrollBar } from '@/renderer/components/ui/scroll-area';
import { useDatabase } from '@/renderer/contexts/database';
import { DatabaseViewsContext } from '@/renderer/contexts/database-views';
@@ -22,9 +23,16 @@ export const DatabaseViews = () => {
<DatabaseViewsContext.Provider
value={{ views: database.views, activeViewId, setActiveViewId }}
>
- <ScrollArea className="group/database h-full max-h-full w-full overflow-y-auto px-10 pb-12">
- {activeView && <View view={activeView} />}
- </ScrollArea>
+ <div className="h-full w-full overflow-y-auto">
+ <ScrollAreaPrimitive.Root className="relative overflow-hidden">
+ <ScrollAreaPrimitive.Viewport className="group/database h-full max-h-[calc(100vh-130px)] w-full overflow-y-auto rounded-[inherit] px-10 pb-12">
+ {activeView && <View view={activeView} />}
+ </ScrollAreaPrimitive.Viewport>
+ <ScrollBar orientation="horizontal" />
+ <ScrollBar orientation="vertical" />
+ <ScrollAreaPrimitive.Corner />
+ </ScrollAreaPrimitive.Root>
+ </div>
</DatabaseViewsContext.Provider>
);
};
diff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar-chats.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar-chats.tsx
index 48c891ef..89350870 100644
--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar-chats.tsx
+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar-chats.tsx
@@ -2,16 +2,9 @@ import { ChatNode } from '@colanode/core';
import { ChatCreatePopover } from '@/renderer/components/chats/chat-create-popover';
import { ChatSidebarItem } from '@/renderer/components/chats/chat-sidebar-item';
-import {
- SidebarGroup,
- SidebarGroupAction,
- SidebarGroupLabel,
- SidebarMenu,
- SidebarMenuButton,
- SidebarMenuItem,
-} from '@/renderer/components/ui/sidebar';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useQuery } from '@/renderer/hooks/use-query';
+import { cn } from '@/shared/lib/utils';
export const LayoutSidebarChats = () => {
const workspace = useWorkspace();
@@ -26,26 +19,32 @@ export const LayoutSidebarChats = () => {
const chats = data?.map((node) => node as ChatNode) ?? [];
return (
- <SidebarGroup className="group/sidebar-chats group-data-[collapsible=icon]:hidden">
- <SidebarGroupLabel>Chats</SidebarGroupLabel>
- <SidebarGroupAction className="text-muted-foreground opacity-0 transition-opacity group-hover/sidebar-chats:opacity-100">
- <ChatCreatePopover />
- </SidebarGroupAction>
- <SidebarMenu>
+ <div className="group/sidebar-chats flex w-full min-w-0 flex-col p-2">
+ <div className="flex items-center justify-between">
+ <div className="flex h-8 shrink-0 items-center rounded-md px-2 text-xs font-medium text-sidebar-foreground/70">
+ Chats
+ </div>
+ <div className="text-muted-foreground opacity-0 transition-opacity group-hover/sidebar-spaces:opacity-100 flex items-center justify-center p-0">
+ <ChatCreatePopover />
+ </div>
+ </div>
+ <div className="flex w-full min-w-0 flex-col gap-1">
{chats.map((item) => (
- <SidebarMenuItem key={item.id}>
- <SidebarMenuButton
- className="p-1 px-2 h-7"
- isActive={workspace.isNodeActive(item.id)}
- onClick={() => {
- workspace.openInMain(item.id);
- }}
- >
- <ChatSidebarItem node={item} />
- </SidebarMenuButton>
- </SidebarMenuItem>
+ <button
+ key={item.id}
+ className={cn(
+ 'px-2 flex w-full items-center gap-2 overflow-hidden rounded-md text-left text-sm hover:bg-sidebar-accent hover:text-sidebar-accent-foreground h-7',
+ workspace.isNodeActive(item.id) &&
+ 'bg-sidebar-accent text-sidebar-accent-foreground font-medium'
+ )}
+ onClick={() => {
+ workspace.openInMain(item.id);
+ }}
+ >
+ <ChatSidebarItem node={item} />
+ </button>
))}
- </SidebarMenu>
- </SidebarGroup>
+ </div>
+ </div>
);
};
diff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx
index 3ed81238..624397d8 100644
--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx
+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx
@@ -12,11 +12,6 @@ import {
DropdownMenuSeparator,
DropdownMenuTrigger,
} from '@/renderer/components/ui/dropdown-menu';
-import {
- SidebarMenu,
- SidebarMenuButton,
- SidebarMenuItem,
-} from '@/renderer/components/ui/sidebar';
import { AccountContext, useAccount } from '@/renderer/contexts/account';
import { useRadar } from '@/renderer/contexts/radar';
import { useQuery } from '@/renderer/hooks/use-query';
@@ -48,14 +43,35 @@ export function LayoutSidebarFooter() {
);
return (
- <SidebarMenu>
- <SidebarMenuItem>
- <DropdownMenu open={open} onOpenChange={setOpen}>
- <DropdownMenuTrigger asChild>
- <SidebarMenuButton
- size="lg"
- className="data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground"
- >
+ <div className="p-2">
+ <DropdownMenu open={open} onOpenChange={setOpen}>
+ <DropdownMenuTrigger asChild>
+ <button className="flex w-full items-center gap-2 rounded-md p-2 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground active:bg-sidebar-accent active:text-sidebar-accent-foreground h-12 text-sm focus-visible:outline-none focus-visible:ring-0">
+ <Avatar
+ className="h-8 w-8 rounded-lg"
+ id={account.id}
+ name={account.name}
+ avatar={account.avatar}
+ />
+ <div className="grid flex-1 text-left text-sm leading-tight">
+ <span className="truncate font-semibold">{account.name}</span>
+ <span className="truncate text-xs">{account.email}</span>
+ </div>
+ <ChevronsUpDown className="ml-auto size-4" />
+ <ReadStateIndicator
+ count={importantCount}
+ hasChanges={hasUnseenChanges}
+ />
+ </button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent
+ className="w-[--radix-dropdown-menu-trigger-width] min-w-80 rounded-lg"
+ side="right"
+ align="end"
+ sideOffset={4}
+ >
+ <DropdownMenuItem key={account.id} className="p-0">
+ <div className="w-full flex items-center gap-2 px-1 py-1.5 text-left text-sm">
<Avatar
className="h-8 w-8 rounded-lg"
id={account.id}
@@ -66,121 +82,95 @@ export function LayoutSidebarFooter() {
<span className="truncate font-semibold">{account.name}</span>
<span className="truncate text-xs">{account.email}</span>
</div>
- <ChevronsUpDown className="ml-auto size-4" />
- <ReadStateIndicator
- count={importantCount}
- hasChanges={hasUnseenChanges}
- />
- </SidebarMenuButton>
- </DropdownMenuTrigger>
- <DropdownMenuContent
- className="w-[--radix-dropdown-menu-trigger-width] min-w-80 rounded-lg"
- side="right"
- align="end"
- sideOffset={4}
+ </div>
+ </DropdownMenuItem>
+ <DropdownMenuSeparator />
+ <DropdownMenuItem
+ className="gap-2 p-2"
+ onClick={() => {
+ account.openSettings();
+ }}
>
- <DropdownMenuItem key={account.id} className="p-0">
- <div className="w-full flex items-center gap-2 px-1 py-1.5 text-left text-sm">
- <Avatar
- className="h-8 w-8 rounded-lg"
- id={account.id}
- name={account.name}
- avatar={account.avatar}
- />
- <div className="grid flex-1 text-left text-sm leading-tight">
- <span className="truncate font-semibold">{account.name}</span>
- <span className="truncate text-xs">{account.email}</span>
- </div>
- </div>
- </DropdownMenuItem>
- <DropdownMenuSeparator />
- <DropdownMenuItem
- className="gap-2 p-2"
- onClick={() => {
- account.openSettings();
- }}
- >
- <Settings className="size-4" />
- <p className="font-medium">Settings</p>
- </DropdownMenuItem>
- <DropdownMenuItem
- className="gap-2 p-2"
- onClick={() => {
- account.openLogout();
- }}
- >
- <LogOut className="size-4" />
- <p className="font-medium">Logout</p>
- </DropdownMenuItem>
- {otherAccounts.length > 0 && (
- <React.Fragment>
- <DropdownMenuSeparator />
- <DropdownMenuLabel className="mb-1">Accounts</DropdownMenuLabel>
- {accounts.map((accountItem) => {
- const state = accountStates[accountItem.id] ?? {
- importantCount: 0,
- hasUnseenChanges: false,
- };
+ <Settings className="size-4" />
+ <p className="font-medium">Settings</p>
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ className="gap-2 p-2"
+ onClick={() => {
+ account.openLogout();
+ }}
+ >
+ <LogOut className="size-4" />
+ <p className="font-medium">Logout</p>
+ </DropdownMenuItem>
+ {otherAccounts.length > 0 && (
+ <React.Fragment>
+ <DropdownMenuSeparator />
+ <DropdownMenuLabel className="mb-1">Accounts</DropdownMenuLabel>
+ {accounts.map((accountItem) => {
+ const state = accountStates[accountItem.id] ?? {
+ importantCount: 0,
+ hasUnseenChanges: false,
+ };
- return (
- <DropdownMenuItem
- key={accountItem.id}
- className="p-0"
- onClick={() => {
- navigate(`/${accountItem.id}`);
+ return (
+ <DropdownMenuItem
+ key={accountItem.id}
+ className="p-0"
+ onClick={() => {
+ navigate(`/${accountItem.id}`);
+ }}
+ >
+ <AccountContext.Provider
+ value={{
+ ...accountItem,
+ openSettings: () => {},
+ openLogout: () => {},
}}
>
- <AccountContext.Provider
- value={{
- ...accountItem,
- openSettings: () => {},
- openLogout: () => {},
- }}
- >
- <div className="w-full flex items-center gap-2 px-1 py-1.5 text-left text-sm">
- <Avatar
- className="h-8 w-8 rounded-lg"
- id={accountItem.id}
- name={accountItem.name}
- avatar={accountItem.avatar}
- />
- <div className="grid flex-1 text-left text-sm leading-tight">
- <span className="truncate font-semibold">
- {accountItem.name}
- </span>
- <span className="truncate text-xs">
- {accountItem.email}
- </span>
- </div>
- {accountItem.id === account.id ? (
- <Check className="size-4" />
- ) : (
- <ReadStateIndicator
- count={state.importantCount}
- hasChanges={state.hasUnseenChanges}
- />
- )}
+ <div className="w-full flex items-center gap-2 px-1 py-1.5 text-left text-sm">
+ <Avatar
+ className="h-8 w-8 rounded-lg"
+ id={accountItem.id}
+ name={accountItem.name}
+ avatar={accountItem.avatar}
+ />
+ <div className="grid flex-1 text-left text-sm leading-tight">
+ <span className="truncate font-semibold">
+ {accountItem.name}
+ </span>
+ <span className="truncate text-xs">
+ {accountItem.email}
+ </span>
</div>
- </AccountContext.Provider>
- </DropdownMenuItem>
- );
- })}
- </React.Fragment>
- )}
+ {accountItem.id === account.id ? (
+ <Check className="size-4" />
+ ) : (
+ <ReadStateIndicator
+ count={state.importantCount}
+ hasChanges={state.hasUnseenChanges}
+ />
+ )}
+ </div>
+ </AccountContext.Provider>
+ </DropdownMenuItem>
+ );
+ })}
+ </React.Fragment>
+ )}
- <DropdownMenuSeparator className="my-1" />
- <DropdownMenuItem
- className="flex items-center gap-2 text-muted-foreground hover:text-foreground"
- onClick={() => {
- navigate(`/login`);
- }}
- >
- <Plus className="size-4" />
- <p className="font-medium">Add account</p>
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
- </SidebarMenuItem>
- </SidebarMenu>
+ <DropdownMenuSeparator className="my-1" />
+ <DropdownMenuItem
+ className="flex items-center gap-2 text-muted-foreground hover:text-foreground"
+ onClick={() => {
+ navigate(`/login`);
+ }}
+ >
+ <Plus className="size-4" />
+ <p className="font-medium">Add account</p>
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ </div>
);
}
diff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx
index 5b37792c..e2333442 100644
--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx
+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx
@@ -1,4 +1,4 @@
-import { Bell, Check,ChevronsUpDown, Plus, Settings } from 'lucide-react';
+import { Bell, Check, ChevronsUpDown, Plus, Settings } from 'lucide-react';
import React from 'react';
import { useNavigate } from 'react-router-dom';
@@ -12,11 +12,6 @@ import {
DropdownMenuSeparator,
DropdownMenuTrigger,
} from '@/renderer/components/ui/dropdown-menu';
-import {
- SidebarMenu,
- SidebarMenuButton,
- SidebarMenuItem,
-} from '@/renderer/components/ui/sidebar';
import { useAccount } from '@/renderer/contexts/account';
import { useRadar } from '@/renderer/contexts/radar';
import { useWorkspace } from '@/renderer/contexts/workspace';
@@ -46,121 +41,114 @@ export const LayoutSidebarHeader = () => {
const hasUnseenChanges = otherWorkspaceStates.some((w) => w.hasUnseenChanges);
return (
- <SidebarMenu>
- <SidebarMenuItem>
- <DropdownMenu open={open} onOpenChange={setOpen}>
- <DropdownMenuTrigger asChild>
- <SidebarMenuButton
- size="lg"
- className="focus-visible:outline-none focus-visible:ring-0 data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground"
- >
- <div className="flex aspect-square size-8 items-center justify-center rounded-lg bg-sidebar-primary text-sidebar-primary-foreground">
- <Avatar
- id={workspace.id}
- avatar={workspace.avatar}
- name={workspace.name}
- className="h-full w-full"
- />
- </div>
- <div className="grid flex-1 text-left text-sm leading-tight">
- <span className="truncate font-semibold">{workspace.name}</span>
- <span className="truncate text-xs">Free Plan</span>
- </div>
- <ChevronsUpDown className="ml-auto size-4" />
- <ReadStateIndicator
- count={importantCount}
- hasChanges={hasUnseenChanges}
+ <div className="p-2">
+ <DropdownMenu open={open} onOpenChange={setOpen}>
+ <DropdownMenuTrigger asChild>
+ <button className="flex w-full items-center gap-2 rounded-md p-2 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground active:bg-sidebar-accent active:text-sidebar-accent-foreground h-12 text-sm focus-visible:outline-none focus-visible:ring-0">
+ <div className="flex aspect-square size-8 items-center justify-center rounded-lg bg-sidebar-primary text-sidebar-primary-foreground">
+ <Avatar
+ id={workspace.id}
+ avatar={workspace.avatar}
+ name={workspace.name}
+ className="h-full w-full"
+ />
+ </div>
+ <div className="grid flex-1 text-left text-sm leading-tight">
+ <span className="truncate font-semibold">{workspace.name}</span>
+ <span className="truncate text-xs">Free Plan</span>
+ </div>
+ <ChevronsUpDown className="ml-auto size-4" />
+ <ReadStateIndicator
+ count={importantCount}
+ hasChanges={hasUnseenChanges}
+ />
+ </button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent
+ className="min-w-80 rounded-lg"
+ align="start"
+ side="right"
+ sideOffset={4}
+ >
+ <DropdownMenuItem key={workspace.id} className="p-0">
+ <div className="w-full flex items-center gap-2 px-1 py-1.5 text-left text-sm">
+ <Avatar
+ className="h-8 w-8 rounded-lg"
+ id={workspace.id}
+ name={workspace.name}
+ avatar={workspace.avatar}
/>
- </SidebarMenuButton>
- </DropdownMenuTrigger>
- <DropdownMenuContent
- className="w-[--radix-dropdown-menu-trigger-width] min-w-80 rounded-lg"
- align="start"
- side="right"
- sideOffset={4}
+ <p className="flex-1 text-left text-sm leading-tight truncate font-semibold">
+ {workspace.name}
+ </p>
+ </div>
+ </DropdownMenuItem>
+ <DropdownMenuSeparator />
+ <DropdownMenuItem
+ className="gap-2 p-2"
+ onClick={() => {
+ workspace.openSettings();
+ }}
>
- <DropdownMenuItem key={workspace.id} className="p-0">
- <div className="w-full flex items-center gap-2 px-1 py-1.5 text-left text-sm">
- <Avatar
- className="h-8 w-8 rounded-lg"
- id={workspace.id}
- name={workspace.name}
- avatar={workspace.avatar}
- />
- <p className="flex-1 text-left text-sm leading-tight truncate font-semibold">
- {workspace.name}
- </p>
- </div>
- </DropdownMenuItem>
- <DropdownMenuSeparator />
- <DropdownMenuItem
- className="gap-2 p-2"
- onClick={() => {
- workspace.openSettings();
- }}
- >
- <Settings className="size-4" />
- <p className="font-medium">Settings</p>
- </DropdownMenuItem>
- <DropdownMenuItem className="gap-2 p-2" disabled={true}>
- <Bell className="size-4" />
- <p className="font-medium">Notifications</p>
- </DropdownMenuItem>
- {otherWorkspaces.length > 0 && (
- <React.Fragment>
- <DropdownMenuSeparator />
- <DropdownMenuLabel className="mb-1">
- Workspaces
- </DropdownMenuLabel>
- {workspaces.map((workspaceItem) => {
- const workspaceState = radar.getWorkspaceState(
- workspaceItem.userId
- );
- return (
- <DropdownMenuItem
- key={workspaceItem.id}
- className="p-0"
- onClick={() => {
- navigate(`/${account.id}/${workspaceItem.id}`);
- }}
- >
- <div className="w-full flex items-center gap-2 px-1 py-1.5 text-left text-sm">
- <Avatar
- className="h-8 w-8 rounded-lg"
- id={workspaceItem.id}
- name={workspaceItem.name}
- avatar={workspaceItem.avatar}
+ <Settings className="size-4" />
+ <p className="font-medium">Settings</p>
+ </DropdownMenuItem>
+ <DropdownMenuItem className="gap-2 p-2" disabled={true}>
+ <Bell className="size-4" />
+ <p className="font-medium">Notifications</p>
+ </DropdownMenuItem>
+ {otherWorkspaces.length > 0 && (
+ <React.Fragment>
+ <DropdownMenuSeparator />
+ <DropdownMenuLabel className="mb-1">Workspaces</DropdownMenuLabel>
+ {workspaces.map((workspaceItem) => {
+ const workspaceState = radar.getWorkspaceState(
+ workspaceItem.userId
+ );
+ return (
+ <DropdownMenuItem
+ key={workspaceItem.id}
+ className="p-0"
+ onClick={() => {
+ navigate(`/${account.id}/${workspaceItem.id}`);
+ }}
+ >
+ <div className="w-full flex items-center gap-2 px-1 py-1.5 text-left text-sm">
+ <Avatar
+ className="h-8 w-8 rounded-lg"
+ id={workspaceItem.id}
+ name={workspaceItem.name}
+ avatar={workspaceItem.avatar}
+ />
+ <p className="flex-1 text-left text-sm leading-tight truncate font-normal">
+ {workspaceItem.name}
+ </p>
+ {workspaceItem.id === workspace.id ? (
+ <Check className="size-4" />
+ ) : (
+ <ReadStateIndicator
+ count={workspaceState.importantCount}
+ hasChanges={workspaceState.hasUnseenChanges}
/>
- <p className="flex-1 text-left text-sm leading-tight truncate font-normal">
- {workspaceItem.name}
- </p>
- {workspaceItem.id === workspace.id ? (
- <Check className="size-4" />
- ) : (
- <ReadStateIndicator
- count={workspaceState.importantCount}
- hasChanges={workspaceState.hasUnseenChanges}
- />
- )}
- </div>
- </DropdownMenuItem>
- );
- })}
- </React.Fragment>
- )}
- <DropdownMenuSeparator className="my-1" />
- <DropdownMenuItem
- className="gap-2 p-2 text-muted-foreground hover:text-foreground"
- onClick={() => {
- navigate(`/${account.id}/create`);
- }}
- >
- <Plus className="size-4" />
- <p className="font-medium">Create workspace</p>
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
- </SidebarMenuItem>
- </SidebarMenu>
+ )}
+ </div>
+ </DropdownMenuItem>
+ );
+ })}
+ </React.Fragment>
+ )}
+ <DropdownMenuSeparator className="my-1" />
+ <DropdownMenuItem
+ className="gap-2 p-2 text-muted-foreground hover:text-foreground"
+ onClick={() => {
+ navigate(`/${account.id}/create`);
+ }}
+ >
+ <Plus className="size-4" />
+ <p className="font-medium">Create workspace</p>
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ </div>
);
};
diff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar-spaces.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar-spaces.tsx
index e1704449..e9f70a95 100644
--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar-spaces.tsx
+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar-spaces.tsx
@@ -2,12 +2,6 @@ import { SpaceNode } from '@colanode/core';
import { SpaceCreateButton } from '@/renderer/components/spaces/space-create-button';
import { SpaceSidebarItem } from '@/renderer/components/spaces/space-sidebar-item';
-import {
- SidebarGroup,
- SidebarGroupAction,
- SidebarGroupLabel,
- SidebarMenu,
-} from '@/renderer/components/ui/sidebar';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useQuery } from '@/renderer/hooks/use-query';
@@ -26,18 +20,23 @@ export const LayoutSidebarSpaces = () => {
const spaces = data?.map((node) => node as SpaceNode) ?? [];
return (
- <SidebarGroup className="group/sidebar-spaces">
- <SidebarGroupLabel>Spaces</SidebarGroupLabel>
- {canCreateSpace && (
- <SidebarGroupAction className="text-muted-foreground opacity-0 transition-opacity group-hover/sidebar-spaces:opacity-100">
- <SpaceCreateButton />
- </SidebarGroupAction>
- )}
- <SidebarMenu>
+ <div className="group/sidebar-spaces flex w-full min-w-0 flex-col p-2">
+ <div className="flex items-center justify-between">
+ <div className="flex h-8 shrink-0 items-center rounded-md px-2 text-xs font-medium text-sidebar-foreground/70">
+ Spaces
+ </div>
+ {canCreateSpace && (
+ <div className="text-muted-foreground opacity-0 transition-opacity group-hover/sidebar-spaces:opacity-100 flex items-center justify-center p-0">
+ <SpaceCreateButton />
+ </div>
+ )}
+ </div>
+
+ <div className="flex w-full min-w-0 flex-col gap-1">
{spaces.map((space) => (
<SpaceSidebarItem node={space} key={space.id} />
))}
- </SidebarMenu>
- </SidebarGroup>
+ </div>
+ </div>
);
};
diff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar.tsx
index f38ef026..c3669300 100644
--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar.tsx
+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar.tsx
@@ -2,28 +2,16 @@ import { LayoutSidebarChats } from '@/renderer/components/layouts/layout-sidebar
import { LayoutSidebarFooter } from '@/renderer/components/layouts/layout-sidebar-footer';
import { LayoutSidebarHeader } from '@/renderer/components/layouts/layout-sidebar-header';
import { LayoutSidebarSpaces } from '@/renderer/components/layouts/layout-sidebar-spaces';
-import {
- Sidebar,
- SidebarContent,
- SidebarFooter,
- SidebarHeader,
- SidebarRail,
-} from '@/renderer/components/ui/sidebar';
export const LayoutSidebar = () => {
return (
- <Sidebar collapsible="icon">
- <SidebarHeader>
- <LayoutSidebarHeader />
- </SidebarHeader>
- <SidebarContent>
+ <div className="flex h-screen min-h-screen max-h-screen w-64 min-w-64 flex-col bg-sidebar text-sidebar-foreground">
+ <LayoutSidebarHeader />
+ <div className="flex min-h-0 flex-1 flex-col gap-2 overflow-auto">
<LayoutSidebarSpaces />
<LayoutSidebarChats />
- </SidebarContent>
- <SidebarFooter>
- <LayoutSidebarFooter />
- </SidebarFooter>
- <SidebarRail />
- </Sidebar>
+ </div>
+ <LayoutSidebarFooter />
+ </div>
);
};
diff --git a/apps/desktop/src/renderer/components/layouts/layout.tsx b/apps/desktop/src/renderer/components/layouts/layout.tsx
index 4ab74b7e..9f1af63f 100644
--- a/apps/desktop/src/renderer/components/layouts/layout.tsx
+++ b/apps/desktop/src/renderer/components/layouts/layout.tsx
@@ -1,10 +1,6 @@
import { LayoutMain } from '@/renderer/components/layouts/layout-main';
import { LayoutModal } from '@/renderer/components/layouts/layout-modal';
import { LayoutSidebar } from '@/renderer/components/layouts/layout-sidebar';
-import {
- SidebarInset,
- SidebarProvider,
-} from '@/renderer/components/ui/sidebar';
interface LayoutProps {
main?: string | null;
@@ -13,14 +9,12 @@ interface LayoutProps {
export const Layout = ({ main, modal }: LayoutProps) => {
return (
- <SidebarProvider>
+ <div className="w-screen min-w-screen h-screen min-h-screen flex flex-row">
<LayoutSidebar />
- <SidebarInset>
- <main className="h-full max-h-screen w-full min-w-128 flex-grow overflow-hidden bg-white">
- {main && <LayoutMain nodeId={main} />}
- </main>
- {modal && <LayoutModal nodeId={modal} />}
- </SidebarInset>
- </SidebarProvider>
+ <main className="h-full max-h-screen w-full min-w-128 flex-grow overflow-hidden bg-white">
+ {main && <LayoutMain nodeId={main} />}
+ </main>
+ {modal && <LayoutModal nodeId={modal} />}
+ </div>
);
};
diff --git a/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsx b/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsx
index 4e0132ed..6fb3f232 100644
--- a/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsx
+++ b/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsx
@@ -1,4 +1,4 @@
-import { compareString,SpaceNode } from '@colanode/core';
+import { compareString, SpaceNode } from '@colanode/core';
import {
ChevronRight,
Database,
@@ -31,16 +31,9 @@ import {
DropdownMenuSeparator,
DropdownMenuTrigger,
} from '@/renderer/components/ui/dropdown-menu';
-import {
- SidebarMenuAction,
- SidebarMenuButton,
- SidebarMenuItem,
- SidebarMenuSub,
- SidebarMenuSubButton,
- SidebarMenuSubItem,
-} from '@/renderer/components/ui/sidebar';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useQuery } from '@/renderer/hooks/use-query';
+import { cn } from '@/shared/lib/utils';
interface SettingsState {
open: boolean;
@@ -77,107 +70,106 @@ export const SpaceSidebarItem = ({ node }: SpaceSidebarItemProps) => {
key={node.id}
asChild
defaultOpen={true}
- className="group/collapsible"
+ className="group/sidebar-space"
>
- <SidebarMenuItem>
- <CollapsibleTrigger asChild>
- <SidebarMenuButton
- tooltip={node.attributes.name ?? ''}
- className="group/space-button"
- >
- <Avatar
- id={node.id}
- avatar={node.attributes.avatar}
- name={node.attributes.name}
- className="size-4 group-hover/space-button:hidden"
- />
- <ChevronRight className="hidden size-4 transition-transform duration-200 group-hover/space-button:block group-data-[state=open]/collapsible:rotate-90" />
- <span>{node.attributes.name}</span>
- </SidebarMenuButton>
- </CollapsibleTrigger>
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <SidebarMenuAction
- showOnHover
- className="size-4 focus-visible:outline-none focus-visible:ring-0"
- >
- <Ellipsis />
- </SidebarMenuAction>
- </DropdownMenuTrigger>
- <DropdownMenuContent className="ml-1 w-72">
- <DropdownMenuLabel>
- {node.attributes.name ?? 'Unnamed'}
- </DropdownMenuLabel>
- <DropdownMenuSeparator />
- <DropdownMenuItem onSelect={() => setOpenCreatePage(true)}>
- <div className="flex flex-row items-center gap-2">
- <StickyNote className="size-4" />
- <span>Add page</span>
- </div>
- </DropdownMenuItem>
- <DropdownMenuItem onSelect={() => setOpenCreateChannel(true)}>
- <div className="flex flex-row items-center gap-2">
- <MessageCircle className="size-4" />
- <span>Add channel</span>
- </div>
- </DropdownMenuItem>
- <DropdownMenuItem onSelect={() => setOpenCreateDatabase(true)}>
- <div className="flex flex-row items-center gap-2">
- <Database className="size-4" />
- <span>Add database</span>
- </div>
- </DropdownMenuItem>
- <DropdownMenuItem onSelect={() => setOpenCreateFolder(true)}>
- <div className="flex flex-row items-center gap-2">
- <Folder className="size-4" />
- <span>Add folder</span>
- </div>
- </DropdownMenuItem>
- <DropdownMenuSeparator />
- <DropdownMenuItem
- onClick={() => setSettingsState({ open: true })}
- >
- <div className="flex flex-row items-center gap-2">
- <Settings className="size-4" />
- <span>Settings</span>
- </div>
- </DropdownMenuItem>
- <DropdownMenuItem
- onClick={() =>
- setSettingsState({
- open: true,
- tab: 'collaborators',
- })
- }
- >
- <div className="flex flex-row items-center gap-2">
- <Plus className="size-4" />
- <span>Add collaborators</span>
- </div>
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
-
+ <div>
+ <div className="flex w-full min-w-0 flex-row items-center hover:bg-sidebar-accent hover:text-sidebar-accent-foreground h-8">
+ <CollapsibleTrigger asChild>
+ <button className="group/space-button flex items-center gap-2 overflow-hidden rounded-md p-2 text-left text-sm flex-1">
+ <Avatar
+ id={node.id}
+ avatar={node.attributes.avatar}
+ name={node.attributes.name}
+ className="size-4 group-hover/space-button:hidden"
+ />
+ <ChevronRight className="hidden size-4 transition-transform duration-200 group-hover/space-button:block group-data-[state=open]/sidebar-space:rotate-90" />
+ <span>{node.attributes.name}</span>
+ </button>
+ </CollapsibleTrigger>
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <button className="text-muted-foreground opacity-0 transition-opacity group-hover/sidebar-space:opacity-100 flex items-center justify-center p-0 mr-1 size-4 focus-visible:outline-none focus-visible:ring-0">
+ <Ellipsis />
+ </button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent className="ml-1 w-72">
+ <DropdownMenuLabel>
+ {node.attributes.name ?? 'Unnamed'}
+ </DropdownMenuLabel>
+ <DropdownMenuSeparator />
+ <DropdownMenuItem onSelect={() => setOpenCreatePage(true)}>
+ <div className="flex flex-row items-center gap-2">
+ <StickyNote className="size-4" />
+ <span>Add page</span>
+ </div>
+ </DropdownMenuItem>
+ <DropdownMenuItem onSelect={() => setOpenCreateChannel(true)}>
+ <div className="flex flex-row items-center gap-2">
+ <MessageCircle className="size-4" />
+ <span>Add channel</span>
+ </div>
+ </DropdownMenuItem>
+ <DropdownMenuItem onSelect={() => setOpenCreateDatabase(true)}>
+ <div className="flex flex-row items-center gap-2">
+ <Database className="size-4" />
+ <span>Add database</span>
+ </div>
+ </DropdownMenuItem>
+ <DropdownMenuItem onSelect={() => setOpenCreateFolder(true)}>
+ <div className="flex flex-row items-center gap-2">
+ <Folder className="size-4" />
+ <span>Add folder</span>
+ </div>
+ </DropdownMenuItem>
+ <DropdownMenuSeparator />
+ <DropdownMenuItem
+ onClick={() => setSettingsState({ open: true })}
+ >
+ <div className="flex flex-row items-center gap-2">
+ <Settings className="size-4" />
+ <span>Settings</span>
+ </div>
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ onClick={() =>
+ setSettingsState({
+ open: true,
+ tab: 'collaborators',
+ })
+ }
+ >
+ <div className="flex flex-row items-center gap-2">
+ <Plus className="size-4" />
+ <span>Add collaborators</span>
+ </div>
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ </div>
<CollapsibleContent>
- <SidebarMenuSub className="mr-0 pr-0">
+ <ul className="mx-3.5 flex min-w-0 translate-x-px flex-col gap-1 border-l border-sidebar-border px-2.5 py-0.5 mr-0 pr-0">
{children.map((child) => (
- <SidebarMenuSubItem
+ <li
key={child.id}
onClick={() => {
workspace.openInMain(child.id);
}}
className="cursor-pointer"
>
- <SidebarMenuSubButton
- isActive={workspace.isNodeActive(child.id)}
+ <div
+ className={cn(
+ 'text-sm flex h-7 min-w-0 -translate-x-px items-center gap-2 overflow-hidden rounded-md px-2 text-sidebar-foreground hover:bg-sidebar-accent hover:text-sidebar-accent-foreground',
+ workspace.isNodeActive(child.id) &&
+ 'bg-sidebar-accent text-sidebar-accent-foreground font-medium'
+ )}
>
<NodeSidebarItem node={child} />
- </SidebarMenuSubButton>
- </SidebarMenuSubItem>
+ </div>
+ </li>
))}
- </SidebarMenuSub>
+ </ul>
</CollapsibleContent>
- </SidebarMenuItem>
+ </div>
</Collapsible>
{openCreateChannel && (
<ChannelCreateDialog
diff --git a/apps/desktop/src/renderer/components/ui/sidebar.tsx b/apps/desktop/src/renderer/components/ui/sidebar.tsx
index 876ac13c..760aeadc 100644
--- a/apps/desktop/src/renderer/components/ui/sidebar.tsx
+++ b/apps/desktop/src/renderer/components/ui/sidebar.tsx
@@ -1,5 +1,5 @@
import { Slot } from '@radix-ui/react-slot';
-import { cva,VariantProps } from 'class-variance-authority';
+import { cva, VariantProps } from 'class-variance-authority';
import { PanelLeftClose, PanelLeftOpen } from 'lucide-react';
import * as React from 'react';