Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

style: adds coss ui & base ui

Andrej5a77539cccbd
diff --git a/apps/web/components.json b/apps/web/components.json
index 94bf7ad7e..1c68cc2f5 100644
--- a/apps/web/components.json
+++ b/apps/web/components.json
@@ -1,21 +1,24 @@
{
- "$schema": "https://ui.shadcn.com/schema.json",
- "style": "new-york",
- "rsc": false,
- "tsx": true,
- "tailwind": {
- "config": "tailwind.config.js",
- "css": "src/index.css",
- "baseColor": "zinc",
- "cssVariables": true,
- "prefix": ""
- },
- "aliases": {
- "components": "@/components",
- "utils": "@/lib/cn",
- "ui": "@/components/ui",
- "lib": "@/lib",
- "hooks": "@/hooks"
- },
- "iconLibrary": "lucide"
+ "$schema": "https://ui.shadcn.com/schema.json",
+ "style": "new-york",
+ "rsc": false,
+ "tsx": true,
+ "tailwind": {
+ "config": "tailwind.config.js",
+ "css": "src/index.css",
+ "baseColor": "zinc",
+ "cssVariables": true,
+ "prefix": ""
+ },
+ "iconLibrary": "lucide",
+ "aliases": {
+ "components": "@/components",
+ "utils": "@/lib/cn",
+ "ui": "@/components/ui",
+ "lib": "@/lib",
+ "hooks": "@/hooks"
+ },
+ "registries": {
+ "@coss": "https://coss.com/ui/r/{name}.json"
+ }
}
diff --git a/apps/web/package.json b/apps/web/package.json
index 7ddd72722..bd074b2b6 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -10,6 +10,7 @@
"lint": "biome check --write ."
},
"dependencies": {
+ "@base-ui/react": "^1.2.0",
"@blocknote/core": "^0.46.1",
"@blocknote/react": "^0.46.2",
"@blocknote/shadcn": "^0.46.2",
@@ -82,4 +83,4 @@
"typescript": "~5.8.3",
"vite": "^7.3.1"
}
-}
\ No newline at end of file
+}
diff --git a/apps/web/src/assets/fonts/CalSans-SemiBold.woff2 b/apps/web/src/assets/fonts/CalSans-SemiBold.woff2
new file mode 100644
index 000000000..36d71b70d
Binary files /dev/null and b/apps/web/src/assets/fonts/CalSans-SemiBold.woff2 differ
diff --git a/apps/web/src/assets/fonts/CalSansUI[MODE,wght].woff2 b/apps/web/src/assets/fonts/CalSansUI[MODE,wght].woff2
new file mode 100644
index 000000000..d353c5893
Binary files /dev/null and b/apps/web/src/assets/fonts/CalSansUI[MODE,wght].woff2 differ
diff --git a/apps/web/src/assets/fonts/PaperMono-Regular.woff2 b/apps/web/src/assets/fonts/PaperMono-Regular.woff2
new file mode 100644
index 000000000..849e0ffaf
Binary files /dev/null and b/apps/web/src/assets/fonts/PaperMono-Regular.woff2 differ
diff --git a/apps/web/src/components/activity/comment-card.tsx b/apps/web/src/components/activity/comment-card.tsx
index f96e8b984..3f191c631 100644
--- a/apps/web/src/components/activity/comment-card.tsx
+++ b/apps/web/src/components/activity/comment-card.tsx
@@ -30,15 +30,16 @@ import {
Underline,
X,
} from "lucide-react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { useAuth } from "@/components/providers/auth-provider/hooks/use-auth";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { Button } from "@/components/ui/button";
+import CustomSlashMenu from "@/components/blocknote/custom-slash-menu";
import {
HoverCard,
HoverCardContent,
HoverCardTrigger,
-} from "@/components/ui/hover-card";
+} from "@/components/ui/preview-card";
import { KbdSequence } from "@/components/ui/kbd";
import {
Tooltip,
@@ -526,6 +527,7 @@ export default function CommentCard({
)}
<SuggestionMenuController
triggerCharacter={"/"}
+ suggestionMenuComponent={CustomSlashMenu}
getItems={async (query) =>
getDefaultReactSlashMenuItems(editor).filter(
(item) => item.group !== "Media",
diff --git a/apps/web/src/components/activity/comment-input.tsx b/apps/web/src/components/activity/comment-input.tsx
index 33568386f..0e114ea1c 100644
--- a/apps/web/src/components/activity/comment-input.tsx
+++ b/apps/web/src/components/activity/comment-input.tsx
@@ -25,8 +25,9 @@ import {
Type,
Underline,
} from "lucide-react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { Button } from "@/components/ui/button";
+import CustomSlashMenu from "@/components/blocknote/custom-slash-menu";
import { KbdSequence } from "@/components/ui/kbd";
import {
Tooltip,
@@ -302,6 +303,7 @@ export default function CommentInput({ taskId }: CommentInputProps) {
/>
<SuggestionMenuController
triggerCharacter={"/"}
+ suggestionMenuComponent={CustomSlashMenu}
getItems={async (query) =>
getDefaultReactSlashMenuItems(editor).filter(
(item) => item.group !== "Media",
diff --git a/apps/web/src/components/activity/index.tsx b/apps/web/src/components/activity/index.tsx
index 3556f35d4..305c12664 100644
--- a/apps/web/src/components/activity/index.tsx
+++ b/apps/web/src/components/activity/index.tsx
@@ -8,7 +8,7 @@ import {
HoverCard,
HoverCardContent,
HoverCardTrigger,
-} from "../ui/hover-card";
+} from "../ui/preview-card";
import CommentCard from "./comment-card";
function getActivityTypeComponent(type: string) {
diff --git a/apps/web/src/components/app-sidebar.tsx b/apps/web/src/components/app-sidebar.tsx
index 51823b751..94640c74d 100644
--- a/apps/web/src/components/app-sidebar.tsx
+++ b/apps/web/src/components/app-sidebar.tsx
@@ -28,11 +28,16 @@ export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {
});
return (
- <Sidebar collapsible="offcanvas" className="border-none pt-3" {...props}>
- <SidebarHeader className="pt-0">
+ <Sidebar
+ collapsible="offcanvas"
+ variant="inset"
+ className="border-none pt-2"
+ {...props}
+ >
+ <SidebarHeader className="pt-1 pb-2">
<WorkspaceSwitcher />
</SidebarHeader>
- <SidebarContent className="overflow-hidden">
+ <SidebarContent className="overflow-hidden px-1">
<Search />
<NavMain />
<NavProjects />
diff --git a/apps/web/src/components/auth/layout.tsx b/apps/web/src/components/auth/layout.tsx
index 2b07939e9..507bf3a1e 100644
--- a/apps/web/src/components/auth/layout.tsx
+++ b/apps/web/src/components/auth/layout.tsx
@@ -8,18 +8,16 @@ type AuthLayoutProps = {
export function AuthLayout({ children, title, subtitle }: AuthLayoutProps) {
return (
- <div className="min-h-screen w-full bg-linear-to-b from-zinc-100 to-white dark:from-zinc-900 dark:to-zinc-950 flex flex-col items-center justify-center p-4">
+ <div className="min-h-screen w-full bg-background flex flex-col items-center justify-center p-4">
<div className="w-full max-w-sm">
<Logo className="mx-auto mb-6 w-full flex items-end justify-center" />
- <div className="bg-white/50 dark:bg-zinc-900/50 backdrop-blur-xl rounded-xl border border-zinc-200/50 dark:border-zinc-800/50 p-6 shadow-xl shadow-zinc-200/20 dark:shadow-zinc-950/20">
- <h1 className="text-lg font-bold text-foreground dark:text-foreground mb-2">
+ <div className="rounded-xl border border-border bg-card p-6 shadow-sm">
+ <h1 className="text-lg font-semibold text-foreground mb-2">
{title}
</h1>
{subtitle && (
- <p className="text-sm text-muted-foreground dark:text-muted-foreground">
- {subtitle}
- </p>
+ <p className="text-sm text-muted-foreground">{subtitle}</p>
)}
{children}
diff --git a/apps/web/src/components/auth/otp-sign-in-form.tsx b/apps/web/src/components/auth/otp-sign-in-form.tsx
index 84eeea7f5..0b51f6ff5 100644
--- a/apps/web/src/components/auth/otp-sign-in-form.tsx
+++ b/apps/web/src/components/auth/otp-sign-in-form.tsx
@@ -2,7 +2,7 @@ import { standardSchemaResolver } from "@hookform/resolvers/standard-schema";
import { useRouter } from "@tanstack/react-router";
import { useState } from "react";
import { useForm } from "react-hook-form";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { z } from "zod/v4";
import { Button } from "@/components/ui/button";
import {
@@ -90,7 +90,7 @@ export function OtpSignInForm({
<Button
type="submit"
disabled={isPending}
- className="w-full mt-4 text-white"
+ className="w-full mt-4"
>
{isPending ? "Sending..." : "Send Verification Code"}
</Button>
diff --git a/apps/web/src/components/auth/sign-in-form.tsx b/apps/web/src/components/auth/sign-in-form.tsx
index 2d981219d..b4442fd6d 100644
--- a/apps/web/src/components/auth/sign-in-form.tsx
+++ b/apps/web/src/components/auth/sign-in-form.tsx
@@ -2,7 +2,7 @@ import { standardSchemaResolver } from "@hookform/resolvers/standard-schema";
import { Eye, EyeOff } from "lucide-react";
import { useState } from "react";
import { useForm } from "react-hook-form";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { z } from "zod/v4";
import { Button } from "@/components/ui/button";
import {
@@ -126,7 +126,7 @@ export function SignInForm({ onSuccess, defaultEmail }: SignInFormProps) {
type="submit"
disabled={isPending}
size="sm"
- className="w-full mt-4 text-white"
+ className="w-full mt-4"
>
{isPending ? "Signing In..." : "Sign In"}
</Button>
diff --git a/apps/web/src/components/auth/sign-up-form.tsx b/apps/web/src/components/auth/sign-up-form.tsx
index 2844eba73..15f147888 100644
--- a/apps/web/src/components/auth/sign-up-form.tsx
+++ b/apps/web/src/components/auth/sign-up-form.tsx
@@ -3,7 +3,7 @@ import { useRouter } from "@tanstack/react-router";
import { Eye, EyeOff } from "lucide-react";
import { useState } from "react";
import { useForm } from "react-hook-form";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { z } from "zod/v4";
import { Button } from "@/components/ui/button";
import {
@@ -154,7 +154,7 @@ export function SignUpForm({ invitationId, defaultEmail }: SignUpFormProps) {
<Button
type="submit"
disabled={isPending}
- className="w-full mt-4 text-white"
+ className="w-full mt-4"
>
{isPending ? "Creating Account..." : "Create Account"}
</Button>
diff --git a/apps/web/src/components/backlog-list-view/backlog-task-row.tsx b/apps/web/src/components/backlog-list-view/backlog-task-row.tsx
index f931f987c..b1508729c 100644
--- a/apps/web/src/components/backlog-list-view/backlog-task-row.tsx
+++ b/apps/web/src/components/backlog-list-view/backlog-task-row.tsx
@@ -4,11 +4,11 @@ import { useNavigate } from "@tanstack/react-router";
import { format } from "date-fns";
import { Calendar, CalendarClock, CalendarX } from "lucide-react";
import { type CSSProperties, useMemo, useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import {
AlertDialog,
- AlertDialogAction,
- AlertDialogCancel,
+ AlertDialogClose,
+
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
@@ -131,11 +131,10 @@ export default function BacklogTaskRow({ task }: BacklogTaskRowProps) {
ref={setNodeRef}
style={style}
className={cn(
- "border-b border-zinc-200/50 dark:border-zinc-800/50 transition-all duration-200",
+ "border-b border-border/50 transition-all duration-200",
isDragging && "opacity-50",
- isTaskSelected && "bg-primary/10 shadow-sm",
- isTaskFocused &&
- "ring-2 ring-inset ring-indigo-500/50 dark:ring-indigo-400/50",
+ isTaskSelected && "bg-accent/50 shadow-sm",
+ isTaskFocused && "ring-2 ring-inset ring-ring/50",
)}
>
<ContextMenu>
@@ -144,7 +143,7 @@ export default function BacklogTaskRow({ task }: BacklogTaskRowProps) {
<div
onClick={handleClick}
onKeyDown={handleKeyDown}
- className="group relative flex items-center gap-3 px-4 py-1.5 hover:bg-zinc-100/60 dark:hover:bg-zinc-800/20 transition-colors cursor-pointer"
+ className="group relative flex items-center gap-3 px-4 py-1.5 hover:bg-accent/60 transition-colors cursor-pointer"
{...attributes}
{...listeners}
>
@@ -154,14 +153,14 @@ export default function BacklogTaskRow({ task }: BacklogTaskRowProps) {
</div>
)}
{showTaskNumbers && (
- <div className="text-xs font-mono text-zinc-400 dark:text-zinc-500 flex-shrink-0">
+ <div className="text-xs font-mono text-muted-foreground flex-shrink-0">
{project?.slug}-{task.number}
</div>
)}
<div className="flex-1 min-w-0 flex items-center gap-2">
<div className="flex items-center gap-2 justify-between w-full">
- <span className="text-sm text-zinc-900 dark:text-zinc-100 truncate">
+ <span className="text-sm text-foreground truncate">
{task.title}
</span>
{showLabels && (
@@ -242,13 +241,13 @@ export default function BacklogTaskRow({ task }: BacklogTaskRowProps) {
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
- <AlertDialogCancel>Cancel</AlertDialogCancel>
- <AlertDialogAction
+ <AlertDialogClose>Cancel</AlertDialogClose>
+ <AlertDialogClose
onClick={handleDeleteTask}
className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
>
Delete Task
- </AlertDialogAction>
+ </AlertDialogClose>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
diff --git a/apps/web/src/components/backlog-list-view/index.tsx b/apps/web/src/components/backlog-list-view/index.tsx
index 7033d6d89..7d874833c 100644
--- a/apps/web/src/components/backlog-list-view/index.tsx
+++ b/apps/web/src/components/backlog-list-view/index.tsx
@@ -296,16 +296,16 @@ function BacklogListView({ project }: BacklogListViewProps) {
return (
<div
className={cn(
- "border-b border-zinc-200 dark:border-zinc-800/50 transition-all duration-200 overflow-auto",
+ "border-b border-border/50 transition-all duration-200 overflow-auto",
showDropIndicator &&
- "border-l-4 border-l-indigo-500 dark:border-l-indigo-400 bg-indigo-50/30 dark:bg-indigo-950/10",
+ "border-l-4 border-l-ring bg-accent/35",
)}
>
- <div className="flex items-center justify-between py-2 px-4 bg-zinc-100/60 dark:bg-zinc-800/20 border-b border-zinc-200/50 dark:border-zinc-800/30">
+ <div className="flex items-center justify-between py-2 px-4 bg-muted/60 border-b border-border/50">
<button
type="button"
onClick={() => toggleSection(sectionId)}
- className="flex items-center gap-2 text-sm font-medium text-zinc-800 dark:text-zinc-300 hover:text-zinc-900 dark:hover:text-zinc-100 transition-colors"
+ className="flex items-center gap-2 text-sm font-medium text-foreground hover:text-foreground transition-colors"
>
<ChevronRight
className={cn(
@@ -314,10 +314,10 @@ function BacklogListView({ project }: BacklogListViewProps) {
)}
/>
<div className="flex items-center gap-2 h-4">
- <IconComponent className="w-4 h-4 flex-shrink-0 text-zinc-500 dark:text-zinc-400" />
+ <IconComponent className="w-4 h-4 flex-shrink-0 text-muted-foreground" />
<div className="flex items-center gap-1">
<span className="mt-1 mr-1">{title}</span>
- <span className="text-xs text-zinc-400 dark:text-zinc-500 mt-0.5">
+ <span className="text-xs text-muted-foreground mt-0.5">
{tasks.length}
</span>
</div>
@@ -332,7 +332,7 @@ function BacklogListView({ project }: BacklogListViewProps) {
setIsTaskModalOpen(true);
setActiveColumn("planned");
}}
- className="p-1 hover:bg-zinc-200/70 dark:hover:bg-zinc-700 rounded text-zinc-600 hover:text-zinc-800 dark:text-zinc-500 dark:hover:text-zinc-300 transition-colors"
+ className="p-1 hover:bg-accent rounded text-muted-foreground hover:text-foreground transition-colors"
title="Add task"
>
<Plus className="w-3 h-3" />
@@ -342,7 +342,7 @@ function BacklogListView({ project }: BacklogListViewProps) {
</div>
{expandedSections[sectionId] && (
- <div ref={setNodeRef} className="bg-white dark:bg-transparent">
+ <div ref={setNodeRef} className="bg-card">
<SortableContext
items={tasks}
strategy={verticalListSortingStrategy}
@@ -353,7 +353,7 @@ function BacklogListView({ project }: BacklogListViewProps) {
</SortableContext>
{tasks.length === 0 && (
- <div className="py-6 px-4 text-center text-xs text-zinc-400 dark:text-zinc-500">
+ <div className="py-6 px-4 text-center text-xs text-muted-foreground">
No {title.toLowerCase()} tasks
</div>
)}
@@ -383,8 +383,8 @@ function BacklogListView({ project }: BacklogListViewProps) {
onDragEnd={handleDragEnd}
modifiers={[snapCenterToCursor]}
>
- <div className="w-full h-full overflow-auto bg-zinc-50/30 dark:bg-transparent">
- <div className="divide-y divide-zinc-200 dark:divide-zinc-800/50">
+ <div className="w-full h-full overflow-auto bg-muted/20">
+ <div className="divide-y divide-border/50">
<BacklogSection
sectionId="planned"
title="Planned"
@@ -404,7 +404,7 @@ function BacklogListView({ project }: BacklogListViewProps) {
<DragOverlay>
{activeTask && (
- <div className="bg-white dark:bg-zinc-800 border border-zinc-200 dark:border-zinc-700 rounded-lg shadow-lg p-2 max-w-[200px] cursor-grabbing">
+ <div className="bg-card border border-border rounded-lg shadow-lg p-2 max-w-[200px] cursor-grabbing">
<div className="flex items-center gap-2">
<div className="flex-shrink-0">
<Flag
@@ -419,10 +419,10 @@ function BacklogListView({ project }: BacklogListViewProps) {
<div className="flex-1 min-w-0">
<div className="flex items-center gap-1.5">
- <span className="text-[10px] font-mono text-zinc-400 dark:text-zinc-500">
+ <span className="text-[10px] font-mono text-muted-foreground">
{project?.slug}-{activeTask.number}
</span>
- <span className="text-xs text-zinc-900 dark:text-zinc-100 truncate">
+ <span className="text-xs text-foreground truncate">
{activeTask.title}
</span>
</div>
diff --git a/apps/web/src/components/blocknote/custom-slash-menu.tsx b/apps/web/src/components/blocknote/custom-slash-menu.tsx
new file mode 100644
index 000000000..c95e025db
--- /dev/null
+++ b/apps/web/src/components/blocknote/custom-slash-menu.tsx
@@ -0,0 +1,53 @@
+import type {
+ DefaultReactSuggestionItem,
+ SuggestionMenuProps,
+} from "@blocknote/react";
+import { cn } from "@/lib/cn";
+
+export default function CustomSlashMenu(
+ props: SuggestionMenuProps<DefaultReactSuggestionItem>,
+) {
+ const { items, selectedIndex, onItemClick } = props;
+
+ let currentGroup: string | undefined;
+
+ const getShortcut = (badge: DefaultReactSuggestionItem["badge"]) => {
+ if (typeof badge !== "string") return null;
+ const value = badge.trim();
+ if (!value || value.length > 14) return null;
+ return value;
+ };
+
+ return (
+ <div className="kaneo-slash-menu">
+ {items.map((item, index) => {
+ const shouldShowGroup = item.group && item.group !== currentGroup;
+ currentGroup = item.group;
+ const shortcut = getShortcut(item.badge);
+
+ return (
+ <div key={`${item.title}-${index}`}>
+ {shouldShowGroup && (
+ <div className="kaneo-slash-menu-label">{item.group}</div>
+ )}
+ <button
+ type="button"
+ className={cn("kaneo-slash-menu-item", {
+ "is-selected": selectedIndex === index,
+ })}
+ aria-selected={selectedIndex === index}
+ onMouseDown={(event) => event.preventDefault()}
+ onClick={() => onItemClick?.(item)}
+ >
+ {item.icon && <span className="kaneo-slash-menu-icon">{item.icon}</span>}
+ <span className="kaneo-slash-menu-title">{item.title}</span>
+ {shortcut && (
+ <span className="kaneo-slash-menu-shortcut">{shortcut}</span>
+ )}
+ </button>
+ </div>
+ );
+ })}
+ </div>
+ );
+}
diff --git a/apps/web/src/components/bulk-selection/backlog-bulk-toolbar.tsx b/apps/web/src/components/bulk-selection/backlog-bulk-toolbar.tsx
index 259db0c78..25e7d60dd 100644
--- a/apps/web/src/components/bulk-selection/backlog-bulk-toolbar.tsx
+++ b/apps/web/src/components/bulk-selection/backlog-bulk-toolbar.tsx
@@ -6,22 +6,29 @@ import {
Trash2,
X,
} from "lucide-react";
-import { useEffect, useState } from "react";
-import { toast } from "sonner";
+import { Fragment, type ReactNode, useEffect, useMemo, useState } from "react";
+import { toast } from "@/lib/toast";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import {
+ Command,
+ CommandCollection,
CommandDialog,
+ CommandDialogPopup,
+ CommandEmpty,
CommandGroup,
+ CommandGroupLabel,
CommandInput,
CommandItem,
CommandList,
+ CommandPanel,
+ CommandSeparator,
} from "@/components/ui/command";
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
+} from "@/components/ui/menu";
import { useBulkOperations } from "@/hooks/mutations/task/use-bulk-operations";
import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";
import { useGetActiveWorkspaceUsers } from "@/hooks/queries/workspace-users/use-get-active-workspace-users";
@@ -30,6 +37,19 @@ import useBacklogBulkSelectionStore from "@/store/backlog-bulk-selection";
import useProjectStore from "@/store/project";
import { Button } from "../ui/button";
+type BacklogActionItem = {
+ value: string;
+ label: string;
+ icon?: ReactNode;
+ onRun: () => void;
+};
+
+type BacklogActionGroup = {
+ value: string;
+ label: string;
+ items: BacklogActionItem[];
+};
+
function BacklogBulkToolbar() {
const { selectedTaskIds, clearSelection, selectAll } =
useBacklogBulkSelectionStore();
@@ -115,6 +135,56 @@ function BacklogBulkToolbar() {
if (selectedCount === 0) return null;
+ const groupedItems = useMemo<BacklogActionGroup[]>(
+ () => [
+ {
+ value: "actions",
+ label: "Actions",
+ items: [
+ {
+ value: "bulk-delete",
+ label: "Delete tasks",
+ icon: <Trash2 className="w-4 h-4 mr-2" />,
+ onRun: () => {
+ void handleBulkDelete();
+ },
+ },
+ {
+ value: "bulk-archive",
+ label: "Archive tasks",
+ icon: <Archive className="w-4 h-4 mr-2" />,
+ onRun: () => {
+ void handleBulkArchive();
+ },
+ },
+ ],
+ },
+ {
+ value: "assign",
+ label: "Assign to",
+ items: (workspaceUsers?.members ?? []).map((member) => ({
+ value: `assign-${member.userId}`,
+ label: member.user?.name || "Unknown User",
+ icon: (
+ <Avatar className="h-6 w-6 mr-2">
+ <AvatarImage
+ src={member.user?.image ?? ""}
+ alt={member.user?.name || ""}
+ />
+ <AvatarFallback className="text-xs font-medium border border-border/30">
+ {member.user?.name?.charAt(0).toUpperCase()}
+ </AvatarFallback>
+ </Avatar>
+ ),
+ onRun: () => {
+ void handleBulkAssign(member.userId);
+ },
+ })),
+ },
+ ],
+ [workspaceUsers?.members],
+ );
+
return (
<div className="fixed bottom-6 left-1/2 transform -translate-x-1/2 z-50">
<div className="bg-background text-foreground rounded-xl shadow-lg px-2 py-2 flex items-center gap-1 border border-border">
@@ -170,41 +240,36 @@ function BacklogBulkToolbar() {
open={isActionsOpen}
onOpenChange={setIsActionsOpen}
>
- <CommandInput placeholder="Search actions..." />
- <CommandList>
- <CommandGroup heading="Actions">
- <CommandItem onSelect={handleBulkDelete}>
- <Trash2 className="w-4 h-4 mr-2" />
- Delete tasks
- </CommandItem>
- <CommandItem onSelect={handleBulkArchive}>
- <Archive className="w-4 h-4 mr-2" />
- Archive tasks
- </CommandItem>
- </CommandGroup>
-
- <CommandGroup heading="Assign to">
- {workspaceUsers?.members?.map((member) => (
- <CommandItem
- key={member.userId}
- onSelect={() => handleBulkAssign(member.userId)}
- >
- <Avatar className="h-6 w-6">
- <AvatarImage
- src={member.user?.image ?? ""}
- alt={member.user?.name || ""}
- />
- <AvatarFallback className="text-xs font-medium border border-border/30">
- {member.user?.name?.charAt(0).toUpperCase()}
- </AvatarFallback>
- </Avatar>
- <span className="text-sm">
- {member.user?.name || "Unknown User"}
- </span>
- </CommandItem>
- ))}
- </CommandGroup>
- </CommandList>
+ <CommandDialogPopup>
+ <Command items={groupedItems}>
+ <CommandInput placeholder="Search actions..." />
+ <CommandPanel>
+ <CommandEmpty>No actions found.</CommandEmpty>
+ <CommandList>
+ {(group: BacklogActionGroup, groupIndex: number) => (
+ <Fragment key={group.value}>
+ <CommandGroup items={group.items}>
+ <CommandGroupLabel>{group.label}</CommandGroupLabel>
+ <CommandCollection>
+ {(item: BacklogActionItem) => (
+ <CommandItem
+ key={item.value}
+ value={item.value}
+ onClick={item.onRun}
+ >
+ {item.icon}
+ <span className="text-sm">{item.label}</span>
+ </CommandItem>
+ )}
+ </CommandCollection>
+ </CommandGroup>
+ {groupIndex < groupedItems.length - 1 && <CommandSeparator />}
+ </Fragment>
+ )}
+ </CommandList>
+ </CommandPanel>
+ </Command>
+ </CommandDialogPopup>
</CommandDialog>
</div>
);
diff --git a/apps/web/src/components/bulk-selection/bulk-toolbar.tsx b/apps/web/src/components/bulk-selection/bulk-toolbar.tsx
index 6627ee08a..57c022615 100644
--- a/apps/web/src/components/bulk-selection/bulk-toolbar.tsx
+++ b/apps/web/src/components/bulk-selection/bulk-toolbar.tsx
@@ -1,13 +1,20 @@
import { Archive, ArrowDownToLine, Menu, Trash2, X } from "lucide-react";
-import { useEffect, useState } from "react";
-import { toast } from "sonner";
+import { Fragment, type ReactNode, useEffect, useMemo, useState } from "react";
+import { toast } from "@/lib/toast";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import {
+ Command,
+ CommandCollection,
CommandDialog,
+ CommandDialogPopup,
+ CommandEmpty,
CommandGroup,
+ CommandGroupLabel,
CommandInput,
CommandItem,
CommandList,
+ CommandPanel,
+ CommandSeparator,
} from "@/components/ui/command";
import { useBulkOperations } from "@/hooks/mutations/task/use-bulk-operations";
import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";
@@ -17,6 +24,19 @@ import useBulkSelectionStore from "@/store/bulk-selection";
import useProjectStore from "@/store/project";
import { Button } from "../ui/button";
+type BulkActionItem = {
+ value: string;
+ label: string;
+ icon?: ReactNode;
+ onRun: () => void;
+};
+
+type BulkActionGroup = {
+ value: string;
+ label: string;
+ items: BulkActionItem[];
+};
+
function BulkToolbar() {
const { selectedTaskIds, clearSelection, selectAll } =
useBulkSelectionStore();
@@ -115,6 +135,68 @@ function BulkToolbar() {
if (selectedCount === 0) return null;
+ const groupedItems = useMemo<BulkActionGroup[]>(
+ () => [
+ {
+ value: "actions",
+ label: "Actions",
+ items: [
+ {
+ value: "bulk-delete",
+ label: "Delete tasks",
+ icon: <Trash2 className="w-4 h-4 mr-2" />,
+ onRun: () => {
+ void handleBulkDelete();
+ },
+ },
+ {
+ value: "bulk-archive",
+ label: "Archive tasks",
+ icon: <Archive className="w-4 h-4 mr-2" />,
+ onRun: () => {
+ void handleBulkArchive();
+ },
+ },
+ ],
+ },
+ {
+ value: "status",
+ label: "Change Status",
+ items: (project?.columns ?? []).map((col) => ({
+ value: `status-${col.id}`,
+ label: col.name,
+ icon: getColumnIcon(col.id, col.isFinal),
+ onRun: () => {
+ void handleBulkChangeStatus(col.id);
+ },
+ })),
+ },
+ {
+ value: "assign",
+ label: "Assign to",
+ items: (workspaceUsers?.members ?? []).map((member) => ({
+ value: `assign-${member.userId}`,
+ label: member.user?.name || "Unknown User",
+ icon: (
+ <Avatar className="h-6 w-6 mr-2">
+ <AvatarImage
+ src={member.user?.image ?? ""}
+ alt={member.user?.name || ""}
+ />
+ <AvatarFallback className="text-xs font-medium border border-border/30">
+ {member.user?.name?.charAt(0).toUpperCase()}
+ </AvatarFallback>
+ </Avatar>
+ ),
+ onRun: () => {
+ void handleBulkAssign(member.userId);
+ },
+ })),
+ },
+ ],
+ [project?.columns, workspaceUsers?.members, selectedCount],
+ );
+
return (
<div className="fixed bottom-6 left-1/2 transform -translate-x-1/2 z-50">
<div className="bg-background text-foreground rounded-xl shadow-lg px-2 py-2 flex items-center gap-1 border border-border">
@@ -154,53 +236,36 @@ function BulkToolbar() {
open={isActionsOpen}
onOpenChange={setIsActionsOpen}
>
- <CommandInput placeholder="Search actions..." />
- <CommandList>
- <CommandGroup heading="Actions">
- <CommandItem onSelect={handleBulkDelete}>
- <Trash2 className="w-4 h-4 mr-2" />
- Delete tasks
- </CommandItem>
- <CommandItem onSelect={handleBulkArchive}>
- <Archive className="w-4 h-4 mr-2" />
- Archive tasks
- </CommandItem>
- </CommandGroup>
-
- <CommandGroup heading="Change Status">
- {(project?.columns ?? []).map((col) => (
- <CommandItem
- key={col.id}
- onSelect={() => handleBulkChangeStatus(col.id)}
- >
- {getColumnIcon(col.id, col.isFinal)}
- {col.name}
- </CommandItem>
- ))}
- </CommandGroup>
-
- <CommandGroup heading="Assign to">
- {workspaceUsers?.members?.map((member) => (
- <CommandItem
- key={member.userId}
- onSelect={() => handleBulkAssign(member.userId)}
- >
- <Avatar className="h-6 w-6">
- <AvatarImage
- src={member.user?.image ?? ""}
- alt={member.user?.name || ""}
- />
- <AvatarFallback className="text-xs font-medium border border-border/30">
- {member.user?.name?.charAt(0).toUpperCase()}
- </AvatarFallback>
- </Avatar>
- <span className="text-sm">
- {member.user?.name || "Unknown User"}
- </span>
- </CommandItem>
- ))}
- </CommandGroup>
- </CommandList>
+ <CommandDialogPopup>
+ <Command items={groupedItems}>
+ <CommandInput placeholder="Search actions..." />
+ <CommandPanel>
+ <CommandEmpty>No actions found.</CommandEmpty>
+ <CommandList>
+ {(group: BulkActionGroup, groupIndex: number) => (
+ <Fragment key={group.value}>
+ <CommandGroup items={group.items}>
+ <CommandGroupLabel>{group.label}</CommandGroupLabel>
+ <CommandCollection>
+ {(item: BulkActionItem) => (
+ <CommandItem
+ key={item.value}
+ value={item.value}
+ onClick={item.onRun}
+ >
+ {item.icon}
+ <span className="text-sm">{item.label}</span>
+ </CommandItem>
+ )}
+ </CommandCollection>
+ </CommandGroup>
+ {groupIndex < groupedItems.length - 1 && <CommandSeparator />}
+ </Fragment>
+ )}
+ </CommandList>
+ </CommandPanel>
+ </Command>
+ </CommandDialogPopup>
</CommandDialog>
</div>
);
diff --git a/apps/web/src/components/command-palette/index.tsx b/apps/web/src/components/command-palette/index.tsx
index ae8879a2a..399808794 100644
--- a/apps/web/src/components/command-palette/index.tsx
+++ b/apps/web/src/components/command-palette/index.tsx
@@ -1,36 +1,51 @@
import { useNavigate } from "@tanstack/react-router";
import {
- FolderKanban,
- Keyboard,
- LayoutDashboard,
- Monitor,
- Moon,
- Plus,
- Search,
- Sun,
- Users,
+ ArrowDownIcon,
+ ArrowUpIcon,
+ CornerDownLeftIcon,
} from "lucide-react";
-import { useState } from "react";
+import { Fragment, useEffect, useMemo, useState } from "react";
import SearchCommandMenu from "@/components/search-command-menu";
import CreateTaskModal from "@/components/shared/modals/create-task-modal";
import CreateWorkspaceModal from "@/components/shared/modals/create-workspace-modal";
import {
+ Command,
+ CommandCollection,
CommandDialog,
+ CommandDialogPopup,
CommandEmpty,
+ CommandFooter,
CommandGroup,
+ CommandGroupLabel,
CommandInput,
CommandItem,
CommandList,
+ CommandPanel,
+ CommandSeparator,
+ CommandShortcut,
} from "@/components/ui/command";
-import { KbdSequence } from "@/components/ui/kbd";
+import { Kbd, KbdGroup } from "@/components/ui/kbd";
import { shortcuts } from "@/constants/shortcuts";
import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";
import { useRegisterShortcuts } from "@/hooks/use-keyboard-shortcuts";
import { useUserPreferencesStore } from "@/store/user-preferences";
import CreateProjectModal from "../shared/modals/create-project-modal";
+type PaletteActionItem = {
+ value: string;
+ label: string;
+ shortcut?: string;
+ onRun: () => void;
+};
+
+type PaletteGroup = {
+ value: string;
+ label: string;
+ items: PaletteActionItem[];
+};
+
function CommandPalette() {
- const { theme, setTheme } = useUserPreferencesStore();
+ const { setTheme } = useUserPreferencesStore();
const navigate = useNavigate();
const { data: workspace } = useActiveWorkspace();
const [open, setOpen] = useState(false);
@@ -40,6 +55,11 @@ function CommandPalette() {
const [isCreateWorkspaceOpen, setIsCreateWorkspaceOpen] = useState(false);
useRegisterShortcuts({
+ shortcuts: {
+ [shortcuts.help.key]: () => {
+ document.dispatchEvent(new KeyboardEvent("keydown", { key: "?" }));
+ },
+ },
modifierShortcuts: {
[shortcuts.palette.prefix]: {
[shortcuts.palette.open]: () => {
@@ -48,12 +68,19 @@ function CommandPalette() {
},
},
sequentialShortcuts: {
- [shortcuts.task.prefix]: {
- [shortcuts.task.create]: () => setIsCreateTaskOpen(true),
- },
[shortcuts.project.prefix]: {
+ [shortcuts.project.list]: () => {
+ if (!workspace?.id) return;
+ navigate({
+ to: "/dashboard/workspace/$workspaceId",
+ params: { workspaceId: workspace.id },
+ });
+ },
[shortcuts.project.create]: () => setIsCreateProjectOpen(true),
},
+ [shortcuts.task.prefix]: {
+ [shortcuts.task.create]: () => setIsCreateTaskOpen(true),
+ },
[shortcuts.workspace.prefix]: {
[shortcuts.workspace.create]: () => {
setIsCreateWorkspaceOpen(true);
@@ -62,187 +89,216 @@ function CommandPalette() {
},
});
- const runCommand = (command: () => unknown) => {
+ const runCommand = (command: () => void) => {
command();
setOpen(false);
};
- return (
- <>
- <CommandDialog open={open} onOpenChange={setOpen}>
- <CommandInput placeholder="Type a command or search..." />
- <CommandList>
- <CommandEmpty>No results found.</CommandEmpty>
+ const groupedItems = useMemo<PaletteGroup[]>(
+ () => [
+ {
+ value: "suggestions",
+ label: "Suggestions",
+ items: [
+ {
+ value: "projects",
+ label: "Projects",
+ shortcut: `${shortcuts.project.prefix} ${shortcuts.project.list}`,
+ onRun: () => {
+ if (!workspace?.id) return;
+ navigate({
+ to: "/dashboard/workspace/$workspaceId",
+ params: { workspaceId: workspace.id },
+ });
+ },
+ },
+ {
+ value: "search",
+ label: "Search",
+ shortcut: shortcuts.search.prefix,
+ onRun: () => setIsSearchOpen(true),
+ },
+ {
+ value: "members",
+ label: "Members",
+ onRun: () => {
+ if (!workspace?.id) return;
+ navigate({
+ to: "/dashboard/workspace/$workspaceId/members",
+ params: { workspaceId: workspace.id },
+ });
+ },
+ },
+ {
+ value: "create-task",
+ label: "Create task",
+ shortcut: `${shortcuts.task.prefix} ${shortcuts.task.create}`,
+ onRun: () => setIsCreateTaskOpen(true),
+ },
+ {
+ value: "create-project",
+ label: "Create project",
+ shortcut: `${shortcuts.project.prefix} ${shortcuts.project.create}`,
+ onRun: () => setIsCreateProjectOpen(true),
+ },
+ ],
+ },
+ {
+ value: "commands",
+ label: "Commands",
+ items: [
+ {
+ value: "create-workspace",
+ label: "Create workspace",
+ shortcut: `${shortcuts.workspace.prefix} ${shortcuts.workspace.create}`,
+ onRun: () => setIsCreateWorkspaceOpen(true),
+ },
+ {
+ value: "theme-light",
+ label: "Light theme",
+ onRun: () => setTheme("light"),
+ },
+ {
+ value: "theme-dark",
+ label: "Dark theme",
+ onRun: () => setTheme("dark"),
+ },
+ {
+ value: "theme-system",
+ label: "System theme",
+ onRun: () => setTheme("system"),
+ },
+ {
+ value: "keyboard-shortcuts",
+ label: "Keyboard shortcuts",
+ shortcut: "?",
+ onRun: () => {
+ setTimeout(() => {
+ document.dispatchEvent(
+ new KeyboardEvent("keydown", { key: "?" }),
+ );
+ }, 100);
+ },
+ },
+ ],
+ },
+ ],
+ [navigate, setTheme, workspace?.id],
+ );
+
+ const shortcutHandlers = useMemo(() => {
+ const handlers = new Map<string, () => void>();
+ for (const group of groupedItems) {
+ for (const item of group.items) {
+ if (!item.shortcut) continue;
+ handlers.set(item.shortcut.replace(/\s+/g, "").toLowerCase(), item.onRun);
+ }
+ }
+ return handlers;
+ }, [groupedItems]);
+
+ useEffect(() => {
+ if (!open) return;
+
+ let sequence = "";
+ let timeout: ReturnType<typeof setTimeout> | undefined;
+
+ const onKeyDown = (event: KeyboardEvent) => {
+ if (event.metaKey || event.ctrlKey || event.altKey || event.key === "Shift") {
+ return;
+ }
- <CommandGroup heading="Create">
- <CommandItem
- onSelect={() => {
- runCommand(() => {
- setIsCreateTaskOpen(true);
- });
- }}
- >
- <Plus className="mr-2 h-4 w-4" />
- <span>Create task</span>
- <KbdSequence
- keys={[shortcuts.task.prefix, shortcuts.task.create]}
- className="ml-auto"
- description="Create task"
- />
- </CommandItem>
- <CommandItem
- onSelect={() => {
- runCommand(() => {
- setIsCreateProjectOpen(true);
- });
- }}
- >
- <FolderKanban className="mr-2 h-4 w-4" />
- <span>Create project</span>
- <KbdSequence
- keys={[shortcuts.project.prefix, shortcuts.project.create]}
- className="ml-auto"
- description="Create project"
- />
- </CommandItem>
- <CommandItem
- onSelect={() => {
- runCommand(() => {
- setIsCreateWorkspaceOpen(true);
- });
- }}
- >
- <Plus className="mr-2 h-4 w-4" />
- <span>Create workspace</span>
- <KbdSequence
- keys={[shortcuts.workspace.prefix, shortcuts.workspace.create]}
- className="ml-auto"
- description="Create workspace"
- />
- </CommandItem>
- </CommandGroup>
+ if (event.key.length !== 1 && event.key !== "?") {
+ return;
+ }
- <CommandGroup heading="Navigation">
- <CommandItem
- onSelect={() =>
- runCommand(() =>
- navigate({
- to: "/dashboard/workspace/$workspaceId",
- params: { workspaceId: workspace?.id ?? "" },
- }),
- )
- }
- >
- <LayoutDashboard className="mr-2 h-4 w-4" />
- <span>Projects</span>
- </CommandItem>
- <CommandItem
- onSelect={() =>
- runCommand(() => {
- setIsSearchOpen(true);
- })
- }
- >
- <Search className="mr-2 h-4 w-4" />
- <span>Search</span>
- <KbdSequence
- keys={[shortcuts.search.prefix]}
- className="ml-auto"
- description="Search"
- />
- </CommandItem>
- <CommandItem
- onSelect={() =>
- runCommand(() =>
- navigate({
- to: "/dashboard/workspace/$workspaceId/members",
- params: { workspaceId: workspace?.id ?? "" },
- }),
- )
- }
- >
- <Users className="mr-2 h-4 w-4" />
- <span>Members</span>
- </CommandItem>
- {/* <CommandItem
- onSelect={() =>
- runCommand(() =>
- navigate({
- to: "/dashboard/workspace/$workspaceId/settings",
- params: { workspaceId: workspace?.id ?? "" },
- }),
- )
- }
- >
- <Settings className="mr-2 h-4 w-4" />
- <span>Settings</span>
- </CommandItem> */}
- </CommandGroup>
+ sequence = `${sequence}${event.key.toLowerCase()}`.slice(-3);
+ clearTimeout(timeout);
+ timeout = setTimeout(() => {
+ sequence = "";
+ }, 700);
- <CommandGroup heading="Theme">
- <CommandItem
- onSelect={() =>
- runCommand(() => {
- setTheme("light");
- })
- }
- >
- <Sun className="mr-2 h-4 w-4" />
- <span>Light theme</span>
- {theme === "light" && (
- <div className="ml-auto h-2 w-2 rounded-full bg-primary" />
- )}
- </CommandItem>
- <CommandItem
- onSelect={() =>
- runCommand(() => {
- setTheme("dark");
- })
- }
- >
- <Moon className="mr-2 h-4 w-4" />
- <span>Dark theme</span>
- {theme === "dark" && (
- <div className="ml-auto h-2 w-2 rounded-full bg-primary" />
- )}
- </CommandItem>
- <CommandItem
- onSelect={() =>
- runCommand(() => {
- setTheme("system");
- })
- }
- >
- <Monitor className="mr-2 h-4 w-4" />
- <span>System theme</span>
- {theme === "system" && (
- <div className="ml-auto h-2 w-2 rounded-full bg-primary" />
- )}
- </CommandItem>
- </CommandGroup>
+ const handler = shortcutHandlers.get(sequence);
+ if (!handler) return;
- <CommandGroup heading="Help">
- <CommandItem
- onSelect={() => {
- setOpen(false);
- setTimeout(() => {
- document.dispatchEvent(
- new KeyboardEvent("keydown", { key: "?" }),
- );
- }, 100);
- }}
- >
- <Keyboard className="mr-2 h-4 w-4" />
- <span>Keyboard shortcuts</span>
- <KbdSequence
- keys={["?"]}
- className="ml-auto"
- description="Show keyboard shortcuts"
- />
- </CommandItem>
- </CommandGroup>
- </CommandList>
+ event.preventDefault();
+ runCommand(handler);
+ sequence = "";
+ clearTimeout(timeout);
+ };
+
+ document.addEventListener("keydown", onKeyDown);
+ return () => {
+ clearTimeout(timeout);
+ document.removeEventListener("keydown", onKeyDown);
+ };
+ }, [open, shortcutHandlers]);
+
+ return (
+ <>
+ <CommandDialog open={open} onOpenChange={setOpen}>
+ <CommandDialogPopup className="max-w-4xl">
+ <Command items={groupedItems}>
+ <CommandInput placeholder="Search for apps and commands..." />
+ <CommandPanel>
+ <CommandEmpty>No results found.</CommandEmpty>
+ <CommandList>
+ {(group: PaletteGroup, groupIndex: number) => (
+ <Fragment key={group.value}>
+ <CommandGroup items={group.items}>
+ <CommandGroupLabel>{group.label}</CommandGroupLabel>
+ <CommandCollection>
+ {(item: PaletteActionItem) => {
+ return (
+ <CommandItem
+ key={item.value}
+ value={item.value}
+ onClick={() => runCommand(item.onRun)}
+ className="px-3"
+ >
+ <span className="flex-1">{item.label}</span>
+ {item.shortcut && (
+ <CommandShortcut>{item.shortcut}</CommandShortcut>
+ )}
+ </CommandItem>
+ );
+ }}
+ </CommandCollection>
+ </CommandGroup>
+ {groupIndex < groupedItems.length - 1 && <CommandSeparator />}
+ </Fragment>
+ )}
+ </CommandList>
+ </CommandPanel>
+ <CommandFooter>
+ <div className="flex items-center gap-4">
+ <div className="flex items-center gap-2">
+ <KbdGroup>
+ <Kbd>
+ <ArrowUpIcon />
+ </Kbd>
+ <Kbd>
+ <ArrowDownIcon />
+ </Kbd>
+ </KbdGroup>
+ <span>Navigate</span>
+ </div>
+ <div className="flex items-center gap-2">
+ <Kbd>
+ <CornerDownLeftIcon />
+ </Kbd>
+ <span>Open</span>
+ </div>
+ </div>
+ <div className="flex items-center gap-2">
+ <Kbd>Esc</Kbd>
+ <span>Close</span>
+ </div>
+ </CommandFooter>
+ </Command>
+ </CommandDialogPopup>
</CommandDialog>
+
<SearchCommandMenu open={isSearchOpen} setOpen={setIsSearchOpen} />
<CreateTaskModal
open={isCreateTaskOpen}
diff --git a/apps/web/src/components/common/layout.tsx b/apps/web/src/components/common/layout.tsx
index db3a80ba1..f11c13543 100644
--- a/apps/web/src/components/common/layout.tsx
+++ b/apps/web/src/components/common/layout.tsx
@@ -50,7 +50,7 @@ function Layout({ children, className }: LayoutProps) {
useUserPreferencesEffects();
return (
- <div className="flex w-full bg-sidebar">
+ <div className="flex w-full bg-background">
<SidebarProvider
defaultOpen={sidebarDefaultOpen}
style={
@@ -63,7 +63,7 @@ function Layout({ children, className }: LayoutProps) {
<AppSidebar />
<SidebarInset
className={cn(
- "flex-1 flex flex-col overflow-auto bg-card border border-border rounded-md m-2",
+ "m-2 flex flex-1 flex-col overflow-auto rounded-xl border border-border/80 bg-background shadow-sm/5",
className,
)}
>
diff --git a/apps/web/src/components/common/logo.tsx b/apps/web/src/components/common/logo.tsx
index e1c26bcf2..f9c3f2770 100644
--- a/apps/web/src/components/common/logo.tsx
+++ b/apps/web/src/components/common/logo.tsx
@@ -22,7 +22,7 @@ export function Logo({ className = "" }: LogoProps) {
viewBox="0 0 450 104"
fill="none"
xmlns="http://www.w3.org/2000/svg"
- className="h-6 w-auto text-[#1E1E1E] dark:text-white"
+ className="h-6 w-auto text-foreground"
>
<title>Kaneo Logo</title>
<path
diff --git a/apps/web/src/components/common/project-layout.tsx b/apps/web/src/components/common/project-layout.tsx
index e824f78ed..c95acb8bb 100644
--- a/apps/web/src/components/common/project-layout.tsx
+++ b/apps/web/src/components/common/project-layout.tsx
@@ -12,7 +12,6 @@ import {
} from "@/components/ui/breadcrumb";
import { Button } from "@/components/ui/button";
import { KbdSequence } from "@/components/ui/kbd";
-import { Separator } from "@/components/ui/separator";
import { SidebarTrigger } from "@/components/ui/sidebar";
import {
Tooltip,
@@ -62,7 +61,7 @@ export default function ProjectLayout({
return (
<Layout>
- <Layout.Header>
+ <Layout.Header className="border-border/80">
<div className="flex items-center justify-between w-full">
<div className="flex items-center gap-5 w-full">
<div className="flex items-center gap-1">
@@ -84,19 +83,16 @@ export default function ProjectLayout({
</TooltipContent>
</Tooltip>
</TooltipProvider>
- <Separator
- orientation="vertical"
- className="mx-1.5 data-[orientation=vertical]:h-2.5"
- />
+ <div className="mx-1.5 h-4 w-px shrink-0 bg-border/80" />
<Breadcrumb className="flex items-center text-xs">
<BreadcrumbList className="!gap-1">
<BreadcrumbItem>
<BreadcrumbLink
href={`/dashboard/workspace/${workspaceId}`}
>
- <h1 className="text-xs text-muted-foreground">
+ <span className="text-xs font-normal text-muted-foreground">
{workspace?.name}
- </h1>
+ </span>
</BreadcrumbLink>
</BreadcrumbItem>
<BreadcrumbSeparator />
@@ -104,9 +100,9 @@ export default function ProjectLayout({
<BreadcrumbLink
href={`/dashboard/workspace/${workspaceId}/project/${projectId}/board`}
>
- <h1 className="text-xs text-muted-foreground">
+ <span className="text-xs font-normal text-muted-foreground">
{project?.name}
- </h1>
+ </span>
</BreadcrumbLink>
</BreadcrumbItem>
</BreadcrumbList>
@@ -120,7 +116,7 @@ export default function ProjectLayout({
onClick={handleNavigateToBacklog}
className={cn(
"gap-1.5 h-6 px-2 text-xs text-muted-foreground",
- isBacklogRoute && "text-black dark:text-white",
+ isBacklogRoute && "text-foreground",
)}
>
<SquircleDashed className="w-3 h-3" />
@@ -136,7 +132,7 @@ export default function ProjectLayout({
<span
className={cn(
"text-xs text-muted-foreground",
- isBoardRoute && "text-black dark:text-white",
+ isBoardRoute && "text-foreground",
)}
>
Tasks
diff --git a/apps/web/src/components/common/workspace-layout.tsx b/apps/web/src/components/common/workspace-layout.tsx
index 79d58daef..0045bb430 100644
--- a/apps/web/src/components/common/workspace-layout.tsx
+++ b/apps/web/src/components/common/workspace-layout.tsx
@@ -9,7 +9,6 @@ import {
BreadcrumbSeparator,
} from "@/components/ui/breadcrumb";
import { KbdSequence } from "@/components/ui/kbd";
-import { Separator } from "@/components/ui/separator";
import { SidebarTrigger } from "@/components/ui/sidebar";
import {
Tooltip,
@@ -60,22 +59,21 @@ export default function WorkspaceLayout({
</TooltipContent>
</Tooltip>
</TooltipProvider>
- <Separator
- orientation="vertical"
- className="mx-1.5 data-[orientation=vertical]:h-2.5"
- />
+ <div className="mx-1.5 h-4 w-px shrink-0 bg-border/80" />
<Breadcrumb className="flex items-center gap-1 text-xs w-full">
<BreadcrumbList>
<BreadcrumbItem>
<BreadcrumbLink href="/">
- <h1 className="text-xs text-card-foreground">
+ <span className="text-xs font-normal text-card-foreground">
{workspace?.name}
- </h1>
+ </span>
</BreadcrumbLink>
</BreadcrumbItem>
<BreadcrumbSeparator />
<BreadcrumbItem>
- <h1 className="text-xs text-card-foreground">{title}</h1>
+ <span className="text-xs font-normal text-card-foreground">
+ {title}
+ </span>
</BreadcrumbItem>
</BreadcrumbList>
</Breadcrumb>
diff --git a/apps/web/src/components/demo-alert.tsx b/apps/web/src/components/demo-alert.tsx
index ec1cfab28..aa2efdfb2 100644
--- a/apps/web/src/components/demo-alert.tsx
+++ b/apps/web/src/components/demo-alert.tsx
@@ -2,8 +2,8 @@ import { Button } from "./ui/button";
export function DemoAlert() {
return (
- <div className="flex sticky top-0 left-0 right-0 flex-col bg-amber-500/10 border-b border-amber-500/20 px-4 py-3 text-center">
- <div className="flex flex-col sm:flex-row items-center justify-center gap-2 text-sm text-amber-900 dark:text-amber-300">
+ <div className="sticky top-0 left-0 right-0 flex flex-col border-warning/30 border-b bg-warning/10 px-4 py-3 text-center">
+ <div className="flex flex-col items-center justify-center gap-2 text-sm text-warning-foreground sm:flex-row">
<p className="flex flex-col sm:flex-row items-center gap-2">
This is a demo environment. All data will be automatically purged
every hour.
@@ -11,7 +11,7 @@ export function DemoAlert() {
onClick={() =>
window.open("https://github.com/usekaneo/kaneo", "_blank")
}
- className="text-xs bg-amber-500/10 hover:bg-amber-500/20 text-amber-900 dark:text-amber-300 h-7 sm:h-6 px-3 sm:px-2 whitespace-nowrap"
+ className="h-7 whitespace-nowrap bg-warning/15 px-3 text-warning-foreground text-xs hover:bg-warning/25 sm:h-6 sm:px-2"
>
Deploy your own
</Button>
diff --git a/apps/web/src/components/external-links/external-links-accordion.tsx b/apps/web/src/components/external-links/external-links-accordion.tsx
index 8194047e5..64d519743 100644
--- a/apps/web/src/components/external-links/external-links-accordion.tsx
+++ b/apps/web/src/components/external-links/external-links-accordion.tsx
@@ -64,7 +64,7 @@ export function ExternalLinksAccordion({
if (isMerged) {
return (
- <span className="text-xs font-medium text-purple-500 flex items-center gap-1">
+ <span className="flex items-center gap-1 font-medium text-info-foreground text-xs">
<GitMerge className="size-3" />
Merged
</span>
@@ -81,7 +81,7 @@ export function ExternalLinksAccordion({
}
return (
- <span className="text-xs font-medium text-green-500 flex items-center gap-1">
+ <span className="flex items-center gap-1 font-medium text-success-foreground text-xs">
<GitPullRequest className="size-3" />
Open
</span>
diff --git a/apps/web/src/components/kanban-board/column/column-footer.tsx b/apps/web/src/components/kanban-board/column/column-footer.tsx
index 0eb3144e1..2b7620ea8 100644
--- a/apps/web/src/components/kanban-board/column/column-footer.tsx
+++ b/apps/web/src/components/kanban-board/column/column-footer.tsx
@@ -22,9 +22,9 @@ export function ColumnFooter({ column }: ColumnFooterProps) {
<button
type="button"
onClick={() => setIsTaskModalOpen(true)}
- className="w-full text-left px-3 py-2 text-sm text-zinc-600 hover:bg-zinc-100 dark:text-zinc-400 dark:hover:bg-zinc-800/50 rounded-md flex items-center gap-2 transition-all"
+ className="w-full text-left px-3 py-2 text-sm text-muted-foreground hover:bg-accent/50 rounded-md flex items-center gap-2 transition-all"
>
- <Plus className="w-4 h-4 text-zinc-500 dark:text-zinc-400" />
+ <Plus className="w-4 h-4 text-muted-foreground" />
<span>Add task</span>
</button>
</div>
diff --git a/apps/web/src/components/kanban-board/column/column-header.tsx b/apps/web/src/components/kanban-board/column/column-header.tsx
index 8cb5e2ba5..c5e26394f 100644
--- a/apps/web/src/components/kanban-board/column/column-header.tsx
+++ b/apps/web/src/components/kanban-board/column/column-header.tsx
@@ -1,6 +1,6 @@
import { produce } from "immer";
import { Archive } from "lucide-react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { useUpdateTask } from "@/hooks/mutations/task/use-update-task";
import { getColumnIcon } from "@/lib/column";
import useProjectStore from "@/store/project";
@@ -48,10 +48,10 @@ export function ColumnHeader({ column }: ColumnHeaderProps) {
<div className="flex items-center justify-between">
<div className="flex items-center gap-2">
{getColumnIcon(column.id, column.isFinal)}
- <h3 className="font-medium text-zinc-900 dark:text-zinc-100">
+ <span className="text-[15px] font-medium text-foreground/95">
{column.name}
- </h3>
- <span className="text-sm text-zinc-500 dark:text-zinc-500">
+ </span>
+ <span className="text-[15px] font-normal text-muted-foreground">
{column.tasks.length}
</span>
</div>
@@ -60,10 +60,10 @@ export function ColumnHeader({ column }: ColumnHeaderProps) {
<button
type="button"
onClick={handleArchiveTasks}
- className="text-left px-2 py-1.5 text-zinc-600 hover:bg-zinc-100 dark:text-zinc-400 dark:hover:bg-zinc-800/50 rounded-md flex items-center transition-all group"
+ className="text-left px-2 py-1.5 text-muted-foreground hover:bg-accent/50 rounded-md flex items-center transition-all group"
title="Archive all completed tasks"
>
- <Archive className="w-4 h-4 text-zinc-500 dark:text-zinc-400" />
+ <Archive className="w-4 h-4 text-muted-foreground" />
</button>
)}
</div>
diff --git a/apps/web/src/components/kanban-board/column/index.tsx b/apps/web/src/components/kanban-board/column/index.tsx
index b86cf3006..ac93631f0 100644
--- a/apps/web/src/components/kanban-board/column/index.tsx
+++ b/apps/web/src/components/kanban-board/column/index.tsx
@@ -16,10 +16,10 @@ function Column({ column }: ColumnProps) {
return (
<div
- className={`flex flex-col h-full w-full min-h-0 backdrop-blur-xs rounded-lg relative group transition-all duration-300 ease-out ${
+ className={`group relative flex h-full min-h-0 w-full flex-col rounded-lg border transition-all duration-300 ease-out ${
isDropzoneOver
- ? "bg-indigo-50/60 dark:bg-indigo-950/40 ring-1 ring-indigo-200 dark:ring-indigo-800/50 shadow-md shadow-indigo-500/10"
- : "bg-sidebar border border-border/50 dark:bg-zinc-900/30 hover:bg-zinc-50/40 dark:hover:bg-zinc-900/40 hover:shadow-sm"
+ ? "border-ring/40 bg-accent/55 shadow-sm ring-2 ring-ring/30"
+ : "border-border bg-muted/45 shadow-xs/5 hover:bg-muted/60 hover:shadow-sm"
}`}
>
<CreateTaskModal
@@ -40,7 +40,7 @@ function Column({ column }: ColumnProps) {
<button
type="button"
onClick={() => setIsTaskModalOpen(true)}
- className="w-full text-left px-2 py-1 text-sm text-zinc-500 hover:text-zinc-700 dark:text-zinc-500 dark:hover:text-zinc-300 hover:bg-zinc-50 dark:hover:bg-zinc-800/30 rounded-md flex items-center gap-2 transition-all"
+ className="w-full text-left px-2 py-1 text-sm text-muted-foreground hover:text-foreground hover:bg-accent/40 rounded-md flex items-center gap-2 transition-all"
>
<Plus className="w-4 h-4" />
<span>Add task</span>
diff --git a/apps/web/src/components/kanban-board/index.tsx b/apps/web/src/components/kanban-board/index.tsx
index d2737d043..ad04566f1 100644
--- a/apps/web/src/components/kanban-board/index.tsx
+++ b/apps/web/src/components/kanban-board/index.tsx
@@ -184,7 +184,7 @@ function KanbanBoard({ project }: KanbanBoardProps) {
<div className="h-full flex flex-col w-full">
<header className="mb-6 mt-6 space-y-6 shrink-0 px-6">
<div className="flex items-center justify-between">
- <div className="w-48 h-8 bg-zinc-100 dark:bg-zinc-800/50 rounded-md animate-pulse" />
+ <div className="w-48 h-8 bg-muted/50 rounded-md animate-pulse" />
</div>
</header>
@@ -196,11 +196,11 @@ function KanbanBoard({ project }: KanbanBoardProps) {
// biome-ignore lint/suspicious/noArrayIndexKey: It's a skeleton
i
}`}
- className="flex-1 w-full min-w-80 flex flex-col bg-zinc-50 dark:bg-zinc-900 rounded-lg h-full"
+ className="flex-1 w-full min-w-80 flex flex-col bg-background rounded-lg h-full"
>
<div className="px-4 py-3 flex items-center justify-between">
- <div className="w-24 h-5 bg-zinc-100 dark:bg-zinc-800/50 rounded animate-pulse" />
- <div className="w-8 h-5 bg-zinc-100 dark:bg-zinc-800/50 rounded animate-pulse" />
+ <div className="w-24 h-5 bg-muted/50 rounded animate-pulse" />
+ <div className="w-8 h-5 bg-muted/50 rounded animate-pulse" />
</div>
<div className="px-2 pb-4 flex flex-col gap-3 flex-1">
@@ -210,11 +210,11 @@ function KanbanBoard({ project }: KanbanBoardProps) {
// biome-ignore lint/suspicious/noArrayIndexKey: It's a skeleton
j
}`}
- className="p-4 bg-white dark:bg-zinc-800 rounded-lg border border-zinc-200 dark:border-zinc-800/50 animate-pulse"
+ className="p-4 bg-card rounded-lg border border-border/50 animate-pulse"
>
<div className="space-y-3">
- <div className="w-2/3 h-4 bg-zinc-200 dark:bg-zinc-700/50 rounded" />
- <div className="w-1/2 h-3 bg-zinc-200 dark:bg-zinc-700/50 rounded" />
+ <div className="w-2/3 h-4 bg-muted/70 rounded" />
+ <div className="w-1/2 h-3 bg-muted/70 rounded" />
</div>
</div>
))}
@@ -241,7 +241,7 @@ function KanbanBoard({ project }: KanbanBoardProps) {
onDragEnd={handleDragEnd}
>
<div className="h-full flex flex-col w-full">
- <div className="flex-1 min-h-0 overflow-x-auto [-webkit-overflow-scrolling:touch]">
+ <div className="flex-1 min-h-0 overflow-x-auto bg-background [-webkit-overflow-scrolling:touch]">
<div className="flex gap-3 p-3 h-full min-w-max transition-all duration-200 ease-out">
{project.columns?.map((column) => (
<div
@@ -256,8 +256,8 @@ function KanbanBoard({ project }: KanbanBoardProps) {
</div>
<DragOverlay dropAnimation={dropAnimation}>
{activeTask ? (
- <div className="transform rotate-1 scale-[1.03] shadow-xl shadow-indigo-500/20 dark:shadow-indigo-400/10">
- <div className="ring-2 ring-indigo-500/30 dark:ring-indigo-400/40 rounded-lg">
+ <div className="transform rotate-1 scale-[1.03] shadow-lg">
+ <div className="ring-2 ring-ring/35 rounded-lg">
<TaskCard task={activeTask} />
</div>
</div>
diff --git a/apps/web/src/components/kanban-board/task-card-context-menu/task-card-context-menu-content.tsx b/apps/web/src/components/kanban-board/task-card-context-menu/task-card-context-menu-content.tsx
index d52b6de88..15210eb34 100644
--- a/apps/web/src/components/kanban-board/task-card-context-menu/task-card-context-menu-content.tsx
+++ b/apps/web/src/components/kanban-board/task-card-context-menu/task-card-context-menu-content.tsx
@@ -1,6 +1,6 @@
import { X } from "lucide-react";
import { useMemo } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { Calendar } from "@/components/ui/calendar";
import {
diff --git a/apps/web/src/components/kanban-board/task-card.tsx b/apps/web/src/components/kanban-board/task-card.tsx
index 9823c948c..5a2d68c0c 100644
--- a/apps/web/src/components/kanban-board/task-card.tsx
+++ b/apps/web/src/components/kanban-board/task-card.tsx
@@ -10,11 +10,11 @@ import {
GitPullRequest,
} from "lucide-react";
import { type CSSProperties, useMemo, useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import {
AlertDialog,
- AlertDialogAction,
- AlertDialogCancel,
+ AlertDialogClose,
+
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
@@ -26,7 +26,7 @@ import {
HoverCard,
HoverCardContent,
HoverCardTrigger,
-} from "@/components/ui/hover-card";
+} from "@/components/ui/preview-card";
import { useDeleteTask } from "@/hooks/mutations/task/use-delete-task";
import useExternalLinks from "@/hooks/queries/external-link/use-external-links";
import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";
@@ -83,9 +83,9 @@ function TaskCard({ task }: TaskCardProps) {
if (isMerged) {
return {
- icon: <GitMerge className="h-3 w-3 text-purple-400" />,
+ icon: <GitMerge className="h-3 w-3 text-info-foreground" />,
status: "Merged",
- statusClass: "text-purple-400",
+ statusClass: "text-info-foreground",
};
}
@@ -98,9 +98,9 @@ function TaskCard({ task }: TaskCardProps) {
}
return {
- icon: <GitPullRequest className="h-3 w-3 text-green-400" />,
+ icon: <GitPullRequest className="h-3 w-3 text-success-foreground" />,
status: "Open",
- statusClass: "text-green-400",
+ statusClass: "text-success-foreground",
};
};
@@ -179,9 +179,9 @@ function TaskCard({ task }: TaskCardProps) {
onClick={handleTaskCardClick}
className={`group bg-card border border-border rounded-lg p-3 cursor-move transition-all duration-200 ease-out relative ${
isDragging
- ? "border-primary/30 shadow-lg shadow-primary/10 bg-card/90"
+ ? "border-ring/40 shadow-lg bg-card/95"
: "hover:border-border/70 hover:shadow-sm"
- } ${isTaskSelected ? "bg-primary/10 shadow-sm" : ""} ${isTaskFocused ? "ring-2 ring-inset ring-indigo-500/50 dark:ring-indigo-400/50" : ""}`}
+ } ${isTaskSelected ? "bg-accent/50 shadow-sm" : ""} ${isTaskFocused ? "ring-2 ring-inset ring-ring/50" : ""}`}
onKeyDown={(e) => {
if (e.key === "Enter") {
handleTaskCardClick(e);
@@ -222,8 +222,8 @@ function TaskCard({ task }: TaskCardProps) {
)}
<div className="mb-3 pr-7">
- <h3
- className="font-medium text-foreground text-sm leading-relaxed overflow-hidden break-words"
+ <div
+ className="text-[15px] font-medium text-foreground/95 leading-6 overflow-hidden break-words"
style={{
display: "-webkit-box",
WebkitLineClamp: 3,
@@ -233,7 +233,7 @@ function TaskCard({ task }: TaskCardProps) {
}}
>
{task.title}
- </h3>
+ </div>
</div>
{showLabels && (
@@ -312,9 +312,9 @@ function TaskCard({ task }: TaskCardProps) {
(pr) => pr.metadata?.merged,
);
const iconColor = allMerged
- ? "text-purple-400"
+ ? "text-info-foreground"
: hasOpen
- ? "text-green-400"
+ ? "text-success-foreground"
: "text-muted-foreground";
return (
@@ -400,13 +400,13 @@ function TaskCard({ task }: TaskCardProps) {
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
- <AlertDialogCancel>Cancel</AlertDialogCancel>
- <AlertDialogAction
+ <AlertDialogClose>Cancel</AlertDialogClose>
+ <AlertDialogClose
onClick={handleDeleteTask}
className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
>
Delete Task
- </AlertDialogAction>
+ </AlertDialogClose>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
diff --git a/apps/web/src/components/kanban-board/task-labels.tsx b/apps/web/src/components/kanban-board/task-labels.tsx
index b6e1881a4..b662bb78c 100644
--- a/apps/web/src/components/kanban-board/task-labels.tsx
+++ b/apps/web/src/components/kanban-board/task-labels.tsx
@@ -2,15 +2,15 @@ import { Badge } from "@/components/ui/badge";
import useGetLabelsByTask from "@/hooks/queries/label/use-get-labels-by-task";
const labelColors = [
- { value: "gray", label: "Stone", color: "#78716c" },
- { value: "dark-gray", label: "Slate", color: "#64748b" },
- { value: "purple", label: "Lavender", color: "#8b5cf6" },
- { value: "teal", label: "Sage", color: "#059669" },
- { value: "green", label: "Forest", color: "#16a34a" },
- { value: "yellow", label: "Amber", color: "#d97706" },
- { value: "orange", label: "Terracotta", color: "#ea580c" },
- { value: "pink", label: "Rose", color: "#e11d48" },
- { value: "red", label: "Crimson", color: "#dc2626" },
+ { value: "gray", label: "Stone", color: "var(--color-stone-500)" },
+ { value: "dark-gray", label: "Slate", color: "var(--color-slate-500)" },
+ { value: "purple", label: "Lavender", color: "var(--color-violet-500)" },
+ { value: "teal", label: "Sage", color: "var(--color-emerald-600)" },
+ { value: "green", label: "Forest", color: "var(--color-green-600)" },
+ { value: "yellow", label: "Amber", color: "var(--color-amber-600)" },
+ { value: "orange", label: "Terracotta", color: "var(--color-orange-600)" },
+ { value: "pink", label: "Rose", color: "var(--color-rose-600)" },
+ { value: "red", label: "Crimson", color: "var(--color-red-600)" },
];
function TaskCardLabels({ taskId }: { taskId: string }) {
@@ -32,7 +32,7 @@ function TaskCardLabels({ taskId }: { taskId: string }) {
style={{
backgroundColor:
labelColors.find((c) => c.value === label.color)?.color ||
- "#94a3b8",
+ "var(--color-neutral-400)",
}}
/>
<span className="truncate max-w-[80px]">{label.name}</span>
diff --git a/apps/web/src/components/list-view/index.tsx b/apps/web/src/components/list-view/index.tsx
index c1bf52390..270ab0bd3 100644
--- a/apps/web/src/components/list-view/index.tsx
+++ b/apps/web/src/components/list-view/index.tsx
@@ -22,7 +22,7 @@ import { useNavigate } from "@tanstack/react-router";
import { produce } from "immer";
import { Archive, ChevronRight, Flag, Plus } from "lucide-react";
import { useEffect, useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { priorityColorsTaskCard } from "@/constants/priority-colors";
import { useUpdateTask } from "@/hooks/mutations/task/use-update-task";
import { useRegisterShortcuts } from "@/hooks/use-keyboard-shortcuts";
@@ -265,16 +265,16 @@ function ListView({ project }: ListViewProps) {
return (
<div
className={cn(
- "border-b border-zinc-200 dark:border-zinc-800/50 transition-all duration-200 overflow-auto",
+ "border-b border-border/50 transition-all duration-200 overflow-auto",
showDropIndicator &&
- "border-l-4 border-l-indigo-500 dark:border-l-indigo-400 bg-indigo-50/30 dark:bg-indigo-950/10",
+ "border-l-4 border-l-ring bg-accent/35",
)}
>
- <div className="flex items-center justify-between py-2 px-4 bg-zinc-100/60 dark:bg-zinc-800/20 border-b border-zinc-200/50 dark:border-zinc-800/30">
+ <div className="flex items-center justify-between py-2 px-4 bg-muted/60 border-b border-border/50">
<button
type="button"
onClick={() => toggleSection(column.id)}
- className="flex items-center gap-2 text-sm font-medium text-zinc-800 dark:text-zinc-300 hover:text-zinc-900 dark:hover:text-zinc-100 transition-colors"
+ className="flex items-center gap-2 text-sm font-medium text-foreground hover:text-foreground transition-colors"
>
<ChevronRight
className={cn(
@@ -286,7 +286,7 @@ function ListView({ project }: ListViewProps) {
{getColumnIcon(column.id, column.isFinal)}
<div className="flex items-center gap-1">
<span className="mt-1 mr-1">{column.name}</span>
- <span className="text-xs text-zinc-400 dark:text-zinc-500 mt-0.5">
+ <span className="text-xs text-muted-foreground mt-0.5">
{column.tasks.length}
</span>
</div>
@@ -300,7 +300,7 @@ function ListView({ project }: ListViewProps) {
setIsTaskModalOpen(true);
setActiveColumn(column.id);
}}
- className="p-1 hover:bg-zinc-200/70 dark:hover:bg-zinc-700 rounded text-zinc-600 hover:text-zinc-800 dark:text-zinc-500 dark:hover:text-zinc-300 transition-colors"
+ className="p-1 hover:bg-accent rounded text-muted-foreground hover:text-foreground transition-colors"
title="Add task"
>
<Plus className="w-3 h-3" />
@@ -310,7 +310,7 @@ function ListView({ project }: ListViewProps) {
<button
type="button"
onClick={() => handleArchiveTasks(column)}
- className="p-1 hover:bg-zinc-200/70 dark:hover:bg-zinc-700 rounded text-zinc-600 hover:text-zinc-800 dark:text-zinc-500 dark:hover:text-zinc-300 transition-colors"
+ className="p-1 hover:bg-accent rounded text-muted-foreground hover:text-foreground transition-colors"
title="Archive all completed tasks"
>
<Archive className="w-3 h-3" />
@@ -320,7 +320,7 @@ function ListView({ project }: ListViewProps) {
</div>
{expandedSections[column.id] && (
- <div ref={setNodeRef} className="bg-white dark:bg-transparent">
+ <div ref={setNodeRef} className="bg-card">
<SortableContext
items={column.tasks}
strategy={verticalListSortingStrategy}
@@ -335,7 +335,7 @@ function ListView({ project }: ListViewProps) {
</SortableContext>
{column.tasks.length === 0 && (
- <div className="py-6 px-4 text-center text-xs text-zinc-400 dark:text-zinc-500">
+ <div className="py-6 px-4 text-center text-xs text-muted-foreground">
No tasks
</div>
)}
@@ -364,8 +364,8 @@ function ListView({ project }: ListViewProps) {
onDragEnd={handleDragEnd}
modifiers={[snapCenterToCursor]}
>
- <div className="w-full h-full overflow-auto bg-zinc-50/30 dark:bg-transparent">
- <div className="divide-y divide-zinc-200 dark:divide-zinc-800/50">
+ <div className="w-full h-full overflow-auto bg-muted/20">
+ <div className="divide-y divide-border/50">
{project.columns.map((column) => (
<ColumnSection key={column.id} column={column} />
))}
@@ -374,7 +374,7 @@ function ListView({ project }: ListViewProps) {
<DragOverlay>
{activeTask && (
- <div className="bg-white dark:bg-zinc-800 border border-zinc-200 dark:border-zinc-700 rounded-lg shadow-lg p-2 max-w-[200px] cursor-grabbing">
+ <div className="bg-card border border-border rounded-lg shadow-lg p-2 max-w-[200px] cursor-grabbing">
<div className="flex items-center gap-2">
<div className="flex-shrink-0">
<Flag
@@ -389,10 +389,10 @@ function ListView({ project }: ListViewProps) {
<div className="flex-1 min-w-0">
<div className="flex items-center gap-1.5">
- <span className="text-[10px] font-mono text-zinc-400 dark:text-zinc-500">
+ <span className="text-[10px] font-mono text-muted-foreground">
{project?.slug}-{activeTask.number}
</span>
- <span className="text-xs text-zinc-900 dark:text-zinc-100 truncate">
+ <span className="text-xs text-foreground truncate">
{activeTask.title}
</span>
</div>
diff --git a/apps/web/src/components/list-view/task-row.tsx b/apps/web/src/components/list-view/task-row.tsx
index 19b98daac..4663419cf 100644
--- a/apps/web/src/components/list-view/task-row.tsx
+++ b/apps/web/src/components/list-view/task-row.tsx
@@ -10,11 +10,11 @@ import {
GitPullRequest,
} from "lucide-react";
import { type CSSProperties, useMemo, useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import {
AlertDialog,
- AlertDialogAction,
- AlertDialogCancel,
+ AlertDialogClose,
+
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
@@ -26,7 +26,7 @@ import {
HoverCard,
HoverCardContent,
HoverCardTrigger,
-} from "@/components/ui/hover-card";
+} from "@/components/ui/preview-card";
import { useDeleteTask } from "@/hooks/mutations/task/use-delete-task";
import useExternalLinks from "@/hooks/queries/external-link/use-external-links";
import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";
@@ -96,9 +96,9 @@ function TaskRow({ task, projectSlug }: TaskRowProps) {
if (isMerged) {
return {
- icon: <GitMerge className="h-3 w-3 text-purple-400" />,
+ icon: <GitMerge className="h-3 w-3 text-info-foreground" />,
status: "Merged",
- statusClass: "text-purple-400",
+ statusClass: "text-info-foreground",
};
}
@@ -111,9 +111,9 @@ function TaskRow({ task, projectSlug }: TaskRowProps) {
}
return {
- icon: <GitPullRequest className="h-3 w-3 text-green-400" />,
+ icon: <GitPullRequest className="h-3 w-3 text-success-foreground" />,
status: "Open",
- statusClass: "text-green-400",
+ statusClass: "text-success-foreground",
};
};
@@ -176,11 +176,10 @@ function TaskRow({ task, projectSlug }: TaskRowProps) {
ref={setNodeRef}
style={style}
className={cn(
- "border-b border-zinc-200/50 dark:border-zinc-800/50 transition-all duration-200",
+ "border-b border-border/50 transition-all duration-200",
isDragging && "opacity-50",
- isTaskSelected && "bg-primary/10 shadow-sm",
- isTaskFocused &&
- "ring-2 ring-inset ring-indigo-500/50 dark:ring-indigo-400/50",
+ isTaskSelected && "bg-accent/50 shadow-sm",
+ isTaskFocused && "ring-2 ring-inset ring-ring/50",
)}
>
<ContextMenu>
@@ -189,7 +188,7 @@ function TaskRow({ task, projectSlug }: TaskRowProps) {
<div
onClick={handleClick}
onKeyDown={handleKeyDown}
- className="group relative flex items-center gap-3 px-4 py-1.5 hover:bg-zinc-100/60 dark:hover:bg-zinc-800/20 transition-colors cursor-pointer"
+ className="group relative flex items-center gap-3 px-4 py-1.5 hover:bg-accent/60 transition-colors cursor-pointer"
{...attributes}
{...listeners}
>
@@ -199,14 +198,14 @@ function TaskRow({ task, projectSlug }: TaskRowProps) {
</div>
)}
{showTaskNumbers && (
- <div className="text-xs font-mono text-zinc-400 dark:text-zinc-500 flex-shrink-0">
+ <div className="text-xs font-mono text-muted-foreground flex-shrink-0">
{projectSlug}-{task.number}
</div>
)}
<div className="flex-1 min-w-0 flex items-center gap-2">
<div className="flex items-center gap-2 justify-between w-full">
- <span className="text-sm text-zinc-900 dark:text-zinc-100 truncate">
+ <span className="text-sm text-foreground truncate">
{task.title}
</span>
<div className="flex items-center gap-1">
@@ -256,9 +255,9 @@ function TaskRow({ task, projectSlug }: TaskRowProps) {
(pr) => pr.metadata?.merged,
);
const iconColor = allMerged
- ? "text-purple-400"
+ ? "text-info-foreground"
: hasOpen
- ? "text-green-400"
+ ? "text-success-foreground"
: "text-muted-foreground";
return (
@@ -392,13 +391,13 @@ function TaskRow({ task, projectSlug }: TaskRowProps) {
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
- <AlertDialogCancel>Cancel</AlertDialogCancel>
- <AlertDialogAction
+ <AlertDialogClose>Cancel</AlertDialogClose>
+ <AlertDialogClose
onClick={handleDeleteTask}
className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
>
Delete Task
- </AlertDialogAction>
+ </AlertDialogClose>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
diff --git a/apps/web/src/components/nav-main.tsx b/apps/web/src/components/nav-main.tsx
index 175d5b0cb..12164e872 100644
--- a/apps/web/src/components/nav-main.tsx
+++ b/apps/web/src/components/nav-main.tsx
@@ -3,7 +3,7 @@ import { ChevronRight, FolderKanban, Mail, Users } from "lucide-react";
import {
Collapsible,
- CollapsibleContent,
+ CollapsiblePanel,
CollapsibleTrigger,
} from "@/components/ui/collapsible";
import {
@@ -15,8 +15,6 @@ import {
} from "@/components/ui/sidebar";
import { usePendingInvitations } from "@/hooks/queries/invitation/use-pending-invitations";
import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";
-import { cn } from "@/lib/cn";
-import { Button } from "./ui/button";
export function NavMain() {
const { data: workspace } = useActiveWorkspace();
@@ -62,15 +60,18 @@ export function NavMain() {
};
return (
- <Collapsible defaultOpen={true} className="group/collapsible">
+ <Collapsible defaultOpen className="group/collapsible">
<SidebarGroup className="pt-2 pb-0">
- <CollapsibleTrigger asChild>
- <SidebarGroupLabel className="px-2 text-xs text-muted-foreground/70 font-medium cursor-pointer hover:text-muted-foreground transition-colors duration-200 flex items-center justify-between">
- Workspace
- <ChevronRight className="ml-auto h-3 w-3 transition-transform duration-200 group-data-[state=open]/collapsible:rotate-90" />
- </SidebarGroupLabel>
+ <CollapsibleTrigger
+ className="data-panel-open:[&_svg]:rotate-90"
+ render={
+ <SidebarGroupLabel className="cursor-pointer px-2 text-sidebar-foreground/85 text-sm transition-colors duration-200 hover:text-sidebar-foreground" />
+ }
+ >
+ <span>Workspace</span>
+ <ChevronRight className="ml-auto h-4 w-4 transition-transform duration-200" />
</CollapsibleTrigger>
- <CollapsibleContent className="data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:slide-out-to-bottom-2 data-[state=open]:slide-in-from-bottom-2 duration-200">
+ <CollapsiblePanel>
<SidebarMenu className="space-y-0.5">
{navItems.map((item, index) => (
<SidebarMenuItem
@@ -79,42 +80,31 @@ export function NavMain() {
style={{ animationDelay: `${index * 50}ms` }}
>
<SidebarMenuButton
- asChild
tooltip={item.title}
disabled={item.isDisabled}
isActive={item.isActive}
- size="sm"
- className="h-7 px-2 text-xs rounded-sm group text-foreground/60"
+ size="default"
+ className="group h-9 rounded-md px-2.5 text-[15px] font-normal text-sidebar-foreground data-[active=true]:bg-sidebar-accent/70 data-[active=true]:text-sidebar-foreground data-[active=true]:font-medium"
+ onClick={() => {
+ if (item.url) {
+ handleNavClick(item.url);
+ }
+ }}
>
- <Button
- onClick={() => {
- if (item.url) {
- handleNavClick(item.url);
- }
- }}
- variant="ghost"
- className={cn(
- "w-full h-7 justify-start items-center gap-2 px-2 text-sm transition-all duration-200 relative",
- item.isActive && "bg-neutral-200! dark:bg-neutral-800!",
- )}
- >
- {item.icon && (
- <item.icon className="w-3.5 h-3.5 transition-colors duration-200 relative z-10" />
- )}
- <span className="transition-colors duration-200 relative z-10">
- {item.title}
+ {item.icon && (
+ <item.icon className="h-4.5 w-4.5 opacity-90" />
+ )}
+ <span>{item.title}</span>
+ {item.badge !== null && (
+ <span className="ml-auto flex h-6 min-w-6 items-center justify-center rounded-md bg-sidebar-accent px-1.5 text-xs font-medium text-sidebar-foreground">
+ {item.badge}
</span>
- {item.badge !== null && (
- <span className="ml-auto flex h-4 min-w-[16px] items-center justify-center rounded-full bg-primary/90 px-1 text-[9px] font-medium text-primary-foreground">
- {item.badge}
- </span>
- )}
- </Button>
+ )}
</SidebarMenuButton>
</SidebarMenuItem>
))}
</SidebarMenu>
- </CollapsibleContent>
+ </CollapsiblePanel>
</SidebarGroup>
</Collapsible>
);
diff --git a/apps/web/src/components/nav-projects.tsx b/apps/web/src/components/nav-projects.tsx
index d20820d6b..fe210e771 100644
--- a/apps/web/src/components/nav-projects.tsx
+++ b/apps/web/src/components/nav-projects.tsx
@@ -9,11 +9,10 @@ import {
Trash2,
} from "lucide-react";
import { useState } from "react";
-import { toast } from "sonner";
-import { Button } from "@/components/ui/button";
+import { toast } from "@/lib/toast";
import {
Collapsible,
- CollapsibleContent,
+ CollapsiblePanel,
CollapsibleTrigger,
} from "@/components/ui/collapsible";
import {
@@ -22,7 +21,7 @@ import {
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
+} from "@/components/ui/menu";
import {
SidebarGroup,
SidebarGroupLabel,
@@ -33,30 +32,20 @@ import {
useSidebar,
} from "@/components/ui/sidebar";
import icons from "@/constants/project-icons";
-import { shortcuts } from "@/constants/shortcuts";
import useDeleteProject from "@/hooks/mutations/project/use-delete-project";
import useGetProjects from "@/hooks/queries/project/use-get-projects";
import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";
-import { cn } from "@/lib/cn";
import type { ProjectWithTasks } from "@/types/project";
import CreateProjectModal from "./shared/modals/create-project-modal";
import {
AlertDialog,
- AlertDialogAction,
- AlertDialogCancel,
+ AlertDialogClose,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
} from "./ui/alert-dialog";
-import { KbdSequence } from "./ui/kbd";
-import {
- Tooltip,
- TooltipContent,
- TooltipProvider,
- TooltipTrigger,
-} from "./ui/tooltip";
export function NavProjects() {
const { isMobile } = useSidebar();
@@ -99,16 +88,19 @@ export function NavProjects() {
if (!workspace) return null;
return (
- <Collapsible defaultOpen={true} className="group/collapsible">
+ <Collapsible defaultOpen className="group/collapsible">
<SidebarGroup className="group-data-[collapsible=icon]:hidden pt-0">
- <CollapsibleTrigger asChild>
- <SidebarGroupLabel className="px-2 text-xs text-muted-foreground/70 font-medium cursor-pointer hover:text-muted-foreground transition-colors duration-200 flex items-center justify-between">
- Projects
- <ChevronRight className="ml-auto h-3 w-3 transition-transform duration-200 group-data-[state=open]/collapsible:rotate-90" />
- </SidebarGroupLabel>
+ <CollapsibleTrigger
+ className="data-panel-open:[&_svg]:rotate-90"
+ render={
+ <SidebarGroupLabel className="cursor-pointer px-2 text-sidebar-foreground/85 text-sm transition-colors duration-200 hover:text-sidebar-foreground flex items-center justify-between" />
+ }
+ >
+ <span>Projects</span>
+ <ChevronRight className="ml-auto h-4 w-4 transition-transform duration-200" />
</CollapsibleTrigger>
- <CollapsibleContent className="data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:slide-out-to-bottom-2 data-[state=open]:slide-in-from-bottom-2 duration-200">
- <SidebarMenu className="space-y-0.5">
+ <CollapsiblePanel className="data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:slide-out-to-bottom-2 data-[state=open]:slide-in-from-bottom-2 duration-200">
+ <SidebarMenu className="space-y-0">
{projects?.map((project, index) => {
const IconComponent =
icons[project.icon as keyof typeof icons] || icons.Layout;
@@ -120,29 +112,13 @@ export function NavProjects() {
style={{ animationDelay: `${index * 50}ms` }}
>
<SidebarMenuButton
- asChild
isActive={isCurrentProject(project.id)}
- size="sm"
- className="h-7 px-2 text-xs rounded-sm group text-foreground/60"
+ size="default"
+ className="h-9 rounded-md px-2.5 text-[15px] font-normal text-sidebar-foreground data-[active=true]:bg-sidebar-accent/70 data-[active=true]:font-medium"
+ onClick={() => handleProjectClick(project)}
>
- <Button
- onClick={() => handleProjectClick(project)}
- variant="ghost"
- className={cn(
- "w-full h-7 justify-start items-center gap-2 px-2 text-sm transition-all duration-200 relative",
- isCurrentProject(project.id) &&
- "!bg-neutral-200 dark:!bg-neutral-800",
- )}
- >
- <IconComponent className="w-3.5 h-3.5 transition-colors duration-200 relative z-10" />
- <span
- className={cn(
- `transition-colors duration-200 relative z-10 font-normal ${isCurrentProject(project.id) ? "font-medium" : ""}`,
- )}
- >
- {project.name}
- </span>
- </Button>
+ <IconComponent className="h-4.5 w-4.5 opacity-90" />
+ <span>{project.name}</span>
</SidebarMenuButton>
<DropdownMenu>
@@ -158,14 +134,14 @@ export function NavProjects() {
align={isMobile ? "end" : "start"}
>
<DropdownMenuItem
- className="items-start cursor-pointer"
+ className="h-8 items-start cursor-pointer text-sm"
onClick={() => handleProjectClick(project)}
>
<Folder className="text-muted-foreground" />
<span>View Project</span>
</DropdownMenuItem>
<DropdownMenuItem
- className="items-start cursor-pointer"
+ className="h-8 items-start cursor-pointer text-sm"
onClick={() => {
navigator.clipboard.writeText(
`${window.location.origin}/dashboard/workspace/${workspace?.id}/project/${project.id}`,
@@ -178,7 +154,7 @@ export function NavProjects() {
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem
- className="items-start text-destructive cursor-pointer"
+ className="h-8 items-start text-destructive cursor-pointer text-sm"
onClick={() => {
setProjectToDeleteID(project.id);
setIsDeleteProjectModalOpen(true);
@@ -193,38 +169,20 @@ export function NavProjects() {
);
})}
<SidebarMenuItem
- className="data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:slide-in-from-bottom-2 duration-200"
+ className="mt-1 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:slide-in-from-bottom-2 duration-200"
style={{ animationDelay: `${(projects?.length || 0) * 50}ms` }}
>
- <TooltipProvider>
- <Tooltip>
- <TooltipTrigger asChild>
- <SidebarMenuButton
- size="sm"
- className="h-7 px-2 text-xs text-sidebar-foreground/70"
- onClick={() => setIsCreateProjectModalOpen(true)}
- >
- <Plus className="w-3.5 h-3.5 text-sidebar-foreground/70" />
- <span className="text-sm text-sidebar-foreground/70">
- Add project
- </span>
- </SidebarMenuButton>
- </TooltipTrigger>
- <TooltipContent>
- <KbdSequence
- keys={[
- shortcuts.project.prefix,
- shortcuts.project.create,
- ]}
- className="ml-auto"
- description="Add project"
- />
- </TooltipContent>
- </Tooltip>
- </TooltipProvider>
+ <SidebarMenuButton
+ size="default"
+ className="h-9 rounded-md px-2.5 text-[15px] font-normal text-sidebar-foreground/95 hover:text-sidebar-foreground"
+ onClick={() => setIsCreateProjectModalOpen(true)}
+ >
+ <Plus className="h-4.5 w-4.5 opacity-90" />
+ <span>Add project</span>
+ </SidebarMenuButton>
</SidebarMenuItem>
</SidebarMenu>
- </CollapsibleContent>
+ </CollapsiblePanel>
</SidebarGroup>
<CreateProjectModal
open={isCreateProjectModalOpen}
@@ -244,8 +202,8 @@ export function NavProjects() {
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
- <AlertDialogCancel>Cancel</AlertDialogCancel>
- <AlertDialogAction
+ <AlertDialogClose>Cancel</AlertDialogClose>
+ <AlertDialogClose
onClick={async () => {
await deleteProject({
id: projectToDeleteId || "",
@@ -264,7 +222,7 @@ export function NavProjects() {
className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
>
Delete Project
- </AlertDialogAction>
+ </AlertDialogClose>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
diff --git a/apps/web/src/components/notification/notification-dropdown.tsx b/apps/web/src/components/notification/notification-dropdown.tsx
index 4ba1cff92..a2a6f9d8c 100644
--- a/apps/web/src/components/notification/notification-dropdown.tsx
+++ b/apps/web/src/components/notification/notification-dropdown.tsx
@@ -3,8 +3,8 @@ import { Bell } from "lucide-react";
import { forwardRef, useImperativeHandle, useState } from "react";
import {
AlertDialog,
- AlertDialogAction,
- AlertDialogCancel,
+ AlertDialogClose,
+
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
@@ -17,7 +17,7 @@ import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
+} from "@/components/ui/menu";
import { KbdSequence } from "@/components/ui/kbd";
import {
Tooltip,
@@ -79,7 +79,7 @@ const NotificationDropdown = forwardRef<NotificationDropdownRef>(
>
<Bell className="h-4 w-4" />
{unreadNotifications.length > 0 && (
- <span className="absolute top-0 right-0 h-2 w-2 bg-red-500 rounded-full" />
+ <span className="absolute top-0 right-0 h-2 w-2 rounded-full bg-destructive" />
)}
<span className="sr-only">Notifications</span>
</Button>
@@ -188,13 +188,13 @@ const NotificationDropdown = forwardRef<NotificationDropdownRef>(
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
- <AlertDialogCancel>Cancel</AlertDialogCancel>
- <AlertDialogAction
+ <AlertDialogClose>Cancel</AlertDialogClose>
+ <AlertDialogClose
onClick={handleClearAll}
className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
>
Clear all
- </AlertDialogAction>
+ </AlertDialogClose>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
diff --git a/apps/web/src/components/onboarding/onboarding-flow.tsx b/apps/web/src/components/onboarding/onboarding-flow.tsx
index f87367ba7..87b9745c9 100644
--- a/apps/web/src/components/onboarding/onboarding-flow.tsx
+++ b/apps/web/src/components/onboarding/onboarding-flow.tsx
@@ -5,7 +5,7 @@ import { AnimatePresence, motion } from "framer-motion";
import { CheckCircle2 } from "lucide-react";
import { useState } from "react";
import { useForm } from "react-hook-form";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { z } from "zod/v4";
import { Logo } from "@/components/common/logo";
@@ -101,12 +101,12 @@ export function OnboardingFlow() {
>
<Logo className="mx-auto mb-6 w-full flex items-end justify-center" />
- <div className="bg-white/50 dark:bg-zinc-900/50 backdrop-blur-xl rounded-xl border border-zinc-200/50 dark:border-zinc-800/50 p-6 shadow-xl shadow-zinc-200/20 dark:shadow-zinc-950/20">
+ <div className="rounded-xl border border-border bg-card p-6 shadow-sm">
<div className="text-center mb-6">
- <h1 className="text-xl font-bold text-zinc-900 dark:text-zinc-100 mb-2">
+ <h1 className="text-xl font-semibold text-foreground mb-2">
Create workspace
</h1>
- <p className="text-zinc-600 dark:text-zinc-400 text-sm">
+ <p className="text-muted-foreground text-sm">
Set up your workspace to start managing projects
</p>
</div>
@@ -139,7 +139,7 @@ export function OnboardingFlow() {
name="description"
render={({ field }) => (
<FormItem>
- <FormLabel className="text-sm font-medium text-zinc-600 dark:text-zinc-400">
+ <FormLabel className="text-sm font-medium text-muted-foreground">
Description (optional)
</FormLabel>
<FormControl>
@@ -175,23 +175,23 @@ export function OnboardingFlow() {
>
<Logo className="mx-auto mb-6 w-full flex items-end justify-center" />
- <div className="bg-white/50 dark:bg-zinc-900/50 backdrop-blur-xl rounded-xl border border-zinc-200/50 dark:border-zinc-800/50 p-6 shadow-xl shadow-zinc-200/20 dark:shadow-zinc-950/20">
+ <div className="rounded-xl border border-border bg-card p-6 shadow-sm">
<div className="text-center space-y-4">
- <div className="w-12 h-12 bg-green-100 dark:bg-green-900/20 rounded-full flex items-center justify-center mx-auto">
- <CheckCircle2 className="h-6 w-6 text-green-600 dark:text-green-400" />
+ <div className="w-12 h-12 bg-success/12 rounded-full flex items-center justify-center mx-auto">
+ <CheckCircle2 className="h-6 w-6 text-success-foreground" />
</div>
<div className="space-y-2">
- <h1 className="text-xl font-bold text-zinc-900 dark:text-zinc-100">
+ <h1 className="text-xl font-semibold text-foreground">
Workspace created
</h1>
- <p className="text-zinc-600 dark:text-zinc-400 text-sm">
+ <p className="text-muted-foreground text-sm">
Taking you to <strong>{createdWorkspaceName}</strong>...
</p>
</div>
<div className="w-6 h-6 mx-auto">
- <div className="animate-spin rounded-full h-6 w-6 border-2 border-zinc-200 dark:border-zinc-700 border-t-zinc-600 dark:border-t-zinc-300" />
+ <div className="animate-spin rounded-full h-6 w-6 border-2 border-border border-t-foreground" />
</div>
</div>
</div>
@@ -201,7 +201,7 @@ export function OnboardingFlow() {
return (
<>
<PageTitle title="Create Workspace" />
- <div className="min-h-screen w-full bg-gradient-to-b from-zinc-100 to-white dark:from-zinc-900 dark:to-zinc-950 flex flex-col items-center justify-center p-4">
+ <div className="min-h-screen w-full bg-background flex flex-col items-center justify-center p-4">
<AnimatePresence mode="wait">
{step === "workspace" && renderWorkspaceStep()}
{step === "success" && renderSuccessStep()}
diff --git a/apps/web/src/components/profile-setup/profile-setup-flow.tsx b/apps/web/src/components/profile-setup/profile-setup-flow.tsx
index 8cb81eb90..5b369d51c 100644
--- a/apps/web/src/components/profile-setup/profile-setup-flow.tsx
+++ b/apps/web/src/components/profile-setup/profile-setup-flow.tsx
@@ -5,7 +5,7 @@ import { AnimatePresence, motion } from "framer-motion";
import { CheckCircle2, User } from "lucide-react";
import { useState } from "react";
import { useForm } from "react-hook-form";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { z } from "zod/v4";
import { Logo } from "@/components/common/logo";
@@ -99,7 +99,7 @@ export function ProfileSetupFlow() {
<div className="w-12 h-12 bg-primary/10 rounded-full flex items-center justify-center mx-auto mb-4">
<User className="h-6 w-6 text-primary" />
</div>
- <h1 className="text-xl font-bold text-foreground mb-2">
+ <h1 className="text-xl font-semibold text-foreground mb-2">
Complete your profile
</h1>
<p className="text-muted-foreground text-sm">
@@ -148,12 +148,12 @@ export function ProfileSetupFlow() {
<div className="bg-card/50 backdrop-blur-xl rounded-xl border border-border/50 p-6 shadow-xl shadow-background/20">
<div className="text-center space-y-4">
- <div className="w-12 h-12 bg-green-100 dark:bg-green-900/20 rounded-full flex items-center justify-center mx-auto">
- <CheckCircle2 className="h-6 w-6 text-green-600 dark:text-green-400" />
+ <div className="w-12 h-12 bg-success/12 rounded-full flex items-center justify-center mx-auto">
+ <CheckCircle2 className="h-6 w-6 text-success-foreground" />
</div>
<div className="space-y-2">
- <h1 className="text-xl font-bold text-foreground">
+ <h1 className="text-xl font-semibold text-foreground">
Welcome, {userName}!
</h1>
<p className="text-muted-foreground text-sm">
diff --git a/apps/web/src/components/project/column-editor.tsx b/apps/web/src/components/project/column-editor.tsx
index 7053a849b..e14b0a0ac 100644
--- a/apps/web/src/components/project/column-editor.tsx
+++ b/apps/web/src/components/project/column-editor.tsx
@@ -1,6 +1,6 @@
import { CheckCircle2, Circle, GripVertical, Plus, Trash2 } from "lucide-react";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { Switch } from "@/components/ui/switch";
diff --git a/apps/web/src/components/project/github-integration-settings.tsx b/apps/web/src/components/project/github-integration-settings.tsx
index 45a21976c..6caa53b14 100644
--- a/apps/web/src/components/project/github-integration-settings.tsx
+++ b/apps/web/src/components/project/github-integration-settings.tsx
@@ -13,7 +13,7 @@ import {
} from "lucide-react";
import React from "react";
import { useForm } from "react-hook-form";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { z } from "zod/v4";
import { RepositoryBrowserModal } from "@/components/project/repository-browser-modal";
import { Badge } from "@/components/ui/badge";
@@ -314,22 +314,22 @@ export function GitHubIntegrationSettings({
{verificationResult.isInstalled &&
verificationResult.hasRequiredPermissions ? (
<>
- <CheckCircle className="w-4 h-4 text-green-600" />
- <span className="text-green-600 font-medium">
+ <CheckCircle className="h-4 w-4 text-success-foreground" />
+ <span className="font-medium text-success-foreground">
Properly configured
</span>
</>
) : verificationResult.isInstalled ? (
<>
- <AlertTriangle className="w-4 h-4 text-amber-600" />
- <span className="text-amber-600 font-medium">
+ <AlertTriangle className="h-4 w-4 text-warning-foreground" />
+ <span className="font-medium text-warning-foreground">
Missing permissions
</span>
</>
) : (
<>
- <XCircle className="w-4 h-4 text-red-600" />
- <span className="text-red-600 font-medium">
+ <XCircle className="h-4 w-4 text-destructive-foreground" />
+ <span className="font-medium text-destructive-foreground">
Not installed
</span>
</>
@@ -480,22 +480,22 @@ export function GitHubIntegrationSettings({
"flex items-start gap-3 p-3 border rounded-md text-sm",
verificationResult.isInstalled &&
verificationResult.hasRequiredPermissions
- ? "bg-green-50 dark:bg-green-900/20 border-green-200 dark:border-green-800"
+ ? "border-success/25 bg-success/10"
: verificationResult.isInstalled
- ? "bg-amber-50 dark:bg-amber-900/20 border-amber-200 dark:border-amber-800"
+ ? "border-warning/25 bg-warning/10"
: verificationResult.repositoryExists
- ? "bg-amber-50 dark:bg-amber-900/20 border-amber-200 dark:border-amber-800"
- : "bg-red-50 dark:bg-red-900/20 border-red-200 dark:border-red-800",
+ ? "border-warning/25 bg-warning/10"
+ : "border-destructive/25 bg-destructive/10",
)}
>
{verificationResult.isInstalled &&
verificationResult.hasRequiredPermissions ? (
- <CheckCircle className="w-4 h-4 text-green-600 dark:text-green-400 mt-0.5 flex-shrink-0" />
+ <CheckCircle className="mt-0.5 h-4 w-4 flex-shrink-0 text-success-foreground" />
) : verificationResult.isInstalled ||
verificationResult.repositoryExists ? (
- <AlertTriangle className="w-4 h-4 text-amber-600 dark:text-amber-400 mt-0.5 flex-shrink-0" />
+ <AlertTriangle className="mt-0.5 h-4 w-4 flex-shrink-0 text-warning-foreground" />
) : (
- <XCircle className="w-4 h-4 text-red-600 dark:text-red-400 mt-0.5 flex-shrink-0" />
+ <XCircle className="mt-0.5 h-4 w-4 flex-shrink-0 text-destructive-foreground" />
)}
<div className="flex-1">
<p className="font-medium">{verificationResult.message}</p>
diff --git a/apps/web/src/components/project/tasks-import-export.tsx b/apps/web/src/components/project/tasks-import-export.tsx
index fdb47b1f4..a7d468580 100644
--- a/apps/web/src/components/project/tasks-import-export.tsx
+++ b/apps/web/src/components/project/tasks-import-export.tsx
@@ -1,10 +1,10 @@
-import * as Dialog from "@radix-ui/react-dialog";
import { useQueryClient } from "@tanstack/react-query";
import { saveAs } from "file-saver";
import { Download, Loader2, Upload, X } from "lucide-react";
import { useRef, useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { Button } from "@/components/ui/button";
+import { Dialog, DialogClose, DialogPopup, DialogTitle } from "@/components/ui/dialog";
import useExportTasks from "@/hooks/mutations/task/use-export-tasks";
import useImportTasks from "@/hooks/mutations/task/use-import-tasks";
import { cn } from "@/lib/cn";
@@ -122,7 +122,7 @@ export function TasksImportExport({ project }: TasksImportExportProps) {
<div className="space-y-4">
<div className="flex items-center gap-2">
<Button
- className="flex items-center gap-1.5 bg-white hover:bg-zinc-100 text-zinc-900 dark:bg-zinc-900 dark:text-zinc-100 dark:hover:bg-zinc-800 border border-zinc-300 dark:border-zinc-700"
+ className="flex items-center gap-1.5 bg-card hover:bg-accent text-foreground border border-border"
size="sm"
onClick={handleExport}
disabled={isExporting}
@@ -136,7 +136,7 @@ export function TasksImportExport({ project }: TasksImportExportProps) {
</Button>
<Button
- className="flex items-center gap-1.5 bg-white hover:bg-zinc-100 text-zinc-900 dark:bg-zinc-900 dark:text-zinc-100 dark:hover:bg-zinc-800 border border-zinc-300 dark:border-zinc-700"
+ className="flex items-center gap-1.5 bg-card hover:bg-accent text-foreground border border-border"
size="sm"
onClick={() => setIsImportOpen(true)}
>
@@ -153,34 +153,32 @@ export function TasksImportExport({ project }: TasksImportExportProps) {
/>
</div>
- <Dialog.Root open={isImportOpen} onOpenChange={resetAndCloseModal}>
- <Dialog.Portal>
- <Dialog.Overlay className="fixed inset-0 bg-black/40 backdrop-blur-sm z-40" />
- <Dialog.Content className="fixed z-50 left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 w-full max-w-md">
- <div className="bg-white dark:bg-zinc-900 rounded-lg shadow-xl border border-zinc-200 dark:border-zinc-800">
- <div className="flex items-center justify-between p-4 border-b border-zinc-200 dark:border-zinc-800">
- <Dialog.Title className="text-lg font-semibold text-zinc-900 dark:text-zinc-100">
+ <Dialog open={isImportOpen} onOpenChange={resetAndCloseModal}>
+ <DialogPopup className="w-full max-w-md">
+ <div className="bg-card rounded-lg shadow-xl border border-border">
+ <div className="flex items-center justify-between p-4 border-b border-border">
+ <DialogTitle className="text-lg font-semibold text-foreground">
Import Tasks
- </Dialog.Title>
- <Dialog.Close
- asChild
- className="text-zinc-500 hover:text-zinc-700 dark:text-zinc-400 dark:hover:text-zinc-300"
+ </DialogTitle>
+ <DialogClose
+ className="text-muted-foreground hover:text-foreground"
+ render={<button type="button" />}
>
<X size={20} className="cursor-pointer" />
- </Dialog.Close>
+ </DialogClose>
</div>
<div className="p-4">
- <p className="text-sm text-zinc-600 dark:text-zinc-400 mb-2">
+ <p className="text-sm text-muted-foreground mb-2">
Upload a JSON file containing tasks to import into this
project.
</p>
- <div className="mb-4 p-3 bg-zinc-950 dark:bg-zinc-900 rounded-md border border-zinc-200/10 dark:border-zinc-800/50 font-mono text-sm">
- <p className="text-zinc-400 dark:text-zinc-500 mb-1 text-xs">
+ <div className="mb-4 p-3 bg-muted rounded-md border border-border/50 font-mono text-sm">
+ <p className="text-muted-foreground mb-1 text-xs">
Expected format:
</p>
- <pre className="text-zinc-100 dark:text-zinc-200 overflow-auto max-h-32 text-xs">
+ <pre className="text-foreground overflow-auto max-h-32 text-xs">
{`{
"tasks": [
{
@@ -200,21 +198,21 @@ export function TasksImportExport({ project }: TasksImportExportProps) {
<div
className={cn(
"border-2 border-dashed rounded-lg p-8 text-center mb-4",
- "border-zinc-300 dark:border-zinc-700",
- "hover:border-zinc-400 dark:hover:border-zinc-600",
- "bg-zinc-50 dark:bg-zinc-800/30",
+ "border-border",
+ "hover:border-ring",
+ "bg-muted/60",
"transition-colors",
)}
onDrop={handleDrop}
onDragOver={handleDragOver}
>
<div className="flex flex-col items-center justify-center gap-2">
- <Upload className="h-8 w-8 text-zinc-400" />
- <p className="text-sm text-zinc-500 dark:text-zinc-400">
+ <Upload className="h-8 w-8 text-muted-foreground" />
+ <p className="text-sm text-muted-foreground">
Drag and drop your JSON file here
</p>
<Button
- className="mt-2 bg-white hover:bg-zinc-100 text-zinc-900 dark:bg-zinc-900 dark:text-zinc-100 dark:hover:bg-zinc-800 border border-zinc-300 dark:border-zinc-700"
+ className="mt-2 bg-card hover:bg-accent text-foreground border border-border"
size="sm"
onClick={handleImportClick}
disabled={isImporting}
@@ -229,17 +227,18 @@ export function TasksImportExport({ project }: TasksImportExportProps) {
</div>
<div className="flex justify-end gap-2">
- <Dialog.Close asChild>
- <Button className="bg-white hover:bg-zinc-100 text-zinc-900 dark:bg-zinc-900 dark:text-zinc-100 dark:hover:bg-zinc-800 border border-zinc-300 dark:border-zinc-700">
- Cancel
- </Button>
- </Dialog.Close>
+ <DialogClose
+ render={
+ <Button className="bg-card hover:bg-accent text-foreground border border-border" />
+ }
+ >
+ Cancel
+ </DialogClose>
</div>
</div>
</div>
- </Dialog.Content>
- </Dialog.Portal>
- </Dialog.Root>
+ </DialogPopup>
+ </Dialog>
</div>
);
}
diff --git a/apps/web/src/components/project/workflow-editor.tsx b/apps/web/src/components/project/workflow-editor.tsx
index 8a787c616..8e2c38db3 100644
--- a/apps/web/src/components/project/workflow-editor.tsx
+++ b/apps/web/src/components/project/workflow-editor.tsx
@@ -1,4 +1,4 @@
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import {
Select,
SelectContent,
diff --git a/apps/web/src/components/public-project/copy-url-button.tsx b/apps/web/src/components/public-project/copy-url-button.tsx
index 827376615..9eeef5a95 100644
--- a/apps/web/src/components/public-project/copy-url-button.tsx
+++ b/apps/web/src/components/public-project/copy-url-button.tsx
@@ -1,6 +1,6 @@
import { Check, Copy } from "lucide-react";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { Button } from "@/components/ui/button";
export function CopyUrlButton() {
diff --git a/apps/web/src/components/public-project/error-view.tsx b/apps/web/src/components/public-project/error-view.tsx
index d3b412970..44875e94e 100644
--- a/apps/web/src/components/public-project/error-view.tsx
+++ b/apps/web/src/components/public-project/error-view.tsx
@@ -3,17 +3,17 @@ import { KaneoBranding } from "./kaneo-branding";
export function ErrorView() {
return (
- <div className="min-h-screen bg-zinc-50 dark:bg-zinc-900 flex flex-col w-full">
+ <div className="min-h-screen bg-background flex flex-col w-full">
<div className="flex-1 flex items-center justify-center">
<div className="text-center space-y-6">
- <div className="w-20 h-20 rounded-full bg-red-100 dark:bg-red-900/30 flex items-center justify-center mx-auto">
- <ExternalLink className="w-10 h-10 text-red-600 dark:text-red-400" />
+ <div className="mx-auto flex h-20 w-20 items-center justify-center rounded-full bg-destructive/12">
+ <ExternalLink className="h-10 w-10 text-destructive-foreground" />
</div>
<div className="space-y-2">
- <h1 className="text-3xl font-bold text-zinc-900 dark:text-zinc-100">
+ <h1 className="text-3xl font-semibold text-foreground">
Project Not Found
</h1>
- <p className="text-zinc-600 dark:text-zinc-400 max-w-md mx-auto">
+ <p className="text-muted-foreground max-w-md mx-auto">
This project doesn't exist or is not publicly accessible.
</p>
</div>
diff --git a/apps/web/src/components/public-project/kanban-view.tsx b/apps/web/src/components/public-project/kanban-view.tsx
index e74f32199..5ea161060 100644
--- a/apps/web/src/components/public-project/kanban-view.tsx
+++ b/apps/web/src/components/public-project/kanban-view.tsx
@@ -35,7 +35,7 @@ export function PublicKanbanView({
key={column.id}
className="h-full flex-1 min-w-80 max-w-96 flex-shrink-0"
>
- <div className="flex flex-col h-full w-full min-h-0 backdrop-blur-xs rounded-lg bg-sidebar border border-border/50 transition-all duration-300 ease-out hover:bg-zinc-50/40 dark:hover:bg-zinc-900/40 hover:shadow-sm">
+ <div className="flex flex-col h-full w-full min-h-0 backdrop-blur-xs rounded-lg bg-sidebar border border-border/50 transition-all duration-300 ease-out hover:bg-accent/20 hover:shadow-sm">
<div className="p-2 shrink-0">
<div className="flex items-center justify-between">
<div className="flex items-center gap-2">
diff --git a/apps/web/src/components/public-project/loading-skeleton.tsx b/apps/web/src/components/public-project/loading-skeleton.tsx
index cd4e11f44..9e26d1fc5 100644
--- a/apps/web/src/components/public-project/loading-skeleton.tsx
+++ b/apps/web/src/components/public-project/loading-skeleton.tsx
@@ -1,23 +1,23 @@
export function LoadingSkeleton() {
return (
- <div className="min-h-screen bg-zinc-50 dark:bg-zinc-900 flex flex-col w-full">
+ <div className="min-h-screen bg-background flex flex-col w-full">
<div className="flex-1 flex items-center justify-center">
<div className="container mx-auto px-4 py-8">
<div className="animate-pulse space-y-8 max-w-6xl mx-auto">
<div className="text-center space-y-4">
- <div className="h-8 bg-zinc-200 dark:bg-zinc-800 rounded-md w-64 mx-auto" />
- <div className="h-4 bg-zinc-200 dark:bg-zinc-800 rounded-md w-96 mx-auto" />
+ <div className="h-8 bg-muted rounded-md w-64 mx-auto" />
+ <div className="h-4 bg-muted rounded-md w-96 mx-auto" />
</div>
<div className="grid grid-cols-1 md:grid-cols-4 gap-6">
{["skeleton-1", "skeleton-2", "skeleton-3", "skeleton-4"].map(
(skeletonId) => (
<div key={skeletonId} className="space-y-3">
- <div className="h-6 bg-zinc-200 dark:bg-zinc-800 rounded-md" />
+ <div className="h-6 bg-muted rounded-md" />
<div className="space-y-2">
{["task-1", "task-2", "task-3"].map((taskId) => (
<div
key={`${skeletonId}-${taskId}`}
- className="h-24 bg-zinc-200 dark:bg-zinc-800 rounded-lg"
+ className="h-24 bg-muted rounded-lg"
/>
))}
</div>
diff --git a/apps/web/src/components/public-project/public-pr-badge.tsx b/apps/web/src/components/public-project/public-pr-badge.tsx
index cfebc45d0..143b7fb5c 100644
--- a/apps/web/src/components/public-project/public-pr-badge.tsx
+++ b/apps/web/src/components/public-project/public-pr-badge.tsx
@@ -4,7 +4,7 @@ import {
HoverCard,
HoverCardContent,
HoverCardTrigger,
-} from "@/components/ui/hover-card";
+} from "@/components/ui/preview-card";
import type { ExternalLink } from "@/types/external-link";
type PublicPRBadgeProps = {
@@ -25,9 +25,9 @@ export function PublicPRBadge({ externalLinks }: PublicPRBadgeProps) {
if (isMerged) {
return {
- icon: <GitMerge className="h-3 w-3 text-purple-400" />,
+ icon: <GitMerge className="h-3 w-3 text-info-foreground" />,
status: "Merged",
- statusClass: "text-purple-400",
+ statusClass: "text-info-foreground",
};
}
@@ -40,9 +40,9 @@ export function PublicPRBadge({ externalLinks }: PublicPRBadgeProps) {
}
return {
- icon: <GitPullRequest className="h-3 w-3 text-green-400" />,
+ icon: <GitPullRequest className="h-3 w-3 text-success-foreground" />,
status: "Open",
- statusClass: "text-green-400",
+ statusClass: "text-success-foreground",
};
};
@@ -89,9 +89,9 @@ export function PublicPRBadge({ externalLinks }: PublicPRBadgeProps) {
);
const allMerged = pullRequests.every((pr) => pr.metadata?.merged);
const iconColor = allMerged
- ? "text-purple-400"
+ ? "text-info-foreground"
: hasOpen
- ? "text-green-400"
+ ? "text-success-foreground"
: "text-muted-foreground";
return (
diff --git a/apps/web/src/components/public-project/public-task-labels.tsx b/apps/web/src/components/public-project/public-task-labels.tsx
index abdf552f0..0a75390fe 100644
--- a/apps/web/src/components/public-project/public-task-labels.tsx
+++ b/apps/web/src/components/public-project/public-task-labels.tsx
@@ -21,7 +21,7 @@ export function PublicTaskLabels({ labels }: PublicTaskLabelsProps) {
style={{
backgroundColor:
labelColors.find((c) => c.value === label.color)?.color ||
- "#94a3b8",
+ "var(--color-neutral-400)",
}}
/>
<span className="truncate max-w-[80px]">{label.name}</span>
diff --git a/apps/web/src/components/public-project/task-card.tsx b/apps/web/src/components/public-project/task-card.tsx
index b35955bfd..b3d4d5b0b 100644
--- a/apps/web/src/components/public-project/task-card.tsx
+++ b/apps/web/src/components/public-project/task-card.tsx
@@ -64,7 +64,7 @@ export function PublicTaskCard({
return (
<button
type="button"
- className="group w-full text-left p-3 bg-card border border-border rounded-lg cursor-pointer transition-all duration-200 ease-out hover:border-border/70 hover:shadow-sm focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:focus:ring-offset-zinc-900"
+ className="group w-full text-left p-3 bg-card border border-border rounded-lg cursor-pointer transition-all duration-200 ease-out hover:border-border/70 hover:shadow-sm focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 focus:ring-offset-background"
onTouchStart={handleTouchStart}
onTouchEnd={handleTouchEnd}
onClick={handleClick}
diff --git a/apps/web/src/components/public-project/task-detail-modal.tsx b/apps/web/src/components/public-project/task-detail-modal.tsx
index e696ac320..c8110ffb2 100644
--- a/apps/web/src/components/public-project/task-detail-modal.tsx
+++ b/apps/web/src/components/public-project/task-detail-modal.tsx
@@ -1,4 +1,3 @@
-import * as Dialog from "@radix-ui/react-dialog";
import { format } from "date-fns";
import {
Calendar,
@@ -11,6 +10,7 @@ import {
X,
} from "lucide-react";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
+import { Dialog, DialogClose, DialogPopup, DialogTitle } from "@/components/ui/dialog";
import { dueDateStatusColors, getDueDateStatus } from "@/lib/due-date-status";
import { getPriorityIcon } from "@/lib/priority";
import type { ExternalLink } from "@/types/external-link";
@@ -54,7 +54,7 @@ export function PublicTaskDetailModal({
return {
icon: <GitMerge className="w-3.5 h-3.5" />,
label: "Merged",
- className: "text-purple-500",
+ className: "text-info-foreground",
};
}
if (pr.metadata?.draft) {
@@ -67,15 +67,13 @@ export function PublicTaskDetailModal({
return {
icon: <GitPullRequest className="w-3.5 h-3.5" />,
label: "Open",
- className: "text-green-500",
+ className: "text-success-foreground",
};
};
return (
- <Dialog.Root open={open} onOpenChange={onOpenChange}>
- <Dialog.Portal>
- <Dialog.Overlay className="fixed inset-0 bg-black/50 z-40" />
- <Dialog.Content className="fixed z-50 left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 w-full max-w-3xl max-h-[85vh]">
+ <Dialog open={open} onOpenChange={onOpenChange}>
+ <DialogPopup className="w-full max-w-3xl max-h-[85vh]">
<div className="bg-background border border-border rounded-lg flex flex-col max-h-[85vh] shadow-lg">
<div className="flex items-center justify-between p-4 border-b border-border shrink-0">
<div className="flex items-center gap-2 min-w-0 flex-1">
@@ -86,9 +84,12 @@ export function PublicTaskDetailModal({
{task.status?.replace("-", " ")}
</span>
</div>
- <Dialog.Close className="shrink-0 p-1.5 hover:bg-muted rounded transition-colors">
+ <DialogClose
+ className="shrink-0 p-1.5 hover:bg-muted rounded transition-colors"
+ render={<button type="button" />}
+ >
<X className="w-4 h-4 text-muted-foreground" />
- </Dialog.Close>
+ </DialogClose>
</div>
<div className="flex-1 overflow-y-auto p-6 space-y-6">
@@ -280,8 +281,7 @@ export function PublicTaskDetailModal({
</div>
</div>
</div>
- </Dialog.Content>
- </Dialog.Portal>
- </Dialog.Root>
+ </DialogPopup>
+ </Dialog>
);
}
diff --git a/apps/web/src/components/public-project/task-row.tsx b/apps/web/src/components/public-project/task-row.tsx
index cd537e598..2c3baf2cf 100644
--- a/apps/web/src/components/public-project/task-row.tsx
+++ b/apps/web/src/components/public-project/task-row.tsx
@@ -28,7 +28,7 @@ export function PublicTaskRow({
return (
<button
type="button"
- className="group w-full text-left px-4 py-3 rounded-lg flex items-center gap-4 bg-card border border-border shadow-sm hover:shadow-md transition-all duration-200 ease-out hover:border-border/70 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:focus:ring-offset-zinc-900"
+ className="group w-full text-left px-4 py-3 rounded-lg flex items-center gap-4 bg-card border border-border shadow-sm hover:shadow-md transition-all duration-200 ease-out hover:border-border/70 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 focus:ring-offset-background"
onClick={() => onTaskClick(task)}
aria-label={`View details for task ${task.title}`}
>
diff --git a/apps/web/src/components/search-command-menu/index.tsx b/apps/web/src/components/search-command-menu/index.tsx
index 44f2d0a51..cddd34a3a 100644
--- a/apps/web/src/components/search-command-menu/index.tsx
+++ b/apps/web/src/components/search-command-menu/index.tsx
@@ -8,14 +8,20 @@ import {
Users,
Zap,
} from "lucide-react";
-import { useEffect, useState } from "react";
+import { Fragment, useEffect, useMemo, useState } from "react";
import {
+ Command,
+ CommandCollection,
CommandDialog,
+ CommandDialogPopup,
CommandEmpty,
CommandGroup,
+ CommandGroupLabel,
CommandInput,
CommandItem,
CommandList,
+ CommandPanel,
+ CommandSeparator,
} from "@/components/ui/command";
import { shortcuts } from "@/constants/shortcuts";
import useGlobalSearch from "@/hooks/queries/search/use-global-search";
@@ -36,6 +42,12 @@ type SearchResultItem = {
status?: string;
};
+type SearchGroup = {
+ value: string;
+ label: string;
+ items: SearchResultItem[];
+};
+
type SearchCommandMenuProps = {
open: boolean;
setOpen: (open: boolean) => void;
@@ -46,6 +58,8 @@ function SearchCommandMenu({ open, setOpen }: SearchCommandMenuProps) {
const { data: workspace } = useActiveWorkspace();
const navigate = useNavigate();
+ const searchEnabled = query.trim().length >= 3;
+
const { data: searchResults } = useGlobalSearch({
q: query,
type: "all",
@@ -138,17 +152,6 @@ function SearchCommandMenu({ open, setOpen }: SearchCommandMenuProps) {
}
};
- const groupedResults = searchResults?.results?.reduce(
- (acc: Record<string, SearchResultItem[]>, item: SearchResultItem) => {
- if (!acc[item.type]) {
- acc[item.type] = [];
- }
- acc[item.type].push(item);
- return acc;
- },
- {} as Record<string, SearchResultItem[]>,
- );
-
const getGroupLabel = (type: string) => {
switch (type) {
case "task":
@@ -166,6 +169,25 @@ function SearchCommandMenu({ open, setOpen }: SearchCommandMenuProps) {
}
};
+ const groupedItems = useMemo<SearchGroup[]>(() => {
+ if (!searchEnabled) return [];
+ const results = (searchResults?.results ?? []) as SearchResultItem[];
+ const grouped = results.reduce(
+ (acc: Record<string, SearchResultItem[]>, item: SearchResultItem) => {
+ if (!acc[item.type]) acc[item.type] = [];
+ acc[item.type].push(item);
+ return acc;
+ },
+ {} as Record<string, SearchResultItem[]>,
+ );
+
+ return Object.entries(grouped).map(([type, items]) => ({
+ value: type,
+ label: getGroupLabel(type),
+ items,
+ }));
+ }, [searchEnabled, searchResults?.results]);
+
return (
<CommandDialog
open={open}
@@ -173,59 +195,66 @@ function SearchCommandMenu({ open, setOpen }: SearchCommandMenuProps) {
title="Search"
description="Search for tasks, projects, comments, and more"
>
- <CommandInput
- placeholder="Search tasks, projects, comments..."
- value={query}
- onValueChange={setQuery}
- />
- <CommandList>
- {query.length <= 2 && (
- <CommandEmpty>
- <div className="text-center py-6">
- <Search className="h-8 w-8 mx-auto mb-2 text-muted-foreground" />
- <p className="text-sm text-muted-foreground">
- Type at least 3 characters to search
- </p>
- </div>
- </CommandEmpty>
- )}
-
- {groupedResults &&
- Object.keys(groupedResults).length > 0 &&
- Object.entries(groupedResults).map(([type, items]) =>
- items.length > 0 ? (
- <CommandGroup key={type} heading={getGroupLabel(type)}>
- {items.map((item) => {
- const Icon = getItemIcon(item.type);
- return (
- <CommandItem
- key={`${item.type}-${item.id}`}
- onSelect={() => handleSelect(item)}
- className="flex items-start gap-3 py-3"
- value={`${item.title} ${item.description || ""} ${item.type} ${item.id}`}
- aria-label={`${item.type}: ${item.title}`}
- >
- <Icon
- className="h-4 w-4 mt-0.5 text-muted-foreground flex-shrink-0"
- aria-hidden="true"
- />
- <div className="flex-1 min-w-0">
- <div className="font-medium text-sm truncate">
- {item.title}
- </div>
- {item.description && (
- <div className="text-xs text-muted-foreground truncate mt-1">
- {item.description}
- </div>
- )}
- </div>
- </CommandItem>
- );
- })}
- </CommandGroup>
- ) : null,
- )}
- </CommandList>
+ <CommandDialogPopup>
+ <Command items={groupedItems}>
+ <CommandInput
+ placeholder="Search tasks, projects, comments..."
+ value={query}
+ onValueChange={setQuery}
+ />
+ <CommandPanel>
+ <CommandEmpty>
+ <div className="text-center py-6">
+ <Search className="h-8 w-8 mx-auto mb-2 text-muted-foreground" />
+ <p className="text-sm text-muted-foreground">
+ {searchEnabled
+ ? "No results found."
+ : "Type at least 3 characters to search"}
+ </p>
+ </div>
+ </CommandEmpty>
+ <CommandList>
+ {(group: SearchGroup, groupIndex: number) => (
+ <Fragment key={group.value}>
+ <CommandGroup items={group.items}>
+ <CommandGroupLabel>{group.label}</CommandGroupLabel>
+ <CommandCollection>
+ {(item: SearchResultItem) => {
+ const Icon = getItemIcon(item.type);
+ return (
+ <CommandItem
+ key={`${item.type}-${item.id}`}
+ value={`${item.title} ${item.description || ""} ${item.type} ${item.id}`}
+ onClick={() => handleSelect(item)}
+ className="flex items-start gap-3 py-3"
+ aria-label={`${item.type}: ${item.title}`}
+ >
+ <Icon
+ className="h-4 w-4 mt-0.5 text-muted-foreground flex-shrink-0"
+ aria-hidden="true"
+ />
+ <div className="flex-1 min-w-0">
+ <div className="font-medium text-sm truncate">
+ {item.title}
+ </div>
+ {item.description && (
+ <div className="text-xs text-muted-foreground truncate mt-1">
+ {item.description}
+ </div>
+ )}
+ </div>
+ </CommandItem>
+ );
+ }}
+ </CommandCollection>
+ </CommandGroup>
+ {groupIndex < groupedItems.length - 1 && <CommandSeparator />}
+ </Fragment>
+ )}
+ </CommandList>
+ </CommandPanel>
+ </Command>
+ </CommandDialogPopup>
</CommandDialog>
);
}
diff --git a/apps/web/src/components/search.tsx b/apps/web/src/components/search.tsx
index 6429db135..d3333898b 100644
--- a/apps/web/src/components/search.tsx
+++ b/apps/web/src/components/search.tsx
@@ -4,7 +4,6 @@ import { shortcuts } from "@/constants/shortcuts";
import { useRegisterShortcuts } from "@/hooks/use-keyboard-shortcuts";
import SearchCommandMenu from "./search-command-menu";
import { Input } from "./ui/input";
-import { Kbd } from "./ui/kbd";
import { SidebarGroup } from "./ui/sidebar";
function Search() {
@@ -19,21 +18,30 @@ function Search() {
});
return (
- <SidebarGroup className="pb-0">
+ <SidebarGroup className="pb-1">
<div className="relative">
<Input
name="search"
- type="text"
+ type="search"
placeholder="Search"
- className="peer shadow-none block w-full rounded-sm py-1 pl-8 pr-10 text-sm h-8 cursor-pointer focus:outline-none focus:ring-0 focus-visible:ring-0 focus-visible:border-ring-0 focus-visible:outline-none"
- onClick={() => setOpen(true)}
readOnly
- tabIndex={-1}
+ className="peer rounded-md border-sidebar-border/70 bg-sidebar-accent/15 ps-9 pe-9 text-sidebar-foreground placeholder:text-sidebar-foreground/60 shadow-none"
+ onClick={() => setOpen(true)}
+ onFocus={() => setOpen(true)}
/>
- <SearchIcon className="pointer-events-none absolute left-2.5 top-1/2 h-3.5 w-3.5 -translate-y-1/2 text-muted-foreground" />
- <Kbd className="absolute right-2 top-1/2 -translate-y-1/2 h-4 text-[9px] bg-muted">
- {shortcuts.search.prefix}
- </Kbd>
+ <div className="pointer-events-none absolute inset-y-0 start-0 flex items-center justify-center ps-3 text-sidebar-foreground/65 peer-disabled:opacity-50">
+ <SearchIcon aria-hidden="true" className="h-4 w-4" />
+ </div>
+ <button
+ aria-label="Open search"
+ className="absolute inset-y-0 end-0 flex h-full w-9 items-center justify-center rounded-e-md text-sidebar-foreground/70 outline-none transition-[color,box-shadow] hover:text-sidebar-foreground focus:z-10 focus-visible:ring-[3px] focus-visible:ring-ring/40"
+ onClick={() => setOpen(true)}
+ type="button"
+ >
+ <span className="inline-flex h-5 min-w-5 items-center justify-center rounded-md bg-sidebar-accent px-1.5 text-[10px] leading-none text-sidebar-foreground/75">
+ {shortcuts.search.prefix}
+ </span>
+ </button>
</div>
<SearchCommandMenu open={open} setOpen={setOpen} />
</SidebarGroup>
diff --git a/apps/web/src/components/settings/api-key-created-modal.tsx b/apps/web/src/components/settings/api-key-created-modal.tsx
index 49d28d40c..ba9dc596c 100644
--- a/apps/web/src/components/settings/api-key-created-modal.tsx
+++ b/apps/web/src/components/settings/api-key-created-modal.tsx
@@ -1,6 +1,6 @@
import { Check, Copy } from "lucide-react";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { Alert, AlertDescription, AlertTitle } from "../ui/alert";
import { Button } from "../ui/button";
import {
@@ -57,7 +57,7 @@ export function ApiKeyCreatedModal({
>
{copied ? (
<>
- <Check className="h-3 w-3 text-green-500" />
+ <Check className="h-3 w-3 text-success-foreground" />
Copied
</>
) : (
diff --git a/apps/web/src/components/settings/api-key-table.tsx b/apps/web/src/components/settings/api-key-table.tsx
index acdcd6617..ba5db5568 100644
--- a/apps/web/src/components/settings/api-key-table.tsx
+++ b/apps/web/src/components/settings/api-key-table.tsx
@@ -1,6 +1,6 @@
import { Trash2 } from "lucide-react";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import useDeleteApiKey from "@/hooks/mutations/api-key/use-delete-api-key";
import type { ApiKey } from "@/types/api-key";
import { Button } from "../ui/button";
diff --git a/apps/web/src/components/settings/create-api-key-dialog.tsx b/apps/web/src/components/settings/create-api-key-dialog.tsx
index da699d808..af0242253 100644
--- a/apps/web/src/components/settings/create-api-key-dialog.tsx
+++ b/apps/web/src/components/settings/create-api-key-dialog.tsx
@@ -1,7 +1,7 @@
import { standardSchemaResolver } from "@hookform/resolvers/standard-schema";
import { useState } from "react";
import { useForm } from "react-hook-form";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { z } from "zod";
import useCreateApiKey from "@/hooks/mutations/api-key/use-create-api-key";
import type { CreateApiKeyResponse } from "@/types/api-key";
diff --git a/apps/web/src/components/shared/modals/create-project-modal.tsx b/apps/web/src/components/shared/modals/create-project-modal.tsx
index 9e5d8b8e0..a95fbe381 100644
--- a/apps/web/src/components/shared/modals/create-project-modal.tsx
+++ b/apps/web/src/components/shared/modals/create-project-modal.tsx
@@ -1,7 +1,7 @@
import { useQueryClient } from "@tanstack/react-query";
import { useNavigate } from "@tanstack/react-router";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import {
Breadcrumb,
BreadcrumbItem,
@@ -96,11 +96,11 @@ function CreateProjectModal({ open, onClose }: CreateProjectModalProps) {
<DialogTitle asChild>
<Breadcrumb>
<BreadcrumbList>
- <BreadcrumbItem className="text-zinc-600 dark:text-zinc-400 font-semibold tracking-wider text-sm">
+ <BreadcrumbItem className="text-muted-foreground font-semibold tracking-wider text-sm">
{workspace?.name?.toUpperCase() || "WORKSPACE"}
</BreadcrumbItem>
<BreadcrumbSeparator />
- <BreadcrumbItem className="text-zinc-700 dark:text-zinc-300 font-medium text-sm">
+ <BreadcrumbItem className="text-foreground font-medium text-sm">
Create a new project
</BreadcrumbItem>
</BreadcrumbList>
@@ -122,9 +122,9 @@ function CreateProjectModal({ open, onClose }: CreateProjectModalProps) {
<PopoverTrigger asChild>
<button
type="button"
- className="flex items-center justify-center p-2 rounded border border-border hover:border-zinc-400 dark:hover:border-zinc-600 transition-colors"
+ className="flex items-center justify-center p-2 rounded border border-border hover:bg-accent transition-colors"
>
- <IconComponent className="w-4 h-4 text-zinc-600 dark:text-zinc-400" />
+ <IconComponent className="w-4 h-4 text-muted-foreground" />
</button>
</PopoverTrigger>
<PopoverContent className="w-80 p-2" align="start">
@@ -141,8 +141,8 @@ function CreateProjectModal({ open, onClose }: CreateProjectModalProps) {
className={cn(
"p-2 rounded-lg transition-all duration-200 flex items-center justify-center group hover:scale-105",
selectedIcon === iconName
- ? "bg-indigo-50 text-indigo-600 dark:bg-indigo-500/10 dark:text-indigo-400"
- : "text-zinc-600 dark:text-zinc-400 hover:bg-zinc-100 dark:hover:bg-zinc-700",
+ ? "bg-accent text-foreground"
+ : "text-muted-foreground hover:bg-accent",
)}
title={iconName}
>
@@ -159,15 +159,15 @@ function CreateProjectModal({ open, onClose }: CreateProjectModalProps) {
onChange={handleNameChange}
autoFocus
placeholder="Project name"
- className="!text-2xl font-semibold !border-0 px-0 py-3 !shadow-none focus-visible:!ring-0 !bg-transparent text-zinc-900 dark:text-white placeholder:text-zinc-500 dark:placeholder:text-zinc-400 tracking-tight focus:!outline-none focus-visible:!outline-none"
+ className="!text-2xl font-semibold !border-0 px-0 py-3 !shadow-none focus-visible:!ring-0 !bg-transparent text-foreground placeholder:text-muted-foreground tracking-tight focus:!outline-none focus-visible:!outline-none"
required
/>
</div>
<div className="space-y-4 px-6">
- <div className="flex items-center gap-3 p-3 rounded-xl bg-gradient-to-r from-zinc-50 to-zinc-100/50 dark:from-zinc-900/50 dark:to-zinc-800/30 border border-zinc-200/50 dark:border-zinc-700/30">
+ <div className="flex items-center gap-3 p-3 rounded-xl bg-muted/50 border border-border">
<div className="flex items-center gap-2">
- <span className="text-sm font-medium text-zinc-600 dark:text-zinc-400">
+ <span className="text-sm font-medium text-muted-foreground">
Key:
</span>
<Input
@@ -175,11 +175,11 @@ function CreateProjectModal({ open, onClose }: CreateProjectModalProps) {
value={slug}
onChange={(e) => setSlug(e.target.value)}
placeholder="PRO"
- className="w-20 h-8 text-center font-semibold text-sm bg-white/80 dark:bg-zinc-900/80 border-zinc-300/50 dark:border-zinc-600/50 rounded-lg focus:bg-white dark:focus:bg-zinc-900 focus:border-indigo-400 dark:focus:border-indigo-500 transition-all duration-200"
+ className="w-20 h-8 text-center font-semibold text-sm bg-background border-border rounded-lg transition-all duration-200"
required
/>
</div>
- <div className="flex-1 text-xs text-zinc-500 dark:text-zinc-400 opacity-80">
+ <div className="flex-1 text-xs text-muted-foreground opacity-80">
Used for ticket IDs (e.g., {slug || "ABC"}-123)
</div>
</div>
@@ -191,7 +191,7 @@ function CreateProjectModal({ open, onClose }: CreateProjectModalProps) {
onClick={handleClose}
variant="outline"
size="sm"
- className="border-zinc-300 dark:border-zinc-700 text-zinc-700 dark:text-zinc-300 hover:bg-zinc-100 dark:hover:bg-zinc-800"
+ className="border-border text-foreground hover:bg-accent"
>
Cancel
</Button>
@@ -199,7 +199,7 @@ function CreateProjectModal({ open, onClose }: CreateProjectModalProps) {
type="submit"
disabled={!name.trim() || !slug.trim()}
size="sm"
- className="bg-primary hover:bg-primary/90 text-white disabled:opacity-50"
+ className="bg-primary hover:bg-primary/90 disabled:opacity-50"
>
Create Project
</Button>
diff --git a/apps/web/src/components/shared/modals/create-task-modal.tsx b/apps/web/src/components/shared/modals/create-task-modal.tsx
index a803e3056..b65f9c092 100644
--- a/apps/web/src/components/shared/modals/create-task-modal.tsx
+++ b/apps/web/src/components/shared/modals/create-task-modal.tsx
@@ -10,7 +10,7 @@ import {
X,
} from "lucide-react";
import { useCallback, useEffect, useRef, useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import TaskDescriptionEditor from "@/components/task/task-description-editor";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { Badge } from "@/components/ui/badge";
@@ -75,15 +75,15 @@ type Label = {
type PopoverStep = "select" | "color";
const labelColors = [
- { value: "gray" as LabelColor, label: "Stone", color: "#78716c" },
- { value: "dark-gray" as LabelColor, label: "Slate", color: "#64748b" },
- { value: "purple" as LabelColor, label: "Lavender", color: "#8b5cf6" },
- { value: "teal" as LabelColor, label: "Sage", color: "#059669" },
- { value: "green" as LabelColor, label: "Forest", color: "#16a34a" },
- { value: "yellow" as LabelColor, label: "Amber", color: "#d97706" },
- { value: "orange" as LabelColor, label: "Terracotta", color: "#ea580c" },
- { value: "pink" as LabelColor, label: "Rose", color: "#e11d48" },
- { value: "red" as LabelColor, label: "Crimson", color: "#dc2626" },
+ { value: "gray" as LabelColor, label: "Stone", color: "var(--color-stone-500)" },
+ { value: "dark-gray" as LabelColor, label: "Slate", color: "var(--color-slate-500)" },
+ { value: "purple" as LabelColor, label: "Lavender", color: "var(--color-violet-500)" },
+ { value: "teal" as LabelColor, label: "Sage", color: "var(--color-emerald-600)" },
+ { value: "green" as LabelColor, label: "Forest", color: "var(--color-green-600)" },
+ { value: "yellow" as LabelColor, label: "Amber", color: "var(--color-amber-600)" },
+ { value: "orange" as LabelColor, label: "Terracotta", color: "var(--color-orange-600)" },
+ { value: "pink" as LabelColor, label: "Rose", color: "var(--color-rose-600)" },
+ { value: "red" as LabelColor, label: "Crimson", color: "var(--color-red-600)" },
];
function CreateTaskModal({ open, onClose, status }: CreateTaskModalProps) {
@@ -345,11 +345,11 @@ function CreateTaskModal({ open, onClose, status }: CreateTaskModalProps) {
<DialogTitle asChild>
<Breadcrumb>
<BreadcrumbList>
- <BreadcrumbItem className="text-zinc-600 dark:text-zinc-400 font-semibold tracking-wider text-sm">
+ <BreadcrumbItem className="text-muted-foreground font-semibold tracking-wider text-sm">
{project?.slug?.toUpperCase() || "TASK"}
</BreadcrumbItem>
<BreadcrumbSeparator />
- <BreadcrumbItem className="text-zinc-700 dark:text-zinc-300 font-medium text-sm">
+ <BreadcrumbItem className="text-foreground font-medium text-sm">
New Task
</BreadcrumbItem>
</BreadcrumbList>
@@ -371,7 +371,7 @@ function CreateTaskModal({ open, onClose, status }: CreateTaskModalProps) {
onChange={(e) => setTitle(e.target.value)}
autoFocus
placeholder="Task title"
- className="!text-2xl font-semibold !border-0 px-0 py-3 !shadow-none focus-visible:!ring-0 !bg-transparent text-zinc-900 dark:text-white placeholder:text-zinc-500 dark:placeholder:text-zinc-400 tracking-tight focus:!outline-none focus-visible:!outline-none"
+ className="!text-2xl font-semibold !border-0 px-0 py-3 !shadow-none focus-visible:!ring-0 !bg-transparent text-foreground placeholder:text-muted-foreground tracking-tight focus:!outline-none focus-visible:!outline-none"
required
/>
@@ -390,7 +390,7 @@ function CreateTaskModal({ open, onClose, status }: CreateTaskModalProps) {
key={label.name}
color={label.color}
variant="outline"
- className="flex items-center gap-1 pl-3 cursor-pointer hover:bg-zinc-100 dark:hover:bg-zinc-800/50 transition-colors"
+ className="flex items-center gap-1 pl-3 cursor-pointer hover:bg-accent/50 transition-colors"
onClick={() => removeLabel(label.name)}
>
<span
@@ -398,7 +398,7 @@ function CreateTaskModal({ open, onClose, status }: CreateTaskModalProps) {
style={{
backgroundColor:
labelColors.find((c) => c.value === label.color)
- ?.color || "#94a3b8",
+ ?.color || "var(--color-neutral-400)",
}}
/>
{label.name}
@@ -625,7 +625,7 @@ function CreateTaskModal({ open, onClose, status }: CreateTaskModalProps) {
backgroundColor:
labelColors.find(
(c) => c.value === label.color,
- )?.color || "#94a3b8",
+ )?.color || "var(--color-neutral-400)",
}}
/>
<span className="truncate">{label.name}</span>
@@ -650,7 +650,7 @@ function CreateTaskModal({ open, onClose, status }: CreateTaskModalProps) {
backgroundColor:
labelColors.find(
(c) => c.value === selectedColor,
- )?.color || "#94a3b8",
+ )?.color || "var(--color-neutral-400)",
}}
/>
<span className="truncate">
@@ -709,12 +709,12 @@ function CreateTaskModal({ open, onClose, status }: CreateTaskModalProps) {
<DialogFooter>
<div className="flex items-center gap-3 mr-auto">
- <label className="flex items-center gap-2 text-sm text-zinc-600 dark:text-zinc-400 cursor-pointer hover:text-zinc-900 dark:hover:text-zinc-300 transition-colors">
+ <label className="flex items-center gap-2 text-sm text-muted-foreground cursor-pointer hover:text-foreground transition-colors">
<input
type="checkbox"
checked={createMore}
onChange={(e) => setCreateMore(e.target.checked)}
- className="rounded border-zinc-400 dark:border-zinc-600 bg-white dark:bg-zinc-800 text-indigo-500 focus:ring-indigo-500 focus:ring-offset-0 focus:ring-2 transition-all"
+ className="rounded border-border bg-background text-primary focus:ring-ring focus:ring-offset-0 focus:ring-2 transition-all"
/>
Create more
</label>
@@ -725,7 +725,7 @@ function CreateTaskModal({ open, onClose, status }: CreateTaskModalProps) {
onClick={handleClose}
variant="outline"
size="sm"
- className="border-zinc-300 dark:border-zinc-700 text-zinc-700 dark:text-zinc-300 hover:bg-zinc-100 dark:hover:bg-zinc-800"
+ className="border-border text-foreground hover:bg-accent"
>
Cancel
</Button>
@@ -733,7 +733,7 @@ function CreateTaskModal({ open, onClose, status }: CreateTaskModalProps) {
type="submit"
disabled={!title.trim()}
size="sm"
- className="bg-indigo-600 hover:bg-indigo-500 text-white disabled:opacity-50"
+ className="disabled:opacity-50"
>
Create Task
</Button>
diff --git a/apps/web/src/components/shared/modals/create-workspace-modal.tsx b/apps/web/src/components/shared/modals/create-workspace-modal.tsx
index 638d6fc75..dba8b0df4 100644
--- a/apps/web/src/components/shared/modals/create-workspace-modal.tsx
+++ b/apps/web/src/components/shared/modals/create-workspace-modal.tsx
@@ -1,7 +1,7 @@
import { useQueryClient } from "@tanstack/react-query";
import { useNavigate } from "@tanstack/react-router";
import { useEffect, useRef, useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import {
Breadcrumb,
BreadcrumbItem,
@@ -83,11 +83,11 @@ function CreateWorkspaceModal({ open, onClose }: CreateWorkspaceModalProps) {
<DialogTitle asChild>
<Breadcrumb>
<BreadcrumbList>
- <BreadcrumbItem className="text-zinc-600 dark:text-zinc-400 font-semibold tracking-wider text-sm">
+ <BreadcrumbItem className="text-muted-foreground font-semibold tracking-wider text-sm">
KANEO
</BreadcrumbItem>
<BreadcrumbSeparator />
- <BreadcrumbItem className="text-zinc-700 dark:text-zinc-300 font-medium text-sm">
+ <BreadcrumbItem className="text-foreground font-medium text-sm">
Create a new workspace
</BreadcrumbItem>
</BreadcrumbList>
@@ -105,7 +105,7 @@ function CreateWorkspaceModal({ open, onClose }: CreateWorkspaceModalProps) {
value={name}
onChange={(e) => setName(e.target.value)}
placeholder="Workspace name"
- className="!text-2xl font-semibold !border-0 px-0 py-3 !shadow-none focus-visible:!ring-0 !bg-transparent text-zinc-900 dark:text-white placeholder:text-zinc-500 dark:placeholder:text-zinc-400 tracking-tight focus:!outline-none focus-visible:!outline-none"
+ className="!text-2xl font-semibold !border-0 px-0 py-3 !shadow-none focus-visible:!ring-0 !bg-transparent text-foreground placeholder:text-muted-foreground tracking-tight focus:!outline-none focus-visible:!outline-none"
required
/>
@@ -113,7 +113,7 @@ function CreateWorkspaceModal({ open, onClose }: CreateWorkspaceModalProps) {
value={description}
onChange={(e) => setDescription(e.target.value)}
placeholder="Add description..."
- className="!border-0 px-0 py-2 !shadow-none focus-visible:!ring-0 !bg-transparent text-zinc-700 dark:text-zinc-300 placeholder:text-zinc-500 dark:placeholder:text-zinc-400 focus:!outline-none focus-visible:!outline-none"
+ className="!border-0 px-0 py-2 !shadow-none focus-visible:!ring-0 !bg-transparent text-foreground placeholder:text-muted-foreground focus:!outline-none focus-visible:!outline-none"
/>
</div>
@@ -123,7 +123,7 @@ function CreateWorkspaceModal({ open, onClose }: CreateWorkspaceModalProps) {
onClick={handleClose}
variant="outline"
size="sm"
- className="border-zinc-300 dark:border-zinc-700 text-zinc-700 dark:text-zinc-300 hover:bg-zinc-100 dark:hover:bg-zinc-800"
+ className="border-border text-foreground hover:bg-accent"
>
Cancel
</Button>
@@ -131,7 +131,7 @@ function CreateWorkspaceModal({ open, onClose }: CreateWorkspaceModalProps) {
type="submit"
disabled={!name.trim()}
size="sm"
- className="bg-indigo-600 hover:bg-indigo-500 text-white disabled:opacity-50"
+ className="disabled:opacity-50"
>
Create Workspace
</Button>
diff --git a/apps/web/src/components/task/task-assignee-popover.tsx b/apps/web/src/components/task/task-assignee-popover.tsx
index 48daf55ff..b428714ab 100644
--- a/apps/web/src/components/task/task-assignee-popover.tsx
+++ b/apps/web/src/components/task/task-assignee-popover.tsx
@@ -1,6 +1,6 @@
import { Check } from "lucide-react";
import { useCallback, useMemo, useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { Button } from "@/components/ui/button";
import {
diff --git a/apps/web/src/components/task/task-description-editor.tsx b/apps/web/src/components/task/task-description-editor.tsx
index 52879828c..4fc6fec52 100644
--- a/apps/web/src/components/task/task-description-editor.tsx
+++ b/apps/web/src/components/task/task-description-editor.tsx
@@ -25,6 +25,7 @@ import {
} from "lucide-react";
import { Button } from "@/components/ui/button";
+import CustomSlashMenu from "@/components/blocknote/custom-slash-menu";
import { KbdSequence } from "@/components/ui/kbd";
import {
Tooltip,
@@ -258,6 +259,7 @@ export default function TaskDescriptionEditor({
/>
<SuggestionMenuController
triggerCharacter={"/"}
+ suggestionMenuComponent={CustomSlashMenu}
getItems={async (query) =>
getDefaultReactSlashMenuItems(editor).filter(
(item) => item.group !== "Media",
diff --git a/apps/web/src/components/task/task-description.tsx b/apps/web/src/components/task/task-description.tsx
index 3fbd039d9..71084aed8 100644
--- a/apps/web/src/components/task/task-description.tsx
+++ b/apps/web/src/components/task/task-description.tsx
@@ -26,6 +26,7 @@ import {
} from "lucide-react";
import { Button } from "@/components/ui/button";
+import CustomSlashMenu from "@/components/blocknote/custom-slash-menu";
import { Form, FormControl, FormField } from "@/components/ui/form";
import { KbdSequence } from "@/components/ui/kbd";
import {
@@ -355,6 +356,7 @@ export default function TaskDescription({ taskId }: TaskDescriptionProps) {
/>
<SuggestionMenuController
triggerCharacter={"/"}
+ suggestionMenuComponent={CustomSlashMenu}
getItems={async (query) =>
getDefaultReactSlashMenuItems(editor).filter(
(item) => item.group !== "Media",
diff --git a/apps/web/src/components/task/task-due-date-popover.tsx b/apps/web/src/components/task/task-due-date-popover.tsx
index ad0b67a40..36f5c1847 100644
--- a/apps/web/src/components/task/task-due-date-popover.tsx
+++ b/apps/web/src/components/task/task-due-date-popover.tsx
@@ -1,6 +1,6 @@
import { X } from "lucide-react";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { Button } from "@/components/ui/button";
import { Calendar } from "@/components/ui/calendar";
import {
diff --git a/apps/web/src/components/task/task-labels-popover.tsx b/apps/web/src/components/task/task-labels-popover.tsx
index 6fc01b48f..bef487b0e 100644
--- a/apps/web/src/components/task/task-labels-popover.tsx
+++ b/apps/web/src/components/task/task-labels-popover.tsx
@@ -1,7 +1,7 @@
import { useQueryClient } from "@tanstack/react-query";
import { Check, Plus, Search, X } from "lucide-react";
import { useEffect, useMemo, useRef, useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { Input } from "@/components/ui/input";
import {
Popover,
@@ -16,15 +16,15 @@ import { cn } from "@/lib/cn";
import type Task from "@/types/task";
const labelColors = [
- { value: "gray", label: "Stone", color: "#78716c" },
- { value: "dark-gray", label: "Slate", color: "#64748b" },
- { value: "purple", label: "Lavender", color: "#8b5cf6" },
- { value: "teal", label: "Sage", color: "#059669" },
- { value: "green", label: "Forest", color: "#16a34a" },
- { value: "yellow", label: "Amber", color: "#d97706" },
- { value: "orange", label: "Terracotta", color: "#ea580c" },
- { value: "pink", label: "Rose", color: "#e11d48" },
- { value: "red", label: "Crimson", color: "#dc2626" },
+ { value: "gray", label: "Stone", color: "var(--color-stone-500)" },
+ { value: "dark-gray", label: "Slate", color: "var(--color-slate-500)" },
+ { value: "purple", label: "Lavender", color: "var(--color-violet-500)" },
+ { value: "teal", label: "Sage", color: "var(--color-emerald-600)" },
+ { value: "green", label: "Forest", color: "var(--color-green-600)" },
+ { value: "yellow", label: "Amber", color: "var(--color-amber-600)" },
+ { value: "orange", label: "Terracotta", color: "var(--color-orange-600)" },
+ { value: "pink", label: "Rose", color: "var(--color-rose-600)" },
+ { value: "red", label: "Crimson", color: "var(--color-red-600)" },
];
type LabelColor =
@@ -235,7 +235,7 @@ export default function TaskLabelsPopover({
style={{
backgroundColor:
labelColors.find((c) => c.value === label.color)?.color ||
- "#94a3b8",
+ "var(--color-neutral-400)",
}}
/>
<span className="truncate">{label.name}</span>
@@ -259,7 +259,7 @@ export default function TaskLabelsPopover({
style={{
backgroundColor:
labelColors.find((c) => c.value === selectedColor)?.color ||
- "#94a3b8",
+ "var(--color-neutral-400)",
}}
/>
<span className="truncate">Create "{searchValue}"</span>
diff --git a/apps/web/src/components/task/task-priority-popover.tsx b/apps/web/src/components/task/task-priority-popover.tsx
index 36000a93d..d11f58ac9 100644
--- a/apps/web/src/components/task/task-priority-popover.tsx
+++ b/apps/web/src/components/task/task-priority-popover.tsx
@@ -1,6 +1,6 @@
import { Check } from "lucide-react";
import { useCallback, useMemo, useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { Button } from "@/components/ui/button";
import {
Popover,
diff --git a/apps/web/src/components/task/task-properties-sidebar.tsx b/apps/web/src/components/task/task-properties-sidebar.tsx
index 5d513f56c..62530e5d2 100644
--- a/apps/web/src/components/task/task-properties-sidebar.tsx
+++ b/apps/web/src/components/task/task-properties-sidebar.tsx
@@ -7,7 +7,7 @@ import {
GitBranch,
Plus,
} from "lucide-react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
@@ -617,7 +617,7 @@ export default function TaskPropertiesSidebar({
style={{
backgroundColor:
labelColors.find((c) => c.value === label.color)
- ?.color || "#94a3b8",
+ ?.color || "var(--color-neutral-400)",
}}
/>
<span className="truncate max-w-[60px]">
diff --git a/apps/web/src/components/task/task-status-popover.tsx b/apps/web/src/components/task/task-status-popover.tsx
index 629f0bf05..be7afe857 100644
--- a/apps/web/src/components/task/task-status-popover.tsx
+++ b/apps/web/src/components/task/task-status-popover.tsx
@@ -1,6 +1,6 @@
import { Check } from "lucide-react";
import { useCallback, useMemo, useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { Button } from "@/components/ui/button";
import {
Popover,
diff --git a/apps/web/src/components/task/task-title.tsx b/apps/web/src/components/task/task-title.tsx
index 4c44cf0c4..e1f8f3c0b 100644
--- a/apps/web/src/components/task/task-title.tsx
+++ b/apps/web/src/components/task/task-title.tsx
@@ -84,7 +84,7 @@ export default function TaskTitle({ taskId }: TaskTitleProps) {
<Input
{...field}
placeholder="Click to add a title"
- className="!text-2xl font-semibold !border-0 px-0 py-3 !shadow-none focus-visible:!ring-0 !bg-transparent text-zinc-900 dark:text-white placeholder:text-zinc-500 dark:placeholder:text-zinc-400 tracking-tight focus:!outline-none focus-visible:!outline-none"
+ className="!text-2xl font-semibold !border-0 px-0 py-3 !shadow-none focus-visible:!ring-0 !bg-transparent text-foreground placeholder:text-muted-foreground tracking-tight focus:!outline-none focus-visible:!outline-none"
onChange={(e) => {
field.onChange(e);
handleTitleChange(e.target.value);
diff --git a/apps/web/src/components/team/delete-team-member-modal.tsx b/apps/web/src/components/team/delete-team-member-modal.tsx
index 434fb51d2..17fd3c9fe 100644
--- a/apps/web/src/components/team/delete-team-member-modal.tsx
+++ b/apps/web/src/components/team/delete-team-member-modal.tsx
@@ -1,9 +1,9 @@
-import * as Dialog from "@radix-ui/react-dialog";
import { useQueryClient } from "@tanstack/react-query";
import { Trash2, X } from "lucide-react";
import useDeleteWorkspaceUser from "@/hooks/mutations/workspace-user/use-delete-workspace-user";
import { Route } from "@/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/members";
import { Button } from "../ui/button";
+import { Dialog, DialogClose, DialogPopup, DialogTitle } from "../ui/dialog";
function DeleteTeamMemberModal({
userId,
@@ -32,41 +32,41 @@ function DeleteTeamMemberModal({
};
return (
- <Dialog.Root open={open} onOpenChange={onClose}>
- <Dialog.Portal>
- <Dialog.Overlay className="fixed inset-0 bg-black/40 backdrop-blur-sm" />
- <Dialog.Content className="fixed left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 w-full max-w-md">
- <div className="bg-white dark:bg-zinc-900 rounded-lg shadow-xl">
- <div className="flex items-center justify-between p-4 border-b border-zinc-200 dark:border-zinc-800">
- <Dialog.Title className="text-lg font-semibold text-zinc-900 dark:text-zinc-100">
+ <Dialog open={open} onOpenChange={onClose}>
+ <DialogPopup className="w-full max-w-md">
+ <div className="bg-card rounded-lg shadow-xl">
+ <div className="flex items-center justify-between p-4 border-b border-border">
+ <DialogTitle className="text-lg font-semibold text-foreground">
Remove Team Member
- </Dialog.Title>
- <Dialog.Close className="text-zinc-500 hover:text-zinc-700 dark:text-zinc-400 dark:hover:text-zinc-300">
+ </DialogTitle>
+ <DialogClose
+ className="text-muted-foreground hover:text-foreground"
+ render={<button type="button" />}
+ >
<X size={20} />
- </Dialog.Close>
+ </DialogClose>
</div>
<div className="p-4">
- <p className="text-sm text-zinc-600 dark:text-zinc-400 mb-6">
+ <p className="text-sm text-muted-foreground mb-6">
Are you sure you want to remove{" "}
- <span className="font-medium text-zinc-900 dark:text-zinc-100">
+ <span className="font-medium text-foreground">
{userId}
</span>{" "}
from the team? This action cannot be undone.
</p>
<div className="flex justify-end gap-2">
- <Dialog.Close asChild>
- <Button
- type="button"
- className="bg-zinc-100 text-zinc-900 hover:bg-zinc-200 dark:bg-zinc-800 dark:text-zinc-100 dark:hover:bg-zinc-700"
- >
- Cancel
- </Button>
- </Dialog.Close>
+ <DialogClose
+ render={
+ <Button className="bg-muted text-foreground hover:bg-accent" type="button" />
+ }
+ >
+ Cancel
+ </DialogClose>
<Button
onClick={onRemoveMember}
- className="bg-red-600 text-white hover:bg-red-500 dark:bg-red-500 dark:hover:bg-red-400"
+ variant="destructive"
>
<Trash2 className="w-4 h-4 mr-2" />
Remove Member
@@ -74,9 +74,8 @@ function DeleteTeamMemberModal({
</div>
</div>
</div>
- </Dialog.Content>
- </Dialog.Portal>
- </Dialog.Root>
+ </DialogPopup>
+ </Dialog>
);
}
diff --git a/apps/web/src/components/team/invite-team-member-modal.tsx b/apps/web/src/components/team/invite-team-member-modal.tsx
index 0c257c5a0..d10c3ff60 100644
--- a/apps/web/src/components/team/invite-team-member-modal.tsx
+++ b/apps/web/src/components/team/invite-team-member-modal.tsx
@@ -1,9 +1,8 @@
import { standardSchemaResolver } from "@hookform/resolvers/standard-schema";
-import * as Dialog from "@radix-ui/react-dialog";
import { useQueryClient } from "@tanstack/react-query";
import { X } from "lucide-react";
import { useForm } from "react-hook-form";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { z } from "zod/v4";
import useInviteWorkspaceUser from "@/hooks/mutations/workspace-user/use-invite-workspace-user";
import { Route } from "@/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/members";
@@ -17,6 +16,7 @@ import {
FormMessage,
} from "../ui/form";
import { Input } from "../ui/input";
+import { Dialog, DialogClose, DialogPopup, DialogTitle } from "../ui/dialog";
type Props = {
open: boolean;
@@ -72,21 +72,19 @@ function InviteTeamMemberModal({ open, onClose }: Props) {
};
return (
- <Dialog.Root open={open} onOpenChange={resetAndCloseModal}>
- <Dialog.Portal>
- <Dialog.Overlay className="fixed inset-0 bg-black/40 backdrop-blur-sm z-40" />
- <Dialog.Content className="fixed z-50 left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 w-full max-w-md">
- <div className="bg-white dark:bg-zinc-900 rounded-lg shadow-xl">
- <div className="flex items-center justify-between p-4 border-b border-zinc-200 dark:border-zinc-800">
- <Dialog.Title className="text-lg font-semibold text-zinc-900 dark:text-zinc-100">
+ <Dialog open={open} onOpenChange={resetAndCloseModal}>
+ <DialogPopup className="w-full max-w-md">
+ <div className="bg-card rounded-lg shadow-xl">
+ <div className="flex items-center justify-between p-4 border-b border-border">
+ <DialogTitle className="text-lg font-semibold text-foreground">
Invite Team Member
- </Dialog.Title>
- <Dialog.Close
- asChild
- className="text-zinc-500 hover:text-zinc-700 dark:text-zinc-400 dark:hover:text-zinc-300"
+ </DialogTitle>
+ <DialogClose
+ className="text-muted-foreground hover:text-foreground"
+ render={<button type="button" />}
>
<X size={20} />
- </Dialog.Close>
+ </DialogClose>
</div>
<Form {...form}>
@@ -98,14 +96,14 @@ function InviteTeamMemberModal({ open, onClose }: Props) {
name="email"
render={({ field }) => (
<FormItem>
- <FormLabel className="block text-sm font-medium text-zinc-900 dark:text-zinc-300 mb-1">
+ <FormLabel className="block text-sm font-medium text-foreground mb-1">
Email
</FormLabel>
<FormControl>
<Input
{...field}
placeholder="[email protected]"
- className="bg-white dark:bg-zinc-800/50"
+ className="bg-card/50"
autoFocus
/>
</FormControl>
@@ -117,27 +115,22 @@ function InviteTeamMemberModal({ open, onClose }: Props) {
</div>
<div className="flex justify-end gap-2 mt-6">
- <Dialog.Close asChild>
- <Button
- type="button"
- className="bg-zinc-100 text-zinc-900 hover:bg-zinc-200 dark:bg-zinc-800 dark:text-zinc-100 dark:hover:bg-zinc-700"
- >
- Cancel
- </Button>
- </Dialog.Close>
- <Button
- type="submit"
- className="bg-indigo-600 text-white hover:bg-indigo-500 dark:bg-indigo-500 dark:hover:bg-indigo-400"
+ <DialogClose
+ render={
+ <Button className="bg-muted text-foreground hover:bg-accent" type="button" />
+ }
>
+ Cancel
+ </DialogClose>
+ <Button type="submit">
Send Invitation
</Button>
</div>
</form>
</Form>
</div>
- </Dialog.Content>
- </Dialog.Portal>
- </Dialog.Root>
+ </DialogPopup>
+ </Dialog>
);
}
diff --git a/apps/web/src/components/team/members-table.tsx b/apps/web/src/components/team/members-table.tsx
index cb4360868..30a9eddd6 100644
--- a/apps/web/src/components/team/members-table.tsx
+++ b/apps/web/src/components/team/members-table.tsx
@@ -1,6 +1,6 @@
import { Trash2 } from "lucide-react";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import useCancelInvitation from "@/hooks/mutations/workspace-user/use-cancel-invitation";
import useDeleteWorkspaceUser from "@/hooks/mutations/workspace-user/use-delete-workspace-user";
import { Route } from "@/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/members";
@@ -11,8 +11,8 @@ import type {
import { useAuth } from "../providers/auth-provider/hooks/use-auth";
import {
AlertDialog,
- AlertDialogAction,
- AlertDialogCancel,
+ AlertDialogClose,
+
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
@@ -248,15 +248,15 @@ function MembersTable({
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
- <AlertDialogCancel disabled={isPending}>Cancel</AlertDialogCancel>
- <AlertDialogAction
+ <AlertDialogClose disabled={isPending}>Cancel</AlertDialogClose>
+ <AlertDialogClose
onClick={handleDeleteMember}
disabled={isPending}
className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
>
<Trash2 className="w-4 h-4 mr-2" />
Remove Member
- </AlertDialogAction>
+ </AlertDialogClose>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
@@ -277,17 +277,17 @@ function MembersTable({
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
- <AlertDialogCancel disabled={isCancelling}>
+ <AlertDialogClose disabled={isCancelling}>
Cancel
- </AlertDialogCancel>
- <AlertDialogAction
+ </AlertDialogClose>
+ <AlertDialogClose
onClick={handleCancelInvitation}
disabled={isCancelling}
className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
>
<Trash2 className="w-4 h-4 mr-2" />
Cancel Invitation
- </AlertDialogAction>
+ </AlertDialogClose>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
diff --git a/apps/web/src/components/theme-toggle-dropdown.tsx b/apps/web/src/components/theme-toggle-dropdown.tsx
index cd5a9c4df..bc38dfe47 100644
--- a/apps/web/src/components/theme-toggle-dropdown.tsx
+++ b/apps/web/src/components/theme-toggle-dropdown.tsx
@@ -6,7 +6,7 @@ import {
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
+} from "@/components/ui/menu";
import { useUserPreferencesStore } from "@/store/user-preferences";
diff --git a/apps/web/src/components/ui/accordion.tsx b/apps/web/src/components/ui/accordion.tsx
index a5271f1a7..2c7c56742 100644
--- a/apps/web/src/components/ui/accordion.tsx
+++ b/apps/web/src/components/ui/accordion.tsx
@@ -1,55 +1,69 @@
-import * as AccordionPrimitive from "@radix-ui/react-accordion";
-import { ChevronDown } from "lucide-react";
-import * as React from "react";
+"use client";
+
+import { Accordion as AccordionPrimitive } from "@base-ui/react/accordion";
+import { ChevronDownIcon } from "lucide-react";
import { cn } from "@/lib/cn";
-const Accordion = AccordionPrimitive.Root;
+function Accordion(props: AccordionPrimitive.Root.Props) {
+ return <AccordionPrimitive.Root data-slot="accordion" {...props} />;
+}
+
+function AccordionItem({ className, ...props }: AccordionPrimitive.Item.Props) {
+ return (
+ <AccordionPrimitive.Item
+ className={cn("border-b last:border-b-0", className)}
+ data-slot="accordion-item"
+ {...props}
+ />
+ );
+}
-const AccordionItem = React.forwardRef<
- React.ElementRef<typeof AccordionPrimitive.Item>,
- React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Item>
->(({ className, ...props }, ref) => (
- <AccordionPrimitive.Item
- ref={ref}
- className={cn("border-b", className)}
- {...props}
- />
-));
-AccordionItem.displayName = "AccordionItem";
+function AccordionTrigger({
+ className,
+ children,
+ ...props
+}: AccordionPrimitive.Trigger.Props) {
+ return (
+ <AccordionPrimitive.Header className="flex">
+ <AccordionPrimitive.Trigger
+ className={cn(
+ "flex flex-1 cursor-pointer items-start justify-between gap-4 rounded-md py-4 text-left font-medium text-sm outline-none transition-all focus-visible:ring-[3px] focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-64 data-panel-open:*:data-[slot=accordion-indicator]:rotate-180",
+ className,
+ )}
+ data-slot="accordion-trigger"
+ {...props}
+ >
+ {children}
+ <ChevronDownIcon
+ className="pointer-events-none size-4 shrink-0 translate-y-0.5 opacity-80 transition-transform duration-200 ease-in-out"
+ data-slot="accordion-indicator"
+ />
+ </AccordionPrimitive.Trigger>
+ </AccordionPrimitive.Header>
+ );
+}
-const AccordionTrigger = React.forwardRef<
- React.ElementRef<typeof AccordionPrimitive.Trigger>,
- React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Trigger>
->(({ className, children, ...props }, ref) => (
- <AccordionPrimitive.Header className="flex">
- <AccordionPrimitive.Trigger
- ref={ref}
- className={cn(
- "flex flex-1 items-center justify-between py-4 text-sm font-medium transition-all hover:underline text-left [&[data-state=open]>svg]:rotate-180",
- className,
- )}
+function AccordionPanel({
+ className,
+ children,
+ ...props
+}: AccordionPrimitive.Panel.Props) {
+ return (
+ <AccordionPrimitive.Panel
+ className="h-(--accordion-panel-height) overflow-hidden text-muted-foreground text-sm transition-[height] duration-200 ease-in-out data-ending-style:h-0 data-starting-style:h-0"
+ data-slot="accordion-panel"
{...props}
>
- {children}
- <ChevronDown className="h-4 w-4 shrink-0 text-muted-foreground transition-transform duration-200" />
- </AccordionPrimitive.Trigger>
- </AccordionPrimitive.Header>
-));
-AccordionTrigger.displayName = AccordionPrimitive.Trigger.displayName;
-
-const AccordionContent = React.forwardRef<
- React.ElementRef<typeof AccordionPrimitive.Content>,
- React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Content>
->(({ className, children, ...props }, ref) => (
- <AccordionPrimitive.Content
- ref={ref}
- className="overflow-hidden text-sm data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down"
- {...props}
- >
- <div className={cn("pb-4 pt-0", className)}>{children}</div>
- </AccordionPrimitive.Content>
-));
-AccordionContent.displayName = AccordionPrimitive.Content.displayName;
+ <div className={cn("pt-0 pb-4", className)}>{children}</div>
+ </AccordionPrimitive.Panel>
+ );
+}
-export { Accordion, AccordionItem, AccordionTrigger, AccordionContent };
+export {
+ Accordion,
+ AccordionItem,
+ AccordionTrigger,
+ AccordionPanel,
+ AccordionPanel as AccordionContent,
+};
diff --git a/apps/web/src/components/ui/alert-dialog.tsx b/apps/web/src/components/ui/alert-dialog.tsx
index 92096961c..ec44c6bda 100644
--- a/apps/web/src/components/ui/alert-dialog.tsx
+++ b/apps/web/src/components/ui/alert-dialog.tsx
@@ -1,84 +1,80 @@
-import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog";
-import type * as React from "react";
+"use client";
+
+import { AlertDialog as AlertDialogPrimitive } from "@base-ui/react/alert-dialog";
-import { buttonVariants } from "@/components/ui/button";
import { cn } from "@/lib/cn";
-function AlertDialog({
- onOpenChange,
- ...props
-}: React.ComponentProps<typeof AlertDialogPrimitive.Root>) {
- return (
- <AlertDialogPrimitive.Root
- data-slot="alert-dialog"
- onOpenChange={(open) => {
- // Fix for Radix UI bug where pointer-events: none remains on body
- if (!open) {
- // Use setTimeout to ensure this runs after Radix's cleanup
- setTimeout(() => {
- document.body.style.pointerEvents = "";
- // Also remove any data attributes that might block interactions
- document.body.removeAttribute("data-scroll-locked");
- }, 100);
- }
- onOpenChange?.(open);
- }}
- {...props}
- />
- );
-}
+const AlertDialogCreateHandle = AlertDialogPrimitive.createHandle;
-function AlertDialogTrigger({
- ...props
-}: React.ComponentProps<typeof AlertDialogPrimitive.Trigger>) {
+const AlertDialog = AlertDialogPrimitive.Root;
+
+const AlertDialogPortal = AlertDialogPrimitive.Portal;
+
+function AlertDialogTrigger(props: AlertDialogPrimitive.Trigger.Props) {
return (
<AlertDialogPrimitive.Trigger data-slot="alert-dialog-trigger" {...props} />
);
}
-function AlertDialogPortal({
+function AlertDialogBackdrop({
+ className,
...props
-}: React.ComponentProps<typeof AlertDialogPrimitive.Portal>) {
+}: AlertDialogPrimitive.Backdrop.Props) {
return (
- <AlertDialogPrimitive.Portal data-slot="alert-dialog-portal" {...props} />
+ <AlertDialogPrimitive.Backdrop
+ className={cn(
+ "fixed inset-0 z-50 bg-black/32 backdrop-blur-sm transition-all duration-200 ease-out data-ending-style:opacity-0 data-starting-style:opacity-0",
+ className,
+ )}
+ data-slot="alert-dialog-backdrop"
+ {...props}
+ />
);
}
-function AlertDialogOverlay({
+function AlertDialogViewport({
className,
...props
-}: React.ComponentProps<typeof AlertDialogPrimitive.Overlay>) {
+}: AlertDialogPrimitive.Viewport.Props) {
return (
- <AlertDialogPrimitive.Overlay
- data-slot="alert-dialog-overlay"
+ <AlertDialogPrimitive.Viewport
className={cn(
- "data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50",
+ "fixed inset-0 z-50 grid grid-rows-[1fr_auto_3fr] justify-items-center p-4",
className,
)}
+ data-slot="alert-dialog-viewport"
{...props}
/>
);
}
-function AlertDialogContent({
+function AlertDialogPopup({
className,
+ bottomStickOnMobile = true,
...props
-}: React.ComponentProps<typeof AlertDialogPrimitive.Content>) {
+}: AlertDialogPrimitive.Popup.Props & {
+ bottomStickOnMobile?: boolean;
+}) {
return (
<AlertDialogPortal>
- <AlertDialogOverlay />
- <AlertDialogPrimitive.Content
- data-slot="alert-dialog-content"
+ <AlertDialogBackdrop />
+ <AlertDialogViewport
className={cn(
- "bg-card data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border p-6 shadow-lg duration-200 sm:max-w-lg",
- className,
+ bottomStickOnMobile &&
+ "max-sm:grid-rows-[1fr_auto] max-sm:p-0 max-sm:pt-12",
)}
- onCloseAutoFocus={(e) => {
- // Prevent focus issues when closing AlertDialog opened from ContextMenu
- e.preventDefault();
- }}
- {...props}
- />
+ >
+ <AlertDialogPrimitive.Popup
+ className={cn(
+ "-translate-y-[calc(1.25rem*var(--nested-dialogs))] relative row-start-2 flex max-h-full min-h-0 w-full min-w-0 max-w-lg scale-[calc(1-0.1*var(--nested-dialogs))] flex-col rounded-2xl border bg-popover not-dark:bg-clip-padding text-popover-foreground opacity-[calc(1-0.1*var(--nested-dialogs))] shadow-lg/5 transition-[scale,opacity,translate] duration-200 ease-in-out will-change-transform before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-2xl)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] data-nested:data-ending-style:translate-y-8 data-nested:data-starting-style:translate-y-8 data-nested-dialog-open:origin-top data-ending-style:scale-98 data-starting-style:scale-98 data-ending-style:opacity-0 data-starting-style:opacity-0 dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ bottomStickOnMobile &&
+ "max-sm:max-w-none max-sm:rounded-none max-sm:border-x-0 max-sm:border-t max-sm:border-b-0 max-sm:opacity-[calc(1-min(var(--nested-dialogs),1))] max-sm:data-ending-style:translate-y-4 max-sm:data-starting-style:translate-y-4 max-sm:before:hidden max-sm:before:rounded-none",
+ className,
+ )}
+ data-slot="alert-dialog-popup"
+ {...props}
+ />
+ </AlertDialogViewport>
</AlertDialogPortal>
);
}
@@ -89,8 +85,11 @@ function AlertDialogHeader({
}: React.ComponentProps<"div">) {
return (
<div
+ className={cn(
+ "flex flex-col gap-2 p-6 text-center max-sm:pb-4 sm:text-left",
+ className,
+ )}
data-slot="alert-dialog-header"
- className={cn("flex flex-col gap-2 text-center sm:text-left", className)}
{...props}
/>
);
@@ -98,15 +97,20 @@ function AlertDialogHeader({
function AlertDialogFooter({
className,
+ variant = "default",
...props
-}: React.ComponentProps<"div">) {
+}: React.ComponentProps<"div"> & {
+ variant?: "default" | "bare";
+}) {
return (
<div
- data-slot="alert-dialog-footer"
className={cn(
- "flex flex-col-reverse gap-2 sm:flex-row sm:justify-end",
+ "flex flex-col-reverse gap-2 px-6 sm:flex-row sm:justify-end sm:rounded-b-[calc(var(--radius-2xl)-1px)]",
+ variant === "default" && "border-t bg-muted/72 py-4",
+ variant === "bare" && "pb-6",
className,
)}
+ data-slot="alert-dialog-footer"
{...props}
/>
);
@@ -115,11 +119,14 @@ function AlertDialogFooter({
function AlertDialogTitle({
className,
...props
-}: React.ComponentProps<typeof AlertDialogPrimitive.Title>) {
+}: AlertDialogPrimitive.Title.Props) {
return (
<AlertDialogPrimitive.Title
+ className={cn(
+ "font-heading font-semibold text-xl leading-none",
+ className,
+ )}
data-slot="alert-dialog-title"
- className={cn("text-lg font-semibold", className)}
{...props}
/>
);
@@ -128,50 +135,35 @@ function AlertDialogTitle({
function AlertDialogDescription({
className,
...props
-}: React.ComponentProps<typeof AlertDialogPrimitive.Description>) {
+}: AlertDialogPrimitive.Description.Props) {
return (
<AlertDialogPrimitive.Description
- data-slot="alert-dialog-description"
className={cn("text-muted-foreground text-sm", className)}
+ data-slot="alert-dialog-description"
{...props}
/>
);
}
-function AlertDialogAction({
- className,
- ...props
-}: React.ComponentProps<typeof AlertDialogPrimitive.Action>) {
- return (
- <AlertDialogPrimitive.Action
- className={cn(buttonVariants(), className)}
- {...props}
- />
- );
-}
-
-function AlertDialogCancel({
- className,
- ...props
-}: React.ComponentProps<typeof AlertDialogPrimitive.Cancel>) {
+function AlertDialogClose(props: AlertDialogPrimitive.Close.Props) {
return (
- <AlertDialogPrimitive.Cancel
- className={cn(buttonVariants({ variant: "outline" }), className)}
- {...props}
- />
+ <AlertDialogPrimitive.Close data-slot="alert-dialog-close" {...props} />
);
}
export {
+ AlertDialogCreateHandle,
AlertDialog,
AlertDialogPortal,
- AlertDialogOverlay,
+ AlertDialogBackdrop,
+ AlertDialogBackdrop as AlertDialogOverlay,
AlertDialogTrigger,
- AlertDialogContent,
+ AlertDialogPopup,
+ AlertDialogPopup as AlertDialogContent,
AlertDialogHeader,
AlertDialogFooter,
AlertDialogTitle,
AlertDialogDescription,
- AlertDialogAction,
- AlertDialogCancel,
+ AlertDialogClose,
+ AlertDialogViewport,
};
diff --git a/apps/web/src/components/ui/alert.tsx b/apps/web/src/components/ui/alert.tsx
index 608ce495a..45d17a98e 100644
--- a/apps/web/src/components/ui/alert.tsx
+++ b/apps/web/src/components/ui/alert.tsx
@@ -1,59 +1,80 @@
import { cva, type VariantProps } from "class-variance-authority";
-import * as React from "react";
+import type * as React from "react";
import { cn } from "@/lib/cn";
const alertVariants = cva(
- "relative w-full rounded-lg border px-4 py-3 text-sm [&>svg+div]:translate-y-[-3px] [&>svg]:absolute [&>svg]:left-4 [&>svg]:top-4 [&>svg]:text-foreground [&>svg~*]:pl-7",
+ "relative grid w-full items-start gap-x-2 gap-y-0.5 rounded-xl border px-3.5 py-3 text-card-foreground text-sm has-[>svg]:has-data-[slot=alert-action]:grid-cols-[calc(var(--spacing)*4)_1fr_auto] has-[>svg]:grid-cols-[calc(var(--spacing)*4)_1fr] has-data-[slot=alert-action]:grid-cols-[1fr_auto] has-[>svg]:gap-x-2 [&>svg]:h-lh [&>svg]:w-4",
{
+ defaultVariants: {
+ variant: "default",
+ },
variants: {
variant: {
- default: "bg-card text-foreground",
- destructive:
- "border-destructive/50 text-destructive dark:border-destructive [&>svg]:text-destructive",
+ default:
+ "bg-transparent dark:bg-input/32 [&>svg]:text-muted-foreground",
+ error:
+ "border-destructive/32 bg-destructive/4 [&>svg]:text-destructive",
+ info: "border-info/32 bg-info/4 [&>svg]:text-info",
+ success: "border-success/32 bg-success/4 [&>svg]:text-success",
+ warning: "border-warning/32 bg-warning/4 [&>svg]:text-warning",
},
},
- defaultVariants: {
- variant: "default",
- },
},
);
-const Alert = React.forwardRef<
- HTMLDivElement,
- React.HTMLAttributes<HTMLDivElement> & VariantProps<typeof alertVariants>
->(({ className, variant, ...props }, ref) => (
- <div
- ref={ref}
- role="alert"
- className={cn(alertVariants({ variant }), className)}
- {...props}
- />
-));
-Alert.displayName = "Alert";
+function Alert({
+ className,
+ variant,
+ ...props
+}: React.ComponentProps<"div"> & VariantProps<typeof alertVariants>) {
+ return (
+ <div
+ className={cn(alertVariants({ variant }), className)}
+ data-slot="alert"
+ role="alert"
+ {...props}
+ />
+ );
+}
+
+function AlertTitle({ className, ...props }: React.ComponentProps<"div">) {
+ return (
+ <div
+ className={cn("font-medium [svg~&]:col-start-2", className)}
+ data-slot="alert-title"
+ {...props}
+ />
+ );
+}
-const AlertTitle = React.forwardRef<
- HTMLParagraphElement,
- React.HTMLAttributes<HTMLHeadingElement>
->(({ className, ...props }, ref) => (
- <h5
- ref={ref}
- className={cn("mb-1 font-medium leading-none tracking-tight", className)}
- {...props}
- />
-));
-AlertTitle.displayName = "AlertTitle";
+function AlertDescription({
+ className,
+ ...props
+}: React.ComponentProps<"div">) {
+ return (
+ <div
+ className={cn(
+ "flex flex-col gap-2.5 text-muted-foreground [svg~&]:col-start-2",
+ className,
+ )}
+ data-slot="alert-description"
+ {...props}
+ />
+ );
+}
-const AlertDescription = React.forwardRef<
- HTMLParagraphElement,
- React.HTMLAttributes<HTMLParagraphElement>
->(({ className, ...props }, ref) => (
- <div
- ref={ref}
- className={cn("text-sm [&_p]:leading-relaxed", className)}
- {...props}
- />
-));
-AlertDescription.displayName = "AlertDescription";
+function AlertAction({ className, ...props }: React.ComponentProps<"div">) {
+ return (
+ <div
+ className={cn(
+ "flex gap-1 max-sm:col-start-2 max-sm:mt-2 sm:row-start-1 sm:row-end-3 sm:self-center sm:[[data-slot=alert-description]~&]:col-start-2 sm:[[data-slot=alert-title]~&]:col-start-2 sm:[svg~&]:col-start-2 sm:[svg~[data-slot=alert-description]~&]:col-start-3 sm:[svg~[data-slot=alert-title]~&]:col-start-3",
+ className,
+ )}
+ data-slot="alert-action"
+ {...props}
+ />
+ );
+}
-export { Alert, AlertTitle, AlertDescription };
+export { Alert, AlertTitle, AlertDescription, AlertAction };
diff --git a/apps/web/src/components/ui/autocomplete.tsx b/apps/web/src/components/ui/autocomplete.tsx
new file mode 100644
index 000000000..f7c2a8f44
--- /dev/null
+++ b/apps/web/src/components/ui/autocomplete.tsx
@@ -0,0 +1,318 @@
+"use client";
+
+import { Autocomplete as AutocompletePrimitive } from "@base-ui/react/autocomplete";
+import { ChevronsUpDownIcon, XIcon } from "lucide-react";
+
+import { cn } from "@/lib/cn";
+import { Input } from "@/components/ui/input";
+import { ScrollArea } from "@/components/ui/scroll-area";
+
+const Autocomplete = AutocompletePrimitive.Root;
+
+function AutocompleteInput({
+ className,
+ showTrigger = false,
+ showClear = false,
+ startAddon,
+ size,
+ ...props
+}: Omit<AutocompletePrimitive.Input.Props, "size"> & {
+ showTrigger?: boolean;
+ showClear?: boolean;
+ startAddon?: React.ReactNode;
+ size?: "sm" | "default" | "lg" | number;
+ ref?: React.Ref<HTMLInputElement>;
+}) {
+ const sizeValue = (size ?? "default") as "sm" | "default" | "lg" | number;
+
+ return (
+ <div className="relative not-has-[>*.w-full]:w-fit w-full text-foreground has-disabled:opacity-64">
+ {startAddon && (
+ <div
+ aria-hidden="true"
+ className="[&_svg]:-mx-0.5 pointer-events-none absolute inset-y-0 start-px z-10 flex items-center ps-[calc(--spacing(3)-1px)] opacity-80 has-[+[data-size=sm]]:ps-[calc(--spacing(2.5)-1px)] [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4"
+ data-slot="autocomplete-start-addon"
+ >
+ {startAddon}
+ </div>
+ )}
+ <AutocompletePrimitive.Input
+ className={cn(
+ startAddon &&
+ "data-[size=sm]:*:data-[slot=autocomplete-input]:ps-[calc(--spacing(7.5)-1px)] *:data-[slot=autocomplete-input]:ps-[calc(--spacing(8.5)-1px)] sm:data-[size=sm]:*:data-[slot=autocomplete-input]:ps-[calc(--spacing(7)-1px)] sm:*:data-[slot=autocomplete-input]:ps-[calc(--spacing(8)-1px)]",
+ sizeValue === "sm"
+ ? "has-[+[data-slot=autocomplete-trigger],+[data-slot=autocomplete-clear]]:*:data-[slot=autocomplete-input]:pe-6.5"
+ : "has-[+[data-slot=autocomplete-trigger],+[data-slot=autocomplete-clear]]:*:data-[slot=autocomplete-input]:pe-7",
+ className,
+ )}
+ data-slot="autocomplete-input"
+ render={<Input nativeInput size={sizeValue} />}
+ {...props}
+ />
+ {showTrigger && (
+ <AutocompleteTrigger
+ className={cn(
+ "-translate-y-1/2 absolute top-1/2 inline-flex size-8 shrink-0 cursor-pointer items-center justify-center rounded-md border border-transparent opacity-80 outline-none transition-colors pointer-coarse:after:absolute pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11 hover:opacity-100 has-[+[data-slot=autocomplete-clear]]:hidden sm:size-7 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ sizeValue === "sm" ? "end-0" : "end-0.5",
+ )}
+ >
+ <AutocompletePrimitive.Icon data-slot="autocomplete-icon">
+ <ChevronsUpDownIcon />
+ </AutocompletePrimitive.Icon>
+ </AutocompleteTrigger>
+ )}
+ {showClear && (
+ <AutocompleteClear
+ className={cn(
+ "-translate-y-1/2 absolute top-1/2 inline-flex size-8 shrink-0 cursor-pointer items-center justify-center rounded-md border border-transparent opacity-80 outline-none transition-colors pointer-coarse:after:absolute pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11 hover:opacity-100 has-[+[data-slot=autocomplete-clear]]:hidden sm:size-7 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ sizeValue === "sm" ? "end-0" : "end-0.5",
+ )}
+ >
+ <XIcon />
+ </AutocompleteClear>
+ )}
+ </div>
+ );
+}
+
+function AutocompletePopup({
+ className,
+ children,
+ side = "bottom",
+ sideOffset = 4,
+ alignOffset,
+ align = "start",
+ anchor,
+ ...props
+}: AutocompletePrimitive.Popup.Props & {
+ align?: AutocompletePrimitive.Positioner.Props["align"];
+ sideOffset?: AutocompletePrimitive.Positioner.Props["sideOffset"];
+ alignOffset?: AutocompletePrimitive.Positioner.Props["alignOffset"];
+ side?: AutocompletePrimitive.Positioner.Props["side"];
+ anchor?: AutocompletePrimitive.Positioner.Props["anchor"];
+}) {
+ return (
+ <AutocompletePrimitive.Portal>
+ <AutocompletePrimitive.Positioner
+ align={align}
+ alignOffset={alignOffset}
+ anchor={anchor}
+ className="z-50 select-none"
+ data-slot="autocomplete-positioner"
+ side={side}
+ sideOffset={sideOffset}
+ >
+ <span
+ className={cn(
+ "relative flex max-h-full min-w-(--anchor-width) max-w-(--available-width) origin-(--transform-origin) rounded-lg border bg-popover not-dark:bg-clip-padding shadow-lg/5 transition-[scale,opacity] before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ className,
+ )}
+ >
+ <AutocompletePrimitive.Popup
+ className="flex max-h-[min(var(--available-height),23rem)] flex-1 flex-col text-foreground"
+ data-slot="autocomplete-popup"
+ {...props}
+ >
+ {children}
+ </AutocompletePrimitive.Popup>
+ </span>
+ </AutocompletePrimitive.Positioner>
+ </AutocompletePrimitive.Portal>
+ );
+}
+
+function AutocompleteItem({
+ className,
+ children,
+ ...props
+}: AutocompletePrimitive.Item.Props) {
+ return (
+ <AutocompletePrimitive.Item
+ className={cn(
+ "flex min-h-8 cursor-default select-none items-center rounded-sm px-2 py-1 text-base outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm",
+ className,
+ )}
+ data-slot="autocomplete-item"
+ {...props}
+ >
+ {children}
+ </AutocompletePrimitive.Item>
+ );
+}
+
+function AutocompleteSeparator({
+ className,
+ ...props
+}: AutocompletePrimitive.Separator.Props) {
+ return (
+ <AutocompletePrimitive.Separator
+ className={cn("mx-2 my-1 h-px bg-border last:hidden", className)}
+ data-slot="autocomplete-separator"
+ {...props}
+ />
+ );
+}
+
+function AutocompleteGroup({
+ className,
+ ...props
+}: AutocompletePrimitive.Group.Props) {
+ return (
+ <AutocompletePrimitive.Group
+ className={cn("[[role=group]+&]:mt-1.5", className)}
+ data-slot="autocomplete-group"
+ {...props}
+ />
+ );
+}
+
+function AutocompleteGroupLabel({
+ className,
+ ...props
+}: AutocompletePrimitive.GroupLabel.Props) {
+ return (
+ <AutocompletePrimitive.GroupLabel
+ className={cn(
+ "px-2 py-1.5 font-medium text-muted-foreground text-xs",
+ className,
+ )}
+ data-slot="autocomplete-group-label"
+ {...props}
+ />
+ );
+}
+
+function AutocompleteEmpty({
+ className,
+ ...props
+}: AutocompletePrimitive.Empty.Props) {
+ return (
+ <AutocompletePrimitive.Empty
+ className={cn(
+ "not-empty:p-2 text-center text-base text-muted-foreground sm:text-sm",
+ className,
+ )}
+ data-slot="autocomplete-empty"
+ {...props}
+ />
+ );
+}
+
+function AutocompleteRow({
+ className,
+ ...props
+}: AutocompletePrimitive.Row.Props) {
+ return (
+ <AutocompletePrimitive.Row
+ className={className}
+ data-slot="autocomplete-row"
+ {...props}
+ />
+ );
+}
+
+function AutocompleteValue({ ...props }: AutocompletePrimitive.Value.Props) {
+ return (
+ <AutocompletePrimitive.Value data-slot="autocomplete-value" {...props} />
+ );
+}
+
+function AutocompleteList({
+ className,
+ ...props
+}: AutocompletePrimitive.List.Props) {
+ return (
+ <ScrollArea scrollbarGutter scrollFade>
+ <AutocompletePrimitive.List
+ className={cn(
+ "not-empty:scroll-py-1 not-empty:p-1 in-data-has-overflow-y:pe-3",
+ className,
+ )}
+ data-slot="autocomplete-list"
+ {...props}
+ />
+ </ScrollArea>
+ );
+}
+
+function AutocompleteClear({
+ className,
+ ...props
+}: AutocompletePrimitive.Clear.Props) {
+ return (
+ <AutocompletePrimitive.Clear
+ className={cn(
+ "-translate-y-1/2 absolute end-0.5 top-1/2 inline-flex size-8 shrink-0 cursor-pointer items-center justify-center rounded-md border border-transparent opacity-80 outline-none transition-[color,background-color,box-shadow,opacity] pointer-coarse:after:absolute pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11 hover:opacity-100 sm:size-7 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ className,
+ )}
+ data-slot="autocomplete-clear"
+ {...props}
+ >
+ <XIcon />
+ </AutocompletePrimitive.Clear>
+ );
+}
+
+function AutocompleteStatus({
+ className,
+ ...props
+}: AutocompletePrimitive.Status.Props) {
+ return (
+ <AutocompletePrimitive.Status
+ className={cn(
+ "px-3 py-2 font-medium text-muted-foreground text-xs empty:m-0 empty:p-0",
+ className,
+ )}
+ data-slot="autocomplete-status"
+ {...props}
+ />
+ );
+}
+
+function AutocompleteCollection({
+ ...props
+}: AutocompletePrimitive.Collection.Props) {
+ return (
+ <AutocompletePrimitive.Collection
+ data-slot="autocomplete-collection"
+ {...props}
+ />
+ );
+}
+
+function AutocompleteTrigger({
+ className,
+ children,
+ ...props
+}: AutocompletePrimitive.Trigger.Props) {
+ return (
+ <AutocompletePrimitive.Trigger
+ className={className}
+ data-slot="autocomplete-trigger"
+ {...props}
+ >
+ {children}
+ </AutocompletePrimitive.Trigger>
+ );
+}
+
+const useAutocompleteFilter = AutocompletePrimitive.useFilter;
+
+export {
+ Autocomplete,
+ AutocompleteInput,
+ AutocompleteTrigger,
+ AutocompletePopup,
+ AutocompleteItem,
+ AutocompleteSeparator,
+ AutocompleteGroup,
+ AutocompleteGroupLabel,
+ AutocompleteEmpty,
+ AutocompleteValue,
+ AutocompleteList,
+ AutocompleteClear,
+ AutocompleteStatus,
+ AutocompleteRow,
+ AutocompleteCollection,
+ useAutocompleteFilter,
+};
diff --git a/apps/web/src/components/ui/avatar.tsx b/apps/web/src/components/ui/avatar.tsx
index f34dbc39d..a721f0540 100644
--- a/apps/web/src/components/ui/avatar.tsx
+++ b/apps/web/src/components/ui/avatar.tsx
@@ -1,48 +1,46 @@
-import * as AvatarPrimitive from "@radix-ui/react-avatar";
-import * as React from "react";
+"use client";
+
+import { Avatar as AvatarPrimitive } from "@base-ui/react/avatar";
import { cn } from "@/lib/cn";
-const Avatar = React.forwardRef<
- React.ElementRef<typeof AvatarPrimitive.Root>,
- React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Root>
->(({ className, ...props }, ref) => (
- <AvatarPrimitive.Root
- ref={ref}
- className={cn(
- "relative flex h-10 w-10 shrink-0 overflow-hidden rounded-full",
- className,
- )}
- {...props}
- />
-));
-Avatar.displayName = AvatarPrimitive.Root.displayName;
+function Avatar({ className, ...props }: AvatarPrimitive.Root.Props) {
+ return (
+ <AvatarPrimitive.Root
+ className={cn(
+ "inline-flex size-8 shrink-0 select-none items-center justify-center overflow-hidden rounded-full bg-background align-middle font-medium text-xs",
+ className,
+ )}
+ data-slot="avatar"
+ {...props}
+ />
+ );
+}
-const AvatarImage = React.forwardRef<
- React.ElementRef<typeof AvatarPrimitive.Image>,
- React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Image>
->(({ className, ...props }, ref) => (
- <AvatarPrimitive.Image
- ref={ref}
- className={cn("aspect-square h-full w-full", className)}
- {...props}
- />
-));
-AvatarImage.displayName = AvatarPrimitive.Image.displayName;
+function AvatarImage({ className, ...props }: AvatarPrimitive.Image.Props) {
+ return (
+ <AvatarPrimitive.Image
+ className={cn("size-full object-cover", className)}
+ data-slot="avatar-image"
+ {...props}
+ />
+ );
+}
-const AvatarFallback = React.forwardRef<
- React.ElementRef<typeof AvatarPrimitive.Fallback>,
- React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Fallback>
->(({ className, ...props }, ref) => (
- <AvatarPrimitive.Fallback
- ref={ref}
- className={cn(
- "flex h-full w-full items-center justify-center rounded-full bg-muted border",
- className,
- )}
- {...props}
- />
-));
-AvatarFallback.displayName = AvatarPrimitive.Fallback.displayName;
+function AvatarFallback({
+ className,
+ ...props
+}: AvatarPrimitive.Fallback.Props) {
+ return (
+ <AvatarPrimitive.Fallback
+ className={cn(
+ "flex size-full items-center justify-center rounded-full bg-muted",
+ className,
+ )}
+ data-slot="avatar-fallback"
+ {...props}
+ />
+ );
+}
export { Avatar, AvatarImage, AvatarFallback };
diff --git a/apps/web/src/components/ui/badge.tsx b/apps/web/src/components/ui/badge.tsx
index 2aae2a6e5..ca532be2e 100644
--- a/apps/web/src/components/ui/badge.tsx
+++ b/apps/web/src/components/ui/badge.tsx
@@ -1,35 +1,60 @@
+"use client";
+
+import { mergeProps } from "@base-ui/react/merge-props";
+import { useRender } from "@base-ui/react/use-render";
import { cva, type VariantProps } from "class-variance-authority";
-import type * as React from "react";
import { cn } from "@/lib/cn";
const badgeVariants = cva(
- "inline-flex items-center rounded-md border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",
+ "relative inline-flex shrink-0 items-center justify-center gap-1 whitespace-nowrap rounded-sm border border-transparent font-medium outline-none transition-shadow focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background disabled:pointer-events-none disabled:opacity-64 [&_svg:not([class*='opacity-'])]:opacity-80 [&_svg:not([class*='size-'])]:size-3.5 sm:[&_svg:not([class*='size-'])]:size-3 [&_svg]:pointer-events-none [&_svg]:shrink-0 [button&,a&]:cursor-pointer [button&,a&]:pointer-coarse:after:absolute [button&,a&]:pointer-coarse:after:size-full [button&,a&]:pointer-coarse:after:min-h-11 [button&,a&]:pointer-coarse:after:min-w-11",
{
+ defaultVariants: {
+ size: "default",
+ variant: "default",
+ },
variants: {
+ size: {
+ default:
+ "h-5.5 min-w-5.5 px-[calc(--spacing(1)-1px)] text-sm sm:h-4.5 sm:min-w-4.5 sm:text-xs",
+ lg: "h-6.5 min-w-6.5 px-[calc(--spacing(1.5)-1px)] text-base sm:h-5.5 sm:min-w-5.5 sm:text-sm",
+ sm: "h-5 min-w-5 rounded-[.25rem] px-[calc(--spacing(1)-1px)] text-xs sm:h-4 sm:min-w-4 sm:text-[.625rem]",
+ },
variant: {
default:
- "border-transparent bg-primary text-primary-foreground shadow hover:bg-primary/80",
- secondary:
- "border-transparent bg-secondary text-secondary-foreground hover:bg-secondary/80",
+ "bg-primary text-primary-foreground [button&,a&]:hover:bg-primary/90",
destructive:
- "border-transparent bg-destructive text-destructive-foreground shadow hover:bg-destructive/80",
- outline: "text-foreground",
+ "bg-destructive [button&,a&]:hover:bg-destructive/90",
+ error:
+ "bg-destructive/8 text-destructive-foreground dark:bg-destructive/16",
+ info: "bg-info/8 text-info-foreground dark:bg-info/16",
+ outline:
+ "border-input bg-background text-foreground dark:bg-input/32 [button&,a&]:hover:bg-accent/50 dark:[button&,a&]:hover:bg-input/48",
+ secondary:
+ "bg-secondary text-secondary-foreground [button&,a&]:hover:bg-secondary/90",
+ success: "bg-success/8 text-success-foreground dark:bg-success/16",
+ warning: "bg-warning/8 text-warning-foreground dark:bg-warning/16",
},
},
- defaultVariants: {
- variant: "default",
- },
},
);
-export type BadgeProps = React.HTMLAttributes<HTMLDivElement> &
- VariantProps<typeof badgeVariants>;
+interface BadgeProps extends useRender.ComponentProps<"span"> {
+ variant?: VariantProps<typeof badgeVariants>["variant"];
+ size?: VariantProps<typeof badgeVariants>["size"];
+}
+
+function Badge({ className, variant, size, render, ...props }: BadgeProps) {
+ const defaultProps = {
+ className: cn(badgeVariants({ className, size, variant })),
+ "data-slot": "badge",
+ };
-function Badge({ className, variant, ...props }: BadgeProps) {
- return (
- <div className={cn(badgeVariants({ variant }), className)} {...props} />
- );
+ return useRender({
+ defaultTagName: "span",
+ props: mergeProps<"span">(defaultProps, props),
+ render,
+ });
}
export { Badge, badgeVariants };
diff --git a/apps/web/src/components/ui/breadcrumb.tsx b/apps/web/src/components/ui/breadcrumb.tsx
index f36747421..f38ba1427 100644
--- a/apps/web/src/components/ui/breadcrumb.tsx
+++ b/apps/web/src/components/ui/breadcrumb.tsx
@@ -1,4 +1,7 @@
-import { Slot } from "@radix-ui/react-slot";
+"use client";
+
+import { mergeProps } from "@base-ui/react/merge-props";
+import { useRender } from "@base-ui/react/use-render";
import { ChevronRight, MoreHorizontal } from "lucide-react";
import type * as React from "react";
@@ -11,11 +14,11 @@ function Breadcrumb({ ...props }: React.ComponentProps<"nav">) {
function BreadcrumbList({ className, ...props }: React.ComponentProps<"ol">) {
return (
<ol
- data-slot="breadcrumb-list"
className={cn(
- "text-muted-foreground flex flex-wrap items-center gap-1.5 text-sm break-words sm:gap-2.5",
+ "wrap-break-word flex flex-wrap items-center gap-1.5 text-muted-foreground text-sm sm:gap-2.5",
className,
)}
+ data-slot="breadcrumb-list"
{...props}
/>
);
@@ -24,39 +27,39 @@ function BreadcrumbList({ className, ...props }: React.ComponentProps<"ol">) {
function BreadcrumbItem({ className, ...props }: React.ComponentProps<"li">) {
return (
<li
- data-slot="breadcrumb-item"
className={cn("inline-flex items-center gap-1.5", className)}
+ data-slot="breadcrumb-item"
{...props}
/>
);
}
function BreadcrumbLink({
- asChild,
className,
+ render,
...props
-}: React.ComponentProps<"a"> & {
- asChild?: boolean;
-}) {
- const Comp = asChild ? Slot : "a";
+}: useRender.ComponentProps<"a">) {
+ const defaultProps = {
+ className: cn("transition-colors hover:text-foreground", className),
+ "data-slot": "breadcrumb-link",
+ };
- return (
- <Comp
- data-slot="breadcrumb-link"
- className={cn("hover:text-foreground transition-colors", className)}
- {...props}
- />
- );
+ return useRender({
+ defaultTagName: "a",
+ props: mergeProps<"a">(defaultProps, props),
+ render,
+ });
}
function BreadcrumbPage({ className, ...props }: React.ComponentProps<"span">) {
return (
+ // biome-ignore lint(a11y/useFocusableInteractive): known
<span
- data-slot="breadcrumb-page"
- role="presentation"
- aria-disabled="true"
aria-current="page"
- className={cn("text-foreground font-normal", className)}
+ aria-disabled="true"
+ className={cn("font-normal text-foreground", className)}
+ data-slot="breadcrumb-page"
+ role="link"
{...props}
/>
);
@@ -69,10 +72,10 @@ function BreadcrumbSeparator({
}: React.ComponentProps<"li">) {
return (
<li
+ aria-hidden="true"
+ className={cn("opacity-80 [&>svg]:size-4", className)}
data-slot="breadcrumb-separator"
role="presentation"
- aria-hidden="true"
- className={cn("[&>svg]:size-3.5", className)}
{...props}
>
{children ?? <ChevronRight />}
@@ -86,10 +89,10 @@ function BreadcrumbEllipsis({
}: React.ComponentProps<"span">) {
return (
<span
+ aria-hidden="true"
+ className={className}
data-slot="breadcrumb-ellipsis"
role="presentation"
- aria-hidden="true"
- className={cn("flex size-9 items-center justify-center", className)}
{...props}
>
<MoreHorizontal className="size-4" />
diff --git a/apps/web/src/components/ui/button.tsx b/apps/web/src/components/ui/button.tsx
index 326bbb3da..9207c0e46 100644
--- a/apps/web/src/components/ui/button.tsx
+++ b/apps/web/src/components/ui/button.tsx
@@ -1,60 +1,73 @@
-import { Slot } from "@radix-ui/react-slot";
+"use client";
+
+import { mergeProps } from "@base-ui/react/merge-props";
+import { useRender } from "@base-ui/react/use-render";
import { cva, type VariantProps } from "class-variance-authority";
import type * as React from "react";
import { cn } from "@/lib/cn";
const buttonVariants = cva(
- "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
+ "[&_svg]:-mx-0.5 relative inline-flex shrink-0 cursor-pointer items-center justify-center gap-2 whitespace-nowrap rounded-lg border font-medium text-base outline-none transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11 focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background disabled:pointer-events-none disabled:opacity-64 sm:text-sm [&_svg:not([class*='opacity-'])]:opacity-80 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
{
+ defaultVariants: {
+ size: "default",
+ variant: "default",
+ },
variants: {
+ size: {
+ default: "h-9 px-[calc(--spacing(3)-1px)] sm:h-8",
+ icon: "size-9 sm:size-8",
+ "icon-lg": "size-10 sm:size-9",
+ "icon-sm": "size-8 sm:size-7",
+ "icon-xl":
+ "size-11 sm:size-10 [&_svg:not([class*='size-'])]:size-5 sm:[&_svg:not([class*='size-'])]:size-4.5",
+ "icon-xs":
+ "size-7 rounded-md before:rounded-[calc(var(--radius-md)-1px)] sm:size-6 not-in-data-[slot=input-group]:[&_svg:not([class*='size-'])]:size-4 sm:not-in-data-[slot=input-group]:[&_svg:not([class*='size-'])]:size-3.5",
+ lg: "h-10 px-[calc(--spacing(3.5)-1px)] sm:h-9",
+ sm: "h-8 gap-1.5 px-[calc(--spacing(2.5)-1px)] sm:h-7",
+ xl: "h-11 px-[calc(--spacing(4)-1px)] text-lg sm:h-10 sm:text-base [&_svg:not([class*='size-'])]:size-5 sm:[&_svg:not([class*='size-'])]:size-4.5",
+ xs: "h-7 gap-1 rounded-md px-[calc(--spacing(2)-1px)] text-sm before:rounded-[calc(var(--radius-md)-1px)] sm:h-6 sm:text-xs [&_svg:not([class*='size-'])]:size-4 sm:[&_svg:not([class*='size-'])]:size-3.5",
+ },
variant: {
default:
- "bg-primary text-primary-foreground shadow-xs hover:bg-primary/90",
+ "not-disabled:inset-shadow-[0_1px_--theme(--color-white/16%)] border-primary bg-primary text-primary-foreground shadow-primary/24 shadow-xs [:active,[data-pressed]]:inset-shadow-[0_1px_--theme(--color-black/8%)] [:disabled,:active,[data-pressed]]:shadow-none [:hover,[data-pressed]]:bg-primary/90",
destructive:
- "bg-destructive text-white shadow-xs hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
+ "not-disabled:inset-shadow-[0_1px_--theme(--color-white/16%)] border-destructive bg-destructive shadow-destructive/24 shadow-xs [:active,[data-pressed]]:inset-shadow-[0_1px_--theme(--color-black/8%)] [:disabled,:active,[data-pressed]]:shadow-none [:hover,[data-pressed]]:bg-destructive/90",
+ "destructive-outline":
+ "border-input bg-popover not-dark:bg-clip-padding text-destructive-foreground shadow-xs/5 not-disabled:not-active:not-data-pressed:before:shadow-[0_1px_--theme(--color-black/4%)] dark:bg-input/32 dark:not-disabled:before:shadow-[0_-1px_--theme(--color-white/2%)] dark:not-disabled:not-active:not-data-pressed:before:shadow-[0_-1px_--theme(--color-white/6%)] [:disabled,:active,[data-pressed]]:shadow-none [:hover,[data-pressed]]:border-destructive/32 [:hover,[data-pressed]]:bg-destructive/4",
+ ghost:
+ "border-transparent text-foreground data-pressed:bg-accent [:hover,[data-pressed]]:bg-accent",
+ link: "border-transparent underline-offset-4 [:hover,[data-pressed]]:underline",
outline:
- "border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50",
+ "border-input bg-popover not-dark:bg-clip-padding text-foreground shadow-xs/5 not-disabled:not-active:not-data-pressed:before:shadow-[0_1px_--theme(--color-black/4%)] dark:bg-input/32 dark:not-disabled:before:shadow-[0_-1px_--theme(--color-white/2%)] dark:not-disabled:not-active:not-data-pressed:before:shadow-[0_-1px_--theme(--color-white/6%)] [:disabled,:active,[data-pressed]]:shadow-none [:hover,[data-pressed]]:bg-accent/50 dark:[:hover,[data-pressed]]:bg-input/64",
secondary:
- "bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80",
- ghost:
- "hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
- link: "text-primary underline-offset-4 hover:underline",
+ "border-transparent bg-secondary text-secondary-foreground [:active,[data-pressed]]:bg-secondary/80 [:hover,[data-pressed]]:bg-secondary/90",
},
- size: {
- default: "h-9 px-4 py-2 has-[>svg]:px-3",
- sm: "h-7 rounded-md gap-1.5 px-2.5 has-[>svg]:px-2",
- xs: "h-6 rounded-md gap-1 px-2 text-xs has-[>svg]:px-1.5",
- lg: "h-10 rounded-md px-6 has-[>svg]:px-4",
- icon: "size-9",
- },
- },
- defaultVariants: {
- variant: "default",
- size: "default",
},
},
);
-function Button({
- className,
- variant,
- size,
- asChild = false,
- ...props
-}: React.ComponentProps<"button"> &
- VariantProps<typeof buttonVariants> & {
- asChild?: boolean;
- }) {
- const Comp = asChild ? Slot : "button";
-
- return (
- <Comp
- data-slot="button"
- className={cn(buttonVariants({ variant, size: size || "sm", className }))}
- {...props}
- />
- );
+interface ButtonProps extends useRender.ComponentProps<"button"> {
+ variant?: VariantProps<typeof buttonVariants>["variant"];
+ size?: VariantProps<typeof buttonVariants>["size"];
+}
+
+function Button({ className, variant, size, render, ...props }: ButtonProps) {
+ const typeValue: React.ButtonHTMLAttributes<HTMLButtonElement>["type"] =
+ render ? undefined : "button";
+
+ const defaultProps = {
+ className: cn(buttonVariants({ className, size, variant })),
+ "data-slot": "button",
+ type: typeValue,
+ };
+
+ return useRender({
+ defaultTagName: "button",
+ props: mergeProps<"button">(defaultProps, props),
+ render,
+ });
}
export { Button, buttonVariants };
diff --git a/apps/web/src/components/ui/calendar.tsx b/apps/web/src/components/ui/calendar.tsx
index fd5b3acab..9c5a49331 100644
--- a/apps/web/src/components/ui/calendar.tsx
+++ b/apps/web/src/components/ui/calendar.tsx
@@ -1,215 +1,137 @@
+"use client";
+
import {
- ChevronDownIcon,
ChevronLeftIcon,
ChevronRightIcon,
+ ChevronsUpDownIcon,
} from "lucide-react";
-import * as React from "react";
-import {
- type DayButton,
- DayPicker,
- getDefaultClassNames,
-} from "react-day-picker";
+import type * as React from "react";
+import { DayPicker } from "react-day-picker";
-import { Button, buttonVariants } from "@/components/ui/button";
import { cn } from "@/lib/cn";
+const buttonClassNames =
+ "relative flex size-(--cell-size) text-base sm:text-sm items-center justify-center rounded-lg text-foreground not-in-data-selected:hover:bg-accent disabled:pointer-events-none disabled:opacity-64 [&_svg:not([class*='opacity-'])]:opacity-80 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0";
+
function Calendar({
className,
classNames,
showOutsideDays = true,
- captionLayout = "label",
- buttonVariant = "ghost",
- formatters,
- components,
+ components: userComponents,
...props
-}: React.ComponentProps<typeof DayPicker> & {
- buttonVariant?: React.ComponentProps<typeof Button>["variant"];
-}) {
- const defaultClassNames = getDefaultClassNames();
-
- return (
- <DayPicker
- showOutsideDays={showOutsideDays}
- className={cn(
- "bg-sidebar group/calendar p-3 [--cell-size:2rem] [[data-slot=card-content]_&]:bg-transparent [[data-slot=popover-content]_&]:bg-transparent",
- String.raw`rtl:**:[.rdp-button\_next>svg]:rotate-180`,
- String.raw`rtl:**:[.rdp-button\_previous>svg]:rotate-180`,
- className,
- )}
- captionLayout={captionLayout}
- formatters={{
- formatMonthDropdown: (date) =>
- date.toLocaleString("default", { month: "short" }),
- ...formatters,
- }}
- classNames={{
- root: cn("w-fit", defaultClassNames.root),
- months: cn(
- "relative flex flex-col gap-4 md:flex-row",
- defaultClassNames.months,
- ),
- month: cn("flex w-full flex-col gap-4", defaultClassNames.month),
- nav: cn(
- "absolute inset-x-0 top-0 flex w-full items-center justify-between gap-1",
- defaultClassNames.nav,
- ),
- button_previous: cn(
- buttonVariants({ variant: buttonVariant }),
- "h-[--cell-size] w-[--cell-size] select-none p-0 aria-disabled:opacity-50",
- defaultClassNames.button_previous,
- ),
- button_next: cn(
- buttonVariants({ variant: buttonVariant }),
- "h-[--cell-size] w-[--cell-size] select-none p-0 aria-disabled:opacity-50",
- defaultClassNames.button_next,
- ),
- month_caption: cn(
- "flex h-[--cell-size] w-full items-center justify-center px-[--cell-size]",
- defaultClassNames.month_caption,
- ),
- dropdowns: cn(
- "flex h-[--cell-size] w-full items-center justify-center gap-1.5 text-sm font-medium",
- defaultClassNames.dropdowns,
- ),
- dropdown_root: cn(
- "has-focus:border-ring border-input shadow-xs has-focus:ring-ring/50 has-focus:ring-[3px] relative rounded-md border",
- defaultClassNames.dropdown_root,
- ),
- dropdown: cn(
- "bg-popover absolute inset-0 opacity-0",
- defaultClassNames.dropdown,
- ),
- caption_label: cn(
- "select-none font-medium",
- captionLayout === "label"
- ? "text-sm"
- : "[&>svg]:text-muted-foreground flex h-8 items-center gap-1 rounded-md pl-2 pr-1 text-sm [&>svg]:size-3.5",
- defaultClassNames.caption_label,
- ),
- table: "w-full border-collapse",
- weekdays: cn("flex", defaultClassNames.weekdays),
- weekday: cn(
- "text-muted-foreground flex-1 select-none rounded-md text-[0.8rem] font-normal",
- defaultClassNames.weekday,
- ),
- week: cn("mt-2 flex w-full", defaultClassNames.week),
- week_number_header: cn(
- "w-[--cell-size] select-none",
- defaultClassNames.week_number_header,
- ),
- week_number: cn(
- "text-muted-foreground select-none text-[0.8rem]",
- defaultClassNames.week_number,
- ),
- day: cn(
- "group/day relative aspect-square h-full w-full select-none p-0 text-center [&:first-child[data-selected=true]_button]:rounded-l-md [&:last-child[data-selected=true]_button]:rounded-r-md",
- defaultClassNames.day,
- ),
- range_start: cn(
- "bg-accent rounded-l-md",
- defaultClassNames.range_start,
- ),
- range_middle: cn("rounded-none", defaultClassNames.range_middle),
- range_end: cn("bg-accent rounded-r-md", defaultClassNames.range_end),
- today: cn(
- "bg-accent text-accent-foreground rounded-md data-[selected=true]:rounded-none",
- defaultClassNames.today,
- ),
- outside: cn(
- "text-muted-foreground aria-selected:text-muted-foreground",
- defaultClassNames.outside,
- ),
- disabled: cn(
- "text-muted-foreground opacity-50",
- defaultClassNames.disabled,
- ),
- hidden: cn("invisible", defaultClassNames.hidden),
- ...classNames,
- }}
- components={{
- Root: ({ className, rootRef, ...props }) => {
- return (
- <div
- data-slot="calendar"
- ref={rootRef as React.Ref<HTMLDivElement>}
- className={cn(className)}
- {...props}
- />
- );
- },
- Chevron: ({ className, orientation, ...props }) => {
- if (orientation === "left") {
- return (
- <ChevronLeftIcon className={cn("size-4", className)} {...props} />
- );
- }
+}: React.ComponentProps<typeof DayPicker>) {
+ const defaultClassNames = {
+ button_next: buttonClassNames,
+ button_previous: buttonClassNames,
+ caption_label:
+ "text-base sm:text-sm font-medium flex items-center gap-2 h-full",
+ day: "size-(--cell-size) text-sm py-px",
+ day_button: cn(
+ buttonClassNames,
+ "in-[[data-selected]:not(.range-middle)]:transition-[color,background-color,border-radius,box-shadow] in-data-disabled:pointer-events-none focus-visible:z-1 in-data-selected:bg-primary in-data-selected:text-primary-foreground in-data-disabled:text-muted-foreground/70 in-data-disabled:line-through in-data-outside:text-muted-foreground/70 in-data-selected:in-data-outside:text-primary-foreground outline-none focus-visible:ring-ring/50 focus-visible:ring-[3px] in-[.range-start:not(.range-end)]:rounded-e-none in-[.range-end:not(.range-start)]:rounded-s-none in-[.range-middle]:rounded-none in-[.range-middle]:in-data-selected:bg-accent in-[.range-middle]:in-data-selected:text-foreground",
+ ),
+ dropdown: "absolute bg-popover inset-0 opacity-0",
+ dropdown_root:
+ "relative has-focus:border-ring has-focus:ring-ring/50 has-focus:ring-[3px] border border-input shadow-xs/5 rounded-lg px-[calc(--spacing(3)-1px)] h-9 sm:h-8 [&_svg:not([class*='opacity-'])]:opacity-80 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:-me-1",
+ dropdowns:
+ "w-full flex items-center text-base sm:text-sm justify-center h-(--cell-size) gap-1.5 *:[span]:font-medium",
+ hidden: "invisible",
+ month: "w-full",
+ month_caption:
+ "relative mx-(--cell-size) px-1 mb-1 flex h-(--cell-size) items-center justify-center z-2",
+ months: "relative flex flex-col sm:flex-row gap-2",
+ nav: "absolute top-0 flex w-full justify-between z-1",
+ outside:
+ "text-muted-foreground data-selected:bg-accent/50 data-selected:text-muted-foreground",
+ range_end: "range-end",
+ range_middle: "range-middle",
+ range_start: "range-start",
+ today:
+ "*:after:pointer-events-none *:after:absolute *:after:bottom-1 *:after:start-1/2 *:after:z-1 *:after:size-[3px] *:after:-translate-x-1/2 *:after:rounded-full *:after:bg-primary [&[data-selected]:not(.range-middle)>*]:after:bg-background [&[data-disabled]>*]:after:bg-foreground/30 *:after:transition-colors",
+ week_number:
+ "size-(--cell-size) p-0 text-xs font-medium text-muted-foreground/70",
+ weekday:
+ "size-(--cell-size) p-0 text-xs font-medium text-muted-foreground/70",
+ };
+ const mergedClassNames: typeof defaultClassNames = Object.keys(
+ defaultClassNames,
+ ).reduce(
+ (acc, key) => {
+ const userClass = classNames?.[key as keyof typeof classNames];
+ const baseClass =
+ defaultClassNames[key as keyof typeof defaultClassNames];
- if (orientation === "right") {
- return (
- <ChevronRightIcon
- className={cn("size-4", className)}
- {...props}
- />
- );
- }
+ acc[key as keyof typeof defaultClassNames] = userClass
+ ? cn(baseClass, userClass)
+ : baseClass;
- return (
- <ChevronDownIcon className={cn("size-4", className)} {...props} />
- );
- },
- DayButton: CalendarDayButton,
- WeekNumber: ({ children, ...props }) => {
- return (
- <td {...props}>
- <div className="flex size-[--cell-size] items-center justify-center text-center">
- {children}
- </div>
- </td>
- );
- },
- ...components,
- }}
- {...props}
- />
+ return acc;
+ },
+ { ...defaultClassNames } as typeof defaultClassNames,
);
-}
-function CalendarDayButton({
- className,
- day,
- modifiers,
- ...props
-}: React.ComponentProps<typeof DayButton>) {
- const defaultClassNames = getDefaultClassNames();
+ const defaultComponents = {
+ Chevron: ({
+ className,
+ orientation,
+ ...props
+ }: {
+ className?: string;
+ orientation?: "left" | "right" | "up" | "down";
+ }) => {
+ if (orientation === "left") {
+ return (
+ <ChevronLeftIcon
+ className={cn(className, "rtl:rotate-180")}
+ {...props}
+ aria-hidden="true"
+ />
+ );
+ }
+
+ if (orientation === "right") {
+ return (
+ <ChevronRightIcon
+ className={cn(className, "rtl:rotate-180")}
+ {...props}
+ aria-hidden="true"
+ />
+ );
+ }
- const ref = React.useRef<HTMLButtonElement>(null);
- React.useEffect(() => {
- if (modifiers.focused) ref.current?.focus();
- }, [modifiers.focused]);
+ return (
+ <ChevronsUpDownIcon
+ className={className}
+ {...props}
+ aria-hidden="true"
+ />
+ );
+ },
+ };
+
+ const mergedComponents = {
+ ...defaultComponents,
+ ...userComponents,
+ };
return (
- <Button
- ref={ref}
- variant="ghost"
- size="icon"
- data-day={day.date.toLocaleDateString()}
- data-selected-single={
- modifiers.selected &&
- !modifiers.range_start &&
- !modifiers.range_end &&
- !modifiers.range_middle
- }
- data-range-start={modifiers.range_start}
- data-range-end={modifiers.range_end}
- data-range-middle={modifiers.range_middle}
+ <DayPicker
className={cn(
- "data-[selected-single=true]:bg-primary data-[selected-single=true]:text-primary-foreground data-[range-middle=true]:bg-accent data-[range-middle=true]:text-accent-foreground data-[range-start=true]:bg-primary data-[range-start=true]:text-primary-foreground data-[range-end=true]:bg-primary data-[range-end=true]:text-primary-foreground group-data-[focused=true]/day:border-ring group-data-[focused=true]/day:ring-ring/50 flex aspect-square h-auto w-full min-w-[--cell-size] flex-col gap-1 font-normal leading-none data-[range-end=true]:rounded-md data-[range-middle=true]:rounded-none data-[range-start=true]:rounded-md group-data-[focused=true]/day:relative group-data-[focused=true]/day:z-10 group-data-[focused=true]/day:ring-[3px] [&>span]:text-xs [&>span]:opacity-70",
- defaultClassNames.day,
+ "w-fit [--cell-size:--spacing(10)] sm:[--cell-size:--spacing(9)]",
className,
)}
+ classNames={mergedClassNames}
+ components={mergedComponents}
+ data-slot="calendar"
+ formatters={{
+ formatMonthDropdown: (date) =>
+ date.toLocaleString("default", { month: "short" }),
+ }}
+ mode="single"
+ showOutsideDays={showOutsideDays}
{...props}
/>
);
}
-export { Calendar, CalendarDayButton };
+export { Calendar };
diff --git a/apps/web/src/components/ui/card.tsx b/apps/web/src/components/ui/card.tsx
index 2cf1b323e..977a9bada 100644
--- a/apps/web/src/components/ui/card.tsx
+++ b/apps/web/src/components/ui/card.tsx
@@ -1,85 +1,244 @@
-import * as React from "react";
+"use client";
+
+import { mergeProps } from "@base-ui/react/merge-props";
+import { useRender } from "@base-ui/react/use-render";
+
import { cn } from "@/lib/cn";
-const Card = React.forwardRef<
- HTMLDivElement,
- React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
- <div
- ref={ref}
- className={cn(
- "rounded-lg border border-zinc-200 dark:border-zinc-800 bg-white dark:bg-zinc-900 shadow-sm",
+function Card({
+ className,
+ render,
+ ...props
+}: useRender.ComponentProps<"div">) {
+ const defaultProps = {
+ className: cn(
+ "relative flex flex-col rounded-2xl border bg-card not-dark:bg-clip-padding text-card-foreground shadow-xs/5 before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-2xl)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
className,
- )}
- {...props}
- />
-));
-Card.displayName = "Card";
-
-const CardHeader = React.forwardRef<
- HTMLDivElement,
- React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
- <div
- ref={ref}
- className={cn("flex flex-col space-y-1.5 p-4 md:p-6", className)}
- {...props}
- />
-));
-CardHeader.displayName = "CardHeader";
-
-const CardTitle = React.forwardRef<
- HTMLParagraphElement,
- React.HTMLAttributes<HTMLHeadingElement>
->(({ className, ...props }, ref) => (
- <h3
- ref={ref}
- className={cn(
- "text-lg font-semibold leading-none tracking-tight text-zinc-900 dark:text-zinc-100",
+ ),
+ "data-slot": "card",
+ };
+
+ return useRender({
+ defaultTagName: "div",
+ props: mergeProps<"div">(defaultProps, props),
+ render,
+ });
+}
+
+function CardFrame({
+ className,
+ render,
+ ...props
+}: useRender.ComponentProps<"div">) {
+ const defaultProps = {
+ className: cn(
+ "[--clip-top:-1rem] [--clip-bottom:-1rem] *:data-[slot=card]:first:[--clip-top:1px] *:data-[slot=card]:last:[--clip-bottom:1px] flex flex-col relative rounded-2xl border bg-card before:bg-muted/72 not-dark:bg-clip-padding text-card-foreground shadow-xs/5 before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-2xl)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] dark:before:shadow-[0_-1px_--theme(--color-white/6%)] *:data-[slot=card]:-m-px *:not-last:data-[slot=card]:rounded-b-xl *:not-last:data-[slot=card]:before:rounded-b-[calc(var(--radius-xl)-1px)] *:not-first:data-[slot=card]:rounded-t-xl *:not-first:data-[slot=card]:before:rounded-t-[calc(var(--radius-xl)-1px)] *:data-[slot=card]:[clip-path:inset(var(--clip-top)_1px_var(--clip-bottom)_1px_round_calc(var(--radius-2xl)-1px))] *:data-[slot=card]:shadow-none *:data-[slot=card]:before:hidden *:data-[slot=card]:bg-clip-padding",
className,
- )}
- {...props}
- />
-));
-CardTitle.displayName = "CardTitle";
-
-const CardDescription = React.forwardRef<
- HTMLParagraphElement,
- React.HTMLAttributes<HTMLParagraphElement>
->(({ className, ...props }, ref) => (
- <p
- ref={ref}
- className={cn("text-sm text-zinc-600 dark:text-zinc-400", className)}
- {...props}
- />
-));
-CardDescription.displayName = "CardDescription";
-
-const CardContent = React.forwardRef<
- HTMLDivElement,
- React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
- <div ref={ref} className={cn("p-6 pt-0", className)} {...props} />
-));
-CardContent.displayName = "CardContent";
-
-const CardFooter = React.forwardRef<
- HTMLDivElement,
- React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
- <div
- ref={ref}
- className={cn("flex items-center p-6 pt-0", className)}
- {...props}
- />
-));
-CardFooter.displayName = "CardFooter";
+ ),
+ "data-slot": "card-frame",
+ };
+
+ return useRender({
+ defaultTagName: "div",
+ props: mergeProps<"div">(defaultProps, props),
+ render,
+ });
+}
+
+function CardFrameHeader({
+ className,
+ render,
+ ...props
+}: useRender.ComponentProps<"div">) {
+ const defaultProps = {
+ className: cn("relative flex flex-col px-6 py-4", className),
+ "data-slot": "card-frame-header",
+ };
+
+ return useRender({
+ defaultTagName: "div",
+ props: mergeProps<"div">(defaultProps, props),
+ render,
+ });
+}
+
+function CardFrameTitle({
+ className,
+ render,
+ ...props
+}: useRender.ComponentProps<"div">) {
+ const defaultProps = {
+ className: cn("font-semibold text-sm", className),
+ "data-slot": "card-frame-title",
+ };
+
+ return useRender({
+ defaultTagName: "div",
+ props: mergeProps<"div">(defaultProps, props),
+ render,
+ });
+}
+
+function CardFrameDescription({
+ className,
+ render,
+ ...props
+}: useRender.ComponentProps<"div">) {
+ const defaultProps = {
+ className: cn("text-muted-foreground text-sm", className),
+ "data-slot": "card-frame-description",
+ };
+
+ return useRender({
+ defaultTagName: "div",
+ props: mergeProps<"div">(defaultProps, props),
+ render,
+ });
+}
+
+function CardFrameFooter({
+ className,
+ render,
+ ...props
+}: useRender.ComponentProps<"div">) {
+ const defaultProps = {
+ className: cn("px-6 py-4", className),
+ "data-slot": "card-frame-footer",
+ };
+
+ return useRender({
+ defaultTagName: "div",
+ props: mergeProps<"div">(defaultProps, props),
+ render,
+ });
+}
+
+function CardHeader({
+ className,
+ render,
+ ...props
+}: useRender.ComponentProps<"div">) {
+ const defaultProps = {
+ className: cn(
+ "grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 p-6 in-[[data-slot=card]:has(>[data-slot=card-panel])]:pb-4 has-data-[slot=card-action]:grid-cols-[1fr_auto]",
+ className,
+ ),
+ "data-slot": "card-header",
+ };
+
+ return useRender({
+ defaultTagName: "div",
+ props: mergeProps<"div">(defaultProps, props),
+ render,
+ });
+}
+
+function CardTitle({
+ className,
+ render,
+ ...props
+}: useRender.ComponentProps<"div">) {
+ const defaultProps = {
+ className: cn("font-semibold text-lg leading-none", className),
+ "data-slot": "card-title",
+ };
+
+ return useRender({
+ defaultTagName: "div",
+ props: mergeProps<"div">(defaultProps, props),
+ render,
+ });
+}
+
+function CardDescription({
+ className,
+ render,
+ ...props
+}: useRender.ComponentProps<"div">) {
+ const defaultProps = {
+ className: cn("text-muted-foreground text-sm", className),
+ "data-slot": "card-description",
+ };
+
+ return useRender({
+ defaultTagName: "div",
+ props: mergeProps<"div">(defaultProps, props),
+ render,
+ });
+}
+
+function CardAction({
+ className,
+ render,
+ ...props
+}: useRender.ComponentProps<"div">) {
+ const defaultProps = {
+ className: cn(
+ "col-start-2 row-span-2 row-start-1 self-start justify-self-end inline-flex",
+ className,
+ ),
+ "data-slot": "card-action",
+ };
+
+ return useRender({
+ defaultTagName: "div",
+ props: mergeProps<"div">(defaultProps, props),
+ render,
+ });
+}
+
+function CardPanel({
+ className,
+ render,
+ ...props
+}: useRender.ComponentProps<"div">) {
+ const defaultProps = {
+ className: cn(
+ "flex-1 p-6 in-[[data-slot=card]:has(>[data-slot=card-header]:not(.border-b))]:pt-0 in-[[data-slot=card]:has(>[data-slot=card-footer]:not(.border-t))]:pb-0",
+ className,
+ ),
+ "data-slot": "card-panel",
+ };
+
+ return useRender({
+ defaultTagName: "div",
+ props: mergeProps<"div">(defaultProps, props),
+ render,
+ });
+}
+
+function CardFooter({
+ className,
+ render,
+ ...props
+}: useRender.ComponentProps<"div">) {
+ const defaultProps = {
+ className: cn(
+ "flex items-center p-6 in-[[data-slot=card]:has(>[data-slot=card-panel])]:pt-4",
+ className,
+ ),
+ "data-slot": "card-footer",
+ };
+
+ return useRender({
+ defaultTagName: "div",
+ props: mergeProps<"div">(defaultProps, props),
+ render,
+ });
+}
export {
Card,
- CardHeader,
+ CardFrame,
+ CardFrameHeader,
+ CardFrameTitle,
+ CardFrameDescription,
+ CardFrameFooter,
+ CardAction,
+ CardDescription,
CardFooter,
+ CardHeader,
+ CardPanel,
+ CardPanel as CardContent,
CardTitle,
- CardDescription,
- CardContent,
};
diff --git a/apps/web/src/components/ui/checkbox-group.tsx b/apps/web/src/components/ui/checkbox-group.tsx
new file mode 100644
index 000000000..81ce3d762
--- /dev/null
+++ b/apps/web/src/components/ui/checkbox-group.tsx
@@ -0,0 +1,16 @@
+"use client";
+
+import { CheckboxGroup as CheckboxGroupPrimitive } from "@base-ui/react/checkbox-group";
+
+import { cn } from "@/lib/cn";
+
+function CheckboxGroup({ className, ...props }: CheckboxGroupPrimitive.Props) {
+ return (
+ <CheckboxGroupPrimitive
+ className={cn("flex flex-col items-start gap-3", className)}
+ {...props}
+ />
+ );
+}
+
+export { CheckboxGroup };
diff --git a/apps/web/src/components/ui/checkbox.tsx b/apps/web/src/components/ui/checkbox.tsx
new file mode 100644
index 000000000..78b41717f
--- /dev/null
+++ b/apps/web/src/components/ui/checkbox.tsx
@@ -0,0 +1,60 @@
+"use client";
+
+import { Checkbox as CheckboxPrimitive } from "@base-ui/react/checkbox";
+
+import { cn } from "@/lib/cn";
+
+function Checkbox({ className, ...props }: CheckboxPrimitive.Root.Props) {
+ return (
+ <CheckboxPrimitive.Root
+ className={cn(
+ "relative inline-flex size-4.5 shrink-0 items-center justify-center rounded-[.25rem] border border-input bg-background not-dark:bg-clip-padding shadow-xs/5 outline-none ring-ring transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-[3px] not-data-disabled:not-data-checked:not-aria-invalid:before:shadow-[0_1px_--theme(--color-black/4%)] focus-visible:ring-2 focus-visible:ring-offset-1 focus-visible:ring-offset-background aria-invalid:border-destructive/36 focus-visible:aria-invalid:border-destructive/64 focus-visible:aria-invalid:ring-destructive/48 data-disabled:opacity-64 sm:size-4 dark:not-data-checked:bg-input/32 dark:aria-invalid:ring-destructive/24 dark:not-data-disabled:not-data-checked:not-aria-invalid:before:shadow-[0_-1px_--theme(--color-white/6%)] [[data-disabled],[data-checked],[aria-invalid]]:shadow-none",
+ className,
+ )}
+ data-slot="checkbox"
+ {...props}
+ >
+ <CheckboxPrimitive.Indicator
+ className="-inset-px absolute flex items-center justify-center rounded-[.25rem] text-primary-foreground data-unchecked:hidden data-checked:bg-primary data-indeterminate:text-foreground"
+ data-slot="checkbox-indicator"
+ render={(props, state) => (
+ <span {...props}>
+ {state.indeterminate ? (
+ <svg
+ className="size-3.5 sm:size-3"
+ fill="none"
+ height="24"
+ stroke="currentColor"
+ strokeLinecap="round"
+ strokeLinejoin="round"
+ strokeWidth="3"
+ viewBox="0 0 24 24"
+ width="24"
+ xmlns="http://www.w3.org/2000/svg"
+ >
+ <path d="M5.252 12h13.496" />
+ </svg>
+ ) : (
+ <svg
+ className="size-3.5 sm:size-3"
+ fill="none"
+ height="24"
+ stroke="currentColor"
+ strokeLinecap="round"
+ strokeLinejoin="round"
+ strokeWidth="3"
+ viewBox="0 0 24 24"
+ width="24"
+ xmlns="http://www.w3.org/2000/svg"
+ >
+ <path d="M5.252 12.7 10.2 18.63 18.748 5.37" />
+ </svg>
+ )}
+ </span>
+ )}
+ />
+ </CheckboxPrimitive.Root>
+ );
+}
+
+export { Checkbox };
diff --git a/apps/web/src/components/ui/collapsible.tsx b/apps/web/src/components/ui/collapsible.tsx
index 90935c6b2..4f865d6b3 100644
--- a/apps/web/src/components/ui/collapsible.tsx
+++ b/apps/web/src/components/ui/collapsible.tsx
@@ -1,33 +1,45 @@
"use client";
-import * as CollapsiblePrimitive from "@radix-ui/react-collapsible";
+import { Collapsible as CollapsiblePrimitive } from "@base-ui/react/collapsible";
-function Collapsible({
- ...props
-}: React.ComponentProps<typeof CollapsiblePrimitive.Root>) {
+import { cn } from "@/lib/cn";
+
+function Collapsible({ ...props }: CollapsiblePrimitive.Root.Props) {
return <CollapsiblePrimitive.Root data-slot="collapsible" {...props} />;
}
function CollapsibleTrigger({
+ className,
...props
-}: React.ComponentProps<typeof CollapsiblePrimitive.CollapsibleTrigger>) {
+}: CollapsiblePrimitive.Trigger.Props) {
return (
- <CollapsiblePrimitive.CollapsibleTrigger
+ <CollapsiblePrimitive.Trigger
+ className={cn("cursor-pointer", className)}
data-slot="collapsible-trigger"
{...props}
/>
);
}
-function CollapsibleContent({
+function CollapsiblePanel({
+ className,
...props
-}: React.ComponentProps<typeof CollapsiblePrimitive.CollapsibleContent>) {
+}: CollapsiblePrimitive.Panel.Props) {
return (
- <CollapsiblePrimitive.CollapsibleContent
- data-slot="collapsible-content"
+ <CollapsiblePrimitive.Panel
+ className={cn(
+ "h-(--collapsible-panel-height) overflow-hidden transition-[height] duration-200 data-ending-style:h-0 data-starting-style:h-0",
+ className,
+ )}
+ data-slot="collapsible-panel"
{...props}
/>
);
}
-export { Collapsible, CollapsibleTrigger, CollapsibleContent };
+export {
+ Collapsible,
+ CollapsibleTrigger,
+ CollapsiblePanel,
+ CollapsiblePanel as CollapsibleContent,
+};
diff --git a/apps/web/src/components/ui/combobox.tsx b/apps/web/src/components/ui/combobox.tsx
index df1e24bc9..a7441fbd1 100644
--- a/apps/web/src/components/ui/combobox.tsx
+++ b/apps/web/src/components/ui/combobox.tsx
@@ -1,121 +1,421 @@
-import { CheckIcon } from "lucide-react";
+"use client";
+
+import { Combobox as ComboboxPrimitive } from "@base-ui/react/combobox";
+import { ChevronsUpDownIcon, XIcon } from "lucide-react";
import * as React from "react";
-import { Button } from "@/components/ui/button";
-import {
- Command,
- CommandEmpty,
- CommandGroup,
- CommandInput,
- CommandItem,
- CommandList,
-} from "@/components/ui/command";
-import {
- Popover,
- PopoverContent,
- PopoverTrigger,
-} from "@/components/ui/popover";
import { cn } from "@/lib/cn";
+import { Input } from "@/components/ui/input";
+import { ScrollArea } from "@/components/ui/scroll-area";
-export type ComboboxOption = {
- value: string;
- label: string;
- icon?: React.ReactNode;
-};
+const ComboboxContext = React.createContext<{
+ chipsRef: React.RefObject<Element | null> | null;
+ multiple: boolean;
+}>({
+ chipsRef: null,
+ multiple: false,
+});
-export type ComboboxProps = {
- options: ComboboxOption[];
- value?: string;
- onValueChange?: (value: string) => void;
- placeholder?: string;
- searchPlaceholder?: string;
- emptyMessage?: string;
- className?: string;
- disabled?: boolean;
- variant?:
- | "default"
- | "destructive"
- | "outline"
- | "secondary"
- | "ghost"
- | "link";
- size?: "default" | "sm" | "xs";
-};
+function Combobox<Value, Multiple extends boolean | undefined = false>(
+ props: ComboboxPrimitive.Root.Props<Value, Multiple>,
+) {
+ const chipsRef = React.useRef<Element | null>(null);
+ return (
+ <ComboboxContext.Provider value={{ chipsRef, multiple: !!props.multiple }}>
+ <ComboboxPrimitive.Root {...props} />
+ </ComboboxContext.Provider>
+ );
+}
+
+function ComboboxChipsInput({
+ className,
+ size,
+ ...props
+}: Omit<ComboboxPrimitive.Input.Props, "size"> & {
+ size?: "sm" | "default" | "lg" | number;
+ ref?: React.Ref<HTMLInputElement>;
+}) {
+ const sizeValue = (size ?? "default") as "sm" | "default" | "lg" | number;
+
+ return (
+ <ComboboxPrimitive.Input
+ className={cn(
+ "min-w-12 flex-1 text-base outline-none sm:text-sm [[data-slot=combobox-chip]+&]:ps-0.5",
+ sizeValue === "sm" ? "ps-1.5" : "ps-2",
+ className,
+ )}
+ data-size={typeof sizeValue === "string" ? sizeValue : undefined}
+ data-slot="combobox-chips-input"
+ size={typeof sizeValue === "number" ? sizeValue : undefined}
+ {...props}
+ />
+ );
+}
-export function Combobox({
- options,
- value,
- onValueChange,
- placeholder = "Select option...",
- searchPlaceholder = "Search...",
- emptyMessage = "No option found.",
+function ComboboxInput({
className,
- disabled = false,
- variant = "outline",
- size = "default",
-}: ComboboxProps) {
- const [open, setOpen] = React.useState(false);
-
- const selectedOption = options.find((option) => option.value === value);
-
- // Adjust width and text size based on size prop
- const sizeConfig = {
- default: { width: "!w-[200px]", textSize: "text-sm" },
- sm: { width: "w-[160px]", textSize: "text-xs" },
- xs: { width: "w-[120px]", textSize: "text-xs" },
- };
-
- const config = sizeConfig[size];
-
- return (
- <Popover open={open} onOpenChange={setOpen}>
- <PopoverTrigger asChild>
- <Button
- variant={variant}
- size={size}
- aria-expanded={open}
- className={cn(config.width, "justify-between", className)}
- disabled={disabled}
+ showTrigger = true,
+ showClear = false,
+ startAddon,
+ size,
+ ...props
+}: Omit<ComboboxPrimitive.Input.Props, "size"> & {
+ showTrigger?: boolean;
+ showClear?: boolean;
+ startAddon?: React.ReactNode;
+ size?: "sm" | "default" | "lg" | number;
+ ref?: React.Ref<HTMLInputElement>;
+}) {
+ const sizeValue = (size ?? "default") as "sm" | "default" | "lg" | number;
+
+ return (
+ <div className="relative not-has-[>*.w-full]:w-fit w-full text-foreground has-disabled:opacity-64">
+ {startAddon && (
+ <div
+ aria-hidden="true"
+ className="[&_svg]:-mx-0.5 pointer-events-none absolute inset-y-0 start-px z-10 flex items-center ps-[calc(--spacing(3)-1px)] opacity-80 has-[+[data-size=sm]]:ps-[calc(--spacing(2.5)-1px)] [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4"
+ data-slot="combobox-start-addon"
+ >
+ {startAddon}
+ </div>
+ )}
+ <ComboboxPrimitive.Input
+ className={cn(
+ startAddon &&
+ "data-[size=sm]:*:data-[slot=combobox-input]:ps-[calc(--spacing(7.5)-1px)] *:data-[slot=combobox-input]:ps-[calc(--spacing(8.5)-1px)] sm:data-[size=sm]:*:data-[slot=combobox-input]:ps-[calc(--spacing(7)-1px)] sm:*:data-[slot=combobox-input]:ps-[calc(--spacing(8)-1px)]",
+ sizeValue === "sm"
+ ? "has-[+[data-slot=combobox-trigger],+[data-slot=combobox-clear]]:*:data-[slot=combobox-input]:pe-6.5"
+ : "has-[+[data-slot=combobox-trigger],+[data-slot=combobox-clear]]:*:data-[slot=combobox-input]:pe-7",
+ className,
+ )}
+ data-slot="combobox-input"
+ render={
+ <Input
+ className="has-disabled:opacity-100"
+ nativeInput
+ size={sizeValue}
+ />
+ }
+ {...props}
+ />
+ {showTrigger && (
+ <ComboboxTrigger
+ className={cn(
+ "-translate-y-1/2 absolute top-1/2 inline-flex size-8 shrink-0 cursor-pointer items-center justify-center rounded-md border border-transparent opacity-80 outline-none transition-opacity pointer-coarse:after:absolute pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11 hover:opacity-100 has-[+[data-slot=combobox-clear]]:hidden sm:size-7 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ sizeValue === "sm" ? "end-0" : "end-0.5",
+ )}
>
- <div className="flex items-center gap-2">
- {selectedOption?.icon && selectedOption.icon}
- <span className={config.textSize}>
- {selectedOption ? selectedOption.label : placeholder}
- </span>
- </div>
- </Button>
- </PopoverTrigger>
- <PopoverContent className={cn(config.width, "p-0")}>
- <Command>
- <CommandInput placeholder={searchPlaceholder} />
- <CommandList>
- <CommandEmpty>{emptyMessage}</CommandEmpty>
- <CommandGroup className="w-[200px]">
- {options.map((option) => (
- <CommandItem
- key={option.value}
- value={option.value}
- className="flex items-center w-full"
- onSelect={(currentValue) => {
- const newValue = currentValue === value ? "" : currentValue;
- onValueChange?.(newValue);
- setOpen(false);
- }}
- >
- {option.icon && option.icon}
- <span className={config.textSize}>{option.label}</span>
- <CheckIcon
- className={cn(
- "mr-2 h-4 w-4",
- value === option.value ? "opacity-100" : "opacity-0",
- )}
- />
- </CommandItem>
- ))}
- </CommandGroup>
- </CommandList>
- </Command>
- </PopoverContent>
- </Popover>
+ <ComboboxPrimitive.Icon data-slot="combobox-icon">
+ <ChevronsUpDownIcon />
+ </ComboboxPrimitive.Icon>
+ </ComboboxTrigger>
+ )}
+ {showClear && (
+ <ComboboxClear
+ className={cn(
+ "-translate-y-1/2 absolute top-1/2 inline-flex size-8 shrink-0 cursor-pointer items-center justify-center rounded-md border border-transparent opacity-80 outline-none transition-opacity pointer-coarse:after:absolute pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11 hover:opacity-100 has-[+[data-slot=combobox-clear]]:hidden sm:size-7 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ sizeValue === "sm" ? "end-0" : "end-0.5",
+ )}
+ >
+ <XIcon />
+ </ComboboxClear>
+ )}
+ </div>
+ );
+}
+
+function ComboboxTrigger({
+ className,
+ children,
+ ...props
+}: ComboboxPrimitive.Trigger.Props) {
+ return (
+ <ComboboxPrimitive.Trigger
+ className={className}
+ data-slot="combobox-trigger"
+ {...props}
+ >
+ {children}
+ </ComboboxPrimitive.Trigger>
);
}
+
+function ComboboxPopup({
+ className,
+ children,
+ side = "bottom",
+ sideOffset = 4,
+ alignOffset,
+ align = "start",
+ anchor: anchorProp,
+ ...props
+}: ComboboxPrimitive.Popup.Props & {
+ align?: ComboboxPrimitive.Positioner.Props["align"];
+ sideOffset?: ComboboxPrimitive.Positioner.Props["sideOffset"];
+ alignOffset?: ComboboxPrimitive.Positioner.Props["alignOffset"];
+ side?: ComboboxPrimitive.Positioner.Props["side"];
+ anchor?: ComboboxPrimitive.Positioner.Props["anchor"];
+}) {
+ const { chipsRef } = React.useContext(ComboboxContext);
+ const anchor = anchorProp ?? chipsRef;
+
+ return (
+ <ComboboxPrimitive.Portal>
+ <ComboboxPrimitive.Positioner
+ align={align}
+ alignOffset={alignOffset}
+ anchor={anchor}
+ className="z-50 select-none"
+ data-slot="combobox-positioner"
+ side={side}
+ sideOffset={sideOffset}
+ >
+ <span
+ className={cn(
+ "relative flex max-h-full min-w-(--anchor-width) max-w-(--available-width) origin-(--transform-origin) rounded-lg border bg-popover not-dark:bg-clip-padding shadow-lg/5 transition-[scale,opacity] before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ className,
+ )}
+ >
+ <ComboboxPrimitive.Popup
+ className="flex max-h-[min(var(--available-height),23rem)] flex-1 flex-col text-foreground"
+ data-slot="combobox-popup"
+ {...props}
+ >
+ {children}
+ </ComboboxPrimitive.Popup>
+ </span>
+ </ComboboxPrimitive.Positioner>
+ </ComboboxPrimitive.Portal>
+ );
+}
+
+function ComboboxItem({
+ className,
+ children,
+ ...props
+}: ComboboxPrimitive.Item.Props) {
+ return (
+ <ComboboxPrimitive.Item
+ className={cn(
+ "grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default grid-cols-[1rem_1fr] items-center gap-2 rounded-sm py-1 ps-2 pe-4 text-base outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ className,
+ )}
+ data-slot="combobox-item"
+ {...props}
+ >
+ <ComboboxPrimitive.ItemIndicator className="col-start-1">
+ <svg
+ fill="none"
+ height="24"
+ stroke="currentColor"
+ strokeLinecap="round"
+ strokeLinejoin="round"
+ strokeWidth="2"
+ viewBox="0 0 24 24"
+ width="24"
+ xmlns="http://www.w3.org/1500/svg"
+ >
+ <path d="M5.252 12.7 10.2 18.63 18.748 5.37" />
+ </svg>
+ </ComboboxPrimitive.ItemIndicator>
+ <div className="col-start-2">{children}</div>
+ </ComboboxPrimitive.Item>
+ );
+}
+
+function ComboboxSeparator({
+ className,
+ ...props
+}: ComboboxPrimitive.Separator.Props) {
+ return (
+ <ComboboxPrimitive.Separator
+ className={cn("mx-2 my-1 h-px bg-border last:hidden", className)}
+ data-slot="combobox-separator"
+ {...props}
+ />
+ );
+}
+
+function ComboboxGroup({ className, ...props }: ComboboxPrimitive.Group.Props) {
+ return (
+ <ComboboxPrimitive.Group
+ className={cn("[[role=group]+&]:mt-1.5", className)}
+ data-slot="combobox-group"
+ {...props}
+ />
+ );
+}
+
+function ComboboxGroupLabel({
+ className,
+ ...props
+}: ComboboxPrimitive.GroupLabel.Props) {
+ return (
+ <ComboboxPrimitive.GroupLabel
+ className={cn(
+ "px-2 py-1.5 font-medium text-muted-foreground text-xs",
+ className,
+ )}
+ data-slot="combobox-group-label"
+ {...props}
+ />
+ );
+}
+
+function ComboboxEmpty({ className, ...props }: ComboboxPrimitive.Empty.Props) {
+ return (
+ <ComboboxPrimitive.Empty
+ className={cn(
+ "not-empty:p-2 text-center text-base text-muted-foreground sm:text-sm",
+ className,
+ )}
+ data-slot="combobox-empty"
+ {...props}
+ />
+ );
+}
+
+function ComboboxRow({ className, ...props }: ComboboxPrimitive.Row.Props) {
+ return (
+ <ComboboxPrimitive.Row
+ className={className}
+ data-slot="combobox-row"
+ {...props}
+ />
+ );
+}
+
+function ComboboxValue({ ...props }: ComboboxPrimitive.Value.Props) {
+ return <ComboboxPrimitive.Value data-slot="combobox-value" {...props} />;
+}
+
+function ComboboxList({ className, ...props }: ComboboxPrimitive.List.Props) {
+ return (
+ <ScrollArea scrollbarGutter scrollFade>
+ <ComboboxPrimitive.List
+ className={cn(
+ "not-empty:scroll-py-1 not-empty:px-1 not-empty:py-1 in-data-has-overflow-y:pe-3",
+ className,
+ )}
+ data-slot="combobox-list"
+ {...props}
+ />
+ </ScrollArea>
+ );
+}
+
+function ComboboxClear({ className, ...props }: ComboboxPrimitive.Clear.Props) {
+ return (
+ <ComboboxPrimitive.Clear
+ className={className}
+ data-slot="combobox-clear"
+ {...props}
+ />
+ );
+}
+
+function ComboboxStatus({
+ className,
+ ...props
+}: ComboboxPrimitive.Status.Props) {
+ return (
+ <ComboboxPrimitive.Status
+ className={cn(
+ "px-3 py-2 font-medium text-muted-foreground text-xs empty:m-0 empty:p-0",
+ className,
+ )}
+ data-slot="combobox-status"
+ {...props}
+ />
+ );
+}
+
+function ComboboxCollection(props: ComboboxPrimitive.Collection.Props) {
+ return (
+ <ComboboxPrimitive.Collection data-slot="combobox-collection" {...props} />
+ );
+}
+
+function ComboboxChips({
+ className,
+ children,
+ startAddon,
+ ...props
+}: ComboboxPrimitive.Chips.Props & {
+ startAddon?: React.ReactNode;
+}) {
+ const { chipsRef } = React.useContext(ComboboxContext);
+
+ return (
+ <ComboboxPrimitive.Chips
+ className={cn(
+ "relative inline-flex min-h-9 w-full flex-wrap gap-1 rounded-lg border border-input bg-background not-dark:bg-clip-padding p-[calc(--spacing(1)-1px)] text-base shadow-xs/5 outline-none ring-ring/24 transition-shadow *:min-h-7 before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] not-has-disabled:not-focus-within:not-aria-invalid:before:shadow-[0_1px_--theme(--color-black/4%)] focus-within:border-ring focus-within:ring-[3px] has-disabled:pointer-events-none has-data-[size=lg]:min-h-10 has-data-[size=sm]:min-h-8 has-aria-invalid:border-destructive/36 has-autofill:bg-foreground/4 has-disabled:opacity-64 has-[:disabled,:focus-within,[aria-invalid]]:shadow-none focus-within:has-aria-invalid:border-destructive/64 focus-within:has-aria-invalid:ring-destructive/16 has-data-[size=lg]:*:min-h-8 has-data-[size=sm]:*:min-h-6 sm:min-h-8 sm:text-sm sm:has-data-[size=lg]:min-h-9 sm:has-data-[size=sm]:min-h-7 sm:*:min-h-6 sm:has-data-[size=lg]:*:min-h-7 sm:has-data-[size=sm]:*:min-h-5 dark:not-has-disabled:bg-input/32 dark:has-autofill:bg-foreground/8 dark:has-aria-invalid:ring-destructive/24 dark:not-has-disabled:not-focus-within:not-aria-invalid:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ className,
+ )}
+ data-slot="combobox-chips"
+ ref={chipsRef as React.Ref<HTMLDivElement> | null}
+ {...props}
+ >
+ {startAddon && (
+ <div
+ aria-hidden="true"
+ className="[&_svg]:-ms-0.5 [&_svg]:-me-1.5 flex shrink-0 items-center ps-2 opacity-80 has-[~[data-size=sm]]:has-[+[data-slot=combobox-chip]]:pe-1.5 has-[~[data-size=sm]]:ps-1.5 has-[+[data-slot=combobox-chip]]:pe-2 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none"
+ data-slot="combobox-start-addon"
+ >
+ {startAddon}
+ </div>
+ )}
+ {children}
+ </ComboboxPrimitive.Chips>
+ );
+}
+
+function ComboboxChip({ children, ...props }: ComboboxPrimitive.Chip.Props) {
+ return (
+ <ComboboxPrimitive.Chip
+ className="flex items-center rounded-[calc(var(--radius-md)-1px)] bg-accent ps-2 font-medium text-accent-foreground text-sm outline-none sm:text-xs/(--text-xs--line-height) [&_svg:not([class*='size-'])]:size-4 sm:[&_svg:not([class*='size-'])]:size-3.5"
+ data-slot="combobox-chip"
+ {...props}
+ >
+ {children}
+ <ComboboxChipRemove />
+ </ComboboxPrimitive.Chip>
+ );
+}
+
+function ComboboxChipRemove(props: ComboboxPrimitive.ChipRemove.Props) {
+ return (
+ <ComboboxPrimitive.ChipRemove
+ aria-label="Remove"
+ className="h-full shrink-0 cursor-pointer px-1.5 opacity-80 hover:opacity-100 [&_svg:not([class*='size-'])]:size-4 sm:[&_svg:not([class*='size-'])]:size-3.5"
+ data-slot="combobox-chip-remove"
+ {...props}
+ >
+ <XIcon />
+ </ComboboxPrimitive.ChipRemove>
+ );
+}
+
+const useComboboxFilter = ComboboxPrimitive.useFilter;
+
+export {
+ Combobox,
+ ComboboxChipsInput,
+ ComboboxInput,
+ ComboboxTrigger,
+ ComboboxPopup,
+ ComboboxItem,
+ ComboboxSeparator,
+ ComboboxGroup,
+ ComboboxGroupLabel,
+ ComboboxEmpty,
+ ComboboxValue,
+ ComboboxList,
+ ComboboxClear,
+ ComboboxStatus,
+ ComboboxRow,
+ ComboboxCollection,
+ ComboboxChips,
+ ComboboxChip,
+ useComboboxFilter,
+};
diff --git a/apps/web/src/components/ui/command.tsx b/apps/web/src/components/ui/command.tsx
index 62d75073f..500f8652a 100644
--- a/apps/web/src/components/ui/command.tsx
+++ b/apps/web/src/components/ui/command.tsx
@@ -1,79 +1,124 @@
-import { Command as CommandPrimitive } from "cmdk";
+"use client";
+
+import { Dialog as CommandDialogPrimitive } from "@base-ui/react/dialog";
import { SearchIcon } from "lucide-react";
import type * as React from "react";
-
-import {
- Dialog,
- DialogContent,
- DialogDescription,
- DialogHeader,
- DialogTitle,
-} from "@/components/ui/dialog";
import { cn } from "@/lib/cn";
+import {
+ Autocomplete,
+ AutocompleteCollection,
+ AutocompleteEmpty,
+ AutocompleteGroup,
+ AutocompleteGroupLabel,
+ AutocompleteInput,
+ AutocompleteItem,
+ AutocompleteList,
+ AutocompleteSeparator,
+} from "@/components/ui/autocomplete";
-function Command({
+const CommandDialog = CommandDialogPrimitive.Root;
+
+const CommandDialogPortal = CommandDialogPrimitive.Portal;
+
+const CommandCreateHandle = CommandDialogPrimitive.createHandle;
+
+function CommandDialogTrigger(props: CommandDialogPrimitive.Trigger.Props) {
+ return (
+ <CommandDialogPrimitive.Trigger
+ data-slot="command-dialog-trigger"
+ {...props}
+ />
+ );
+}
+
+function CommandDialogBackdrop({
className,
...props
-}: React.ComponentProps<typeof CommandPrimitive>) {
+}: CommandDialogPrimitive.Backdrop.Props) {
return (
- <CommandPrimitive
- data-slot="command"
+ <CommandDialogPrimitive.Backdrop
className={cn(
- "bg-popover text-popover-foreground flex h-full w-full flex-col overflow-hidden rounded-md",
+ "fixed inset-0 z-50 bg-black/32 backdrop-blur-sm transition-all duration-200 data-ending-style:opacity-0 data-starting-style:opacity-0",
className,
)}
+ data-slot="command-dialog-backdrop"
{...props}
/>
);
}
-function CommandDialog({
- title = "Command Palette",
- description = "Search for a command to run...",
- children,
+function CommandDialogViewport({
className,
- showCloseButton = true,
...props
-}: React.ComponentProps<typeof Dialog> & {
- title?: string;
- description?: string;
- className?: string;
- showCloseButton?: boolean;
-}) {
+}: CommandDialogPrimitive.Viewport.Props) {
return (
- <Dialog {...props}>
- <DialogHeader className="sr-only">
- <DialogTitle>{title}</DialogTitle>
- <DialogDescription>{description}</DialogDescription>
- </DialogHeader>
- <DialogContent
- className={cn("overflow-hidden p-0", className)}
- showCloseButton={showCloseButton}
- >
- <Command className="[&_[cmdk-group-heading]]:text-muted-foreground [&_[data-slot=command-input-wrapper]]:h-12 [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group]]:px-2 [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5">
+ <CommandDialogPrimitive.Viewport
+ className={cn(
+ "fixed inset-0 z-50 flex flex-col items-center px-4 py-[max(--spacing(4),4vh)] sm:py-[10vh]",
+ className,
+ )}
+ data-slot="command-dialog-viewport"
+ {...props}
+ />
+ );
+}
+
+function CommandDialogPopup({
+ className,
+ children,
+ ...props
+}: CommandDialogPrimitive.Popup.Props) {
+ return (
+ <CommandDialogPortal>
+ <CommandDialogBackdrop />
+ <CommandDialogViewport>
+ <CommandDialogPrimitive.Popup
+ className={cn(
+ "-translate-y-[calc(1.25rem*var(--nested-dialogs))] relative row-start-2 flex max-h-105 min-h-0 w-full min-w-0 max-w-xl scale-[calc(1-0.1*var(--nested-dialogs))] flex-col rounded-2xl border bg-popover not-dark:bg-clip-padding text-popover-foreground opacity-[calc(1-0.1*var(--nested-dialogs))] shadow-lg/5 outline-none transition-[scale,opacity,translate] duration-200 ease-in-out will-change-transform before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-2xl)-1px)] before:bg-muted/72 before:shadow-[0_1px_--theme(--color-black/4%)] data-nested:data-ending-style:translate-y-8 data-nested:data-starting-style:translate-y-8 data-nested-dialog-open:origin-top data-ending-style:scale-98 data-starting-style:scale-98 data-ending-style:opacity-0 data-starting-style:opacity-0 **:data-[slot=scroll-area-viewport]:data-has-overflow-y:pe-1 dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ className,
+ )}
+ data-slot="command-dialog-popup"
+ {...props}
+ >
{children}
- </Command>
- </DialogContent>
- </Dialog>
+ </CommandDialogPrimitive.Popup>
+ </CommandDialogViewport>
+ </CommandDialogPortal>
+ );
+}
+
+function Command({
+ autoHighlight = "always",
+ keepHighlight = true,
+ ...props
+}: React.ComponentProps<typeof Autocomplete>) {
+ return (
+ <Autocomplete
+ autoHighlight={autoHighlight}
+ inline
+ keepHighlight={keepHighlight}
+ open
+ {...props}
+ />
);
}
function CommandInput({
className,
+ placeholder = undefined,
...props
-}: React.ComponentProps<typeof CommandPrimitive.Input>) {
+}: React.ComponentProps<typeof AutocompleteInput>) {
return (
- <div
- data-slot="command-input-wrapper"
- className="flex h-9 items-center gap-2 border-b px-3"
- >
- <SearchIcon className="size-4 shrink-0 opacity-50" />
- <CommandPrimitive.Input
- data-slot="command-input"
+ <div className="px-2.5 py-1.5">
+ <AutocompleteInput
+ autoFocus
className={cn(
- "placeholder:text-muted-foreground flex h-10 w-full rounded-md bg-transparent py-3 text-sm outline-hidden disabled:cursor-not-allowed disabled:opacity-50",
+ "border-transparent! bg-transparent! shadow-none before:hidden has-focus-visible:ring-0",
className,
)}
+ placeholder={placeholder}
+ size="lg"
+ startAddon={<SearchIcon />}
{...props}
/>
</div>
@@ -83,26 +128,33 @@ function CommandInput({
function CommandList({
className,
...props
-}: React.ComponentProps<typeof CommandPrimitive.List>) {
+}: React.ComponentProps<typeof AutocompleteList>) {
return (
- <CommandPrimitive.List
+ <AutocompleteList
+ className={cn("not-empty:scroll-py-2 not-empty:p-2", className)}
data-slot="command-list"
- className={cn(
- "max-h-[300px] scroll-py-1 overflow-x-hidden overflow-y-auto",
- className,
- )}
{...props}
/>
);
}
function CommandEmpty({
+ className,
...props
-}: React.ComponentProps<typeof CommandPrimitive.Empty>) {
+}: React.ComponentProps<typeof AutocompleteEmpty>) {
return (
- <CommandPrimitive.Empty
+ <AutocompleteEmpty
+ className={cn("not-empty:py-6", className)}
data-slot="command-empty"
- className="py-6 text-center text-sm"
+ {...props}
+ />
+ );
+}
+
+function CommandPanel({ className, ...props }: React.ComponentProps<"div">) {
+ return (
+ <div
+ className="-mx-px not-has-[+[data-slot=command-footer]]:-mb-px relative min-h-0 rounded-t-xl not-has-[+[data-slot=command-footer]]:rounded-b-2xl border border-b-0 bg-popover bg-clip-padding shadow-xs/5 [clip-path:inset(0_1px)] not-has-[+[data-slot=command-footer]]:[clip-path:inset(0_1px_1px_1px_round_0_0_calc(var(--radius-2xl)-1px)_calc(var(--radius-2xl)-1px))] before:pointer-events-none before:absolute before:inset-0 before:rounded-t-[calc(var(--radius-xl)-1px)] **:data-[slot=scroll-area-scrollbar]:mt-2"
{...props}
/>
);
@@ -111,72 +163,102 @@ function CommandEmpty({
function CommandGroup({
className,
...props
-}: React.ComponentProps<typeof CommandPrimitive.Group>) {
+}: React.ComponentProps<typeof AutocompleteGroup>) {
return (
- <CommandPrimitive.Group
+ <AutocompleteGroup
+ className={className}
data-slot="command-group"
- className={cn(
- "text-foreground [&_[cmdk-group-heading]]:text-muted-foreground overflow-hidden p-1 [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:py-1.5 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-medium",
- className,
- )}
{...props}
/>
);
}
-function CommandSeparator({
+function CommandGroupLabel({
className,
...props
-}: React.ComponentProps<typeof CommandPrimitive.Separator>) {
+}: React.ComponentProps<typeof AutocompleteGroupLabel>) {
return (
- <CommandPrimitive.Separator
- data-slot="command-separator"
- className={cn("bg-border -mx-1 h-px", className)}
+ <AutocompleteGroupLabel
+ className={className}
+ data-slot="command-group-label"
{...props}
/>
);
}
+function CommandCollection({
+ ...props
+}: React.ComponentProps<typeof AutocompleteCollection>) {
+ return <AutocompleteCollection data-slot="command-collection" {...props} />;
+}
+
function CommandItem({
className,
...props
-}: React.ComponentProps<typeof CommandPrimitive.Item>) {
+}: React.ComponentProps<typeof AutocompleteItem>) {
return (
- <CommandPrimitive.Item
+ <AutocompleteItem
+ className={cn("py-1.5", className)}
data-slot="command-item"
- className={cn(
- "data-[selected=true]:bg-accent data-[selected=true]:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
- className,
- )}
{...props}
/>
);
}
-function CommandShortcut({
+function CommandSeparator({
className,
...props
-}: React.ComponentProps<"span">) {
+}: React.ComponentProps<typeof AutocompleteSeparator>) {
return (
- <span
+ <AutocompleteSeparator
+ className={cn("my-2", className)}
+ data-slot="command-separator"
+ {...props}
+ />
+ );
+}
+
+function CommandShortcut({ className, ...props }: React.ComponentProps<"kbd">) {
+ return (
+ <kbd
+ className={cn(
+ "ms-auto font-medium font-sans text-muted-foreground/72 text-xs tracking-widest",
+ className,
+ )}
data-slot="command-shortcut"
+ {...props}
+ />
+ );
+}
+
+function CommandFooter({ className, ...props }: React.ComponentProps<"div">) {
+ return (
+ <div
className={cn(
- "text-muted-foreground ml-auto text-xs tracking-widest",
+ "flex items-center justify-between gap-2 rounded-b-[calc(var(--radius-2xl)-1px)] border-t px-5 py-3 text-muted-foreground text-xs",
className,
)}
+ data-slot="command-footer"
{...props}
/>
);
}
export {
+ CommandCreateHandle,
Command,
+ CommandCollection,
CommandDialog,
- CommandInput,
- CommandList,
+ CommandDialogPopup,
+ CommandDialogTrigger,
CommandEmpty,
+ CommandFooter,
CommandGroup,
+ CommandGroupLabel,
+ CommandInput,
CommandItem,
- CommandShortcut,
+ CommandList,
+ CommandPanel,
CommandSeparator,
+ CommandShortcut,
};
diff --git a/apps/web/src/components/ui/context-menu.tsx b/apps/web/src/components/ui/context-menu.tsx
index 757ce73bd..676903bec 100644
--- a/apps/web/src/components/ui/context-menu.tsx
+++ b/apps/web/src/components/ui/context-menu.tsx
@@ -1,68 +1,103 @@
-import * as ContextMenuPrimitive from "@radix-ui/react-context-menu";
+import { ContextMenu as ContextMenuPrimitive } from "@base-ui/react/context-menu";
import { CheckIcon, ChevronRightIcon, CircleIcon } from "lucide-react";
-import type * as React from "react";
+import * as React from "react";
import { cn } from "@/lib/cn";
-function ContextMenu({
- onOpenChange,
+function ContextMenu(props: ContextMenuPrimitive.Root.Props) {
+ return <ContextMenuPrimitive.Root data-slot="context-menu" {...props} />;
+}
+
+function ContextMenuTrigger({
+ asChild,
+ children,
...props
-}: React.ComponentProps<typeof ContextMenuPrimitive.Root>) {
+}: ContextMenuPrimitive.Trigger.Props & { asChild?: boolean }) {
+ if (asChild && React.isValidElement(children)) {
+ return (
+ <ContextMenuPrimitive.Trigger
+ data-slot="context-menu-trigger"
+ render={children}
+ {...props}
+ />
+ );
+ }
+
return (
- <ContextMenuPrimitive.Root
- data-slot="context-menu"
- onOpenChange={(open) => {
- // Ensure proper cleanup when context menu closes
- if (!open) {
- setTimeout(() => {
- document.body.style.pointerEvents = "";
- }, 100);
- }
- onOpenChange?.(open);
- }}
- {...props}
- />
+ <ContextMenuPrimitive.Trigger data-slot="context-menu-trigger" {...props}>
+ {children}
+ </ContextMenuPrimitive.Trigger>
);
}
-function ContextMenuTrigger({
- ...props
-}: React.ComponentProps<typeof ContextMenuPrimitive.Trigger>) {
+function ContextMenuPortal(props: ContextMenuPrimitive.Portal.Props) {
return (
- <ContextMenuPrimitive.Trigger data-slot="context-menu-trigger" {...props} />
+ <ContextMenuPrimitive.Portal data-slot="context-menu-portal" {...props} />
);
}
-function ContextMenuGroup({
- ...props
-}: React.ComponentProps<typeof ContextMenuPrimitive.Group>) {
+function ContextMenuGroup(props: ContextMenuPrimitive.Group.Props) {
return (
<ContextMenuPrimitive.Group data-slot="context-menu-group" {...props} />
);
}
-function ContextMenuPortal({
- ...props
-}: React.ComponentProps<typeof ContextMenuPrimitive.Portal>) {
+function ContextMenuRadioGroup(props: ContextMenuPrimitive.RadioGroup.Props) {
return (
- <ContextMenuPrimitive.Portal data-slot="context-menu-portal" {...props} />
+ <ContextMenuPrimitive.RadioGroup
+ data-slot="context-menu-radio-group"
+ {...props}
+ />
);
}
-function ContextMenuSub({
- ...props
-}: React.ComponentProps<typeof ContextMenuPrimitive.Sub>) {
- return <ContextMenuPrimitive.Sub data-slot="context-menu-sub" {...props} />;
+function ContextMenuSub(props: ContextMenuPrimitive.SubmenuRoot.Props) {
+ return (
+ <ContextMenuPrimitive.SubmenuRoot data-slot="context-menu-sub" {...props} />
+ );
}
-function ContextMenuRadioGroup({
+function ContextMenuContent({
+ className,
+ sideOffset = 4,
+ align = "center",
+ side = "right",
+ alignOffset = 0,
+ anchor,
+ children,
...props
-}: React.ComponentProps<typeof ContextMenuPrimitive.RadioGroup>) {
+}: ContextMenuPrimitive.Popup.Props & {
+ sideOffset?: ContextMenuPrimitive.Positioner.Props["sideOffset"];
+ side?: ContextMenuPrimitive.Positioner.Props["side"];
+ align?: ContextMenuPrimitive.Positioner.Props["align"];
+ alignOffset?: ContextMenuPrimitive.Positioner.Props["alignOffset"];
+ anchor?: ContextMenuPrimitive.Positioner.Props["anchor"];
+}) {
return (
- <ContextMenuPrimitive.RadioGroup
- data-slot="context-menu-radio-group"
- {...props}
- />
+ <ContextMenuPrimitive.Portal>
+ <ContextMenuPrimitive.Positioner
+ align={align}
+ alignOffset={alignOffset}
+ anchor={anchor}
+ className="z-50"
+ data-slot="context-menu-positioner"
+ side={side}
+ sideOffset={sideOffset}
+ >
+ <ContextMenuPrimitive.Popup
+ className={cn(
+ "relative flex not-[class*='w-']:min-w-32 origin-(--transform-origin) rounded-lg border bg-popover not-dark:bg-clip-padding text-popover-foreground shadow-lg/5 outline-none transition-[scale,opacity] before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] data-starting-style:scale-98 data-ending-style:scale-98 data-starting-style:opacity-0 data-ending-style:opacity-0 dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ className,
+ )}
+ data-slot="context-menu-content"
+ {...props}
+ >
+ <div className="max-h-(--available-height) w-full overflow-y-auto p-1">
+ {children}
+ </div>
+ </ContextMenuPrimitive.Popup>
+ </ContextMenuPrimitive.Positioner>
+ </ContextMenuPrimitive.Portal>
);
}
@@ -71,77 +106,67 @@ function ContextMenuSubTrigger({
inset,
children,
...props
-}: React.ComponentProps<typeof ContextMenuPrimitive.SubTrigger> & {
+}: ContextMenuPrimitive.SubmenuTrigger.Props & {
inset?: boolean;
}) {
return (
- <ContextMenuPrimitive.SubTrigger
- data-slot="context-menu-sub-trigger"
- data-inset={inset}
+ <ContextMenuPrimitive.SubmenuTrigger
className={cn(
- "focus:bg-accent focus:text-accent-foreground data-[state=open]:bg-accent data-[state=open]:text-accent-foreground flex cursor-default items-center rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+ "flex min-h-8 items-center gap-2 rounded-sm px-2 py-1 text-base text-foreground outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-popup-open:bg-accent data-inset:ps-8 data-highlighted:text-accent-foreground data-popup-open:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none",
className,
)}
+ data-inset={inset}
+ data-slot="context-menu-sub-trigger"
{...props}
>
{children}
- <ChevronRightIcon className="ml-auto" />
- </ContextMenuPrimitive.SubTrigger>
+ <ChevronRightIcon className="-me-0.5 ms-auto opacity-80" />
+ </ContextMenuPrimitive.SubmenuTrigger>
);
}
function ContextMenuSubContent({
className,
+ sideOffset = 0,
+ align = "start",
+ alignOffset = -5,
...props
-}: React.ComponentProps<typeof ContextMenuPrimitive.SubContent>) {
+}: ContextMenuPrimitive.Popup.Props & {
+ sideOffset?: ContextMenuPrimitive.Positioner.Props["sideOffset"];
+ align?: ContextMenuPrimitive.Positioner.Props["align"];
+ alignOffset?: ContextMenuPrimitive.Positioner.Props["alignOffset"];
+}) {
return (
- <ContextMenuPrimitive.SubContent
+ <ContextMenuContent
+ align={align}
+ alignOffset={alignOffset}
+ className={className}
data-slot="context-menu-sub-content"
- className={cn(
- "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] origin-(--radix-context-menu-content-transform-origin) overflow-hidden rounded-md border p-1 shadow-lg",
- className,
- )}
+ side="inline-end"
+ sideOffset={sideOffset}
{...props}
/>
);
}
-function ContextMenuContent({
- className,
- ...props
-}: React.ComponentProps<typeof ContextMenuPrimitive.Content>) {
- return (
- <ContextMenuPrimitive.Portal>
- <ContextMenuPrimitive.Content
- data-slot="context-menu-content"
- className={cn(
- "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 max-h-(--radix-context-menu-content-available-height) min-w-[8rem] origin-(--radix-context-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border p-1 shadow-md",
- className,
- )}
- {...props}
- />
- </ContextMenuPrimitive.Portal>
- );
-}
-
function ContextMenuItem({
className,
inset,
variant = "default",
...props
-}: React.ComponentProps<typeof ContextMenuPrimitive.Item> & {
+}: ContextMenuPrimitive.Item.Props & {
inset?: boolean;
variant?: "default" | "destructive";
}) {
return (
<ContextMenuPrimitive.Item
- data-slot="context-menu-item"
- data-inset={inset}
- data-variant={variant}
className={cn(
- "focus:bg-accent focus:text-accent-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 dark:data-[variant=destructive]:focus:bg-destructive/20 data-[variant=destructive]:focus:text-destructive data-[variant=destructive]:*:[svg]:!text-destructive [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+ "[&>svg]:-mx-0.5 flex min-h-8 cursor-default select-none items-center gap-2 rounded-sm px-2 py-1 text-base text-foreground outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-inset:ps-8 data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&>svg:not([class*='opacity-'])]:opacity-80 [&>svg:not([class*='size-'])]:size-4.5 sm:[&>svg:not([class*='size-'])]:size-4 [&>svg]:pointer-events-none [&>svg]:shrink-0",
+ variant === "destructive" && "text-destructive",
className,
)}
+ data-inset={inset}
+ data-slot="context-menu-item"
{...props}
/>
);
@@ -152,23 +177,23 @@ function ContextMenuCheckboxItem({
children,
checked,
...props
-}: React.ComponentProps<typeof ContextMenuPrimitive.CheckboxItem>) {
+}: ContextMenuPrimitive.CheckboxItem.Props) {
return (
<ContextMenuPrimitive.CheckboxItem
- data-slot="context-menu-checkbox-item"
+ checked={checked}
className={cn(
- "focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+ "grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default grid-cols-[1rem_1fr] items-center gap-2 rounded-sm py-1 ps-2 pe-4 text-base text-foreground outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
className,
)}
- checked={checked}
+ data-slot="context-menu-checkbox-item"
{...props}
>
- {children}
- <span className="pointer-events-none absolute right-2 flex size-3.5 items-center justify-center">
- <ContextMenuPrimitive.ItemIndicator>
- <CheckIcon className="size-4" />
- </ContextMenuPrimitive.ItemIndicator>
- </span>
+ <ContextMenuPrimitive.CheckboxItemIndicator className="col-start-1">
+ <CheckIcon />
+ </ContextMenuPrimitive.CheckboxItemIndicator>
+ <div className="col-start-2 inline-flex items-center gap-2">
+ {children}
+ </div>
</ContextMenuPrimitive.CheckboxItem>
);
}
@@ -177,22 +202,22 @@ function ContextMenuRadioItem({
className,
children,
...props
-}: React.ComponentProps<typeof ContextMenuPrimitive.RadioItem>) {
+}: ContextMenuPrimitive.RadioItem.Props) {
return (
<ContextMenuPrimitive.RadioItem
- data-slot="context-menu-radio-item"
className={cn(
- "focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+ "grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default grid-cols-[1rem_1fr] items-center gap-2 rounded-sm py-1 ps-2 pe-4 text-base text-foreground outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
className,
)}
+ data-slot="context-menu-radio-item"
{...props}
>
- <span className="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
- <ContextMenuPrimitive.ItemIndicator>
- <CircleIcon className="size-2 fill-current" />
- </ContextMenuPrimitive.ItemIndicator>
- </span>
- {children}
+ <ContextMenuPrimitive.RadioItemIndicator className="col-start-1">
+ <CircleIcon className="size-2 fill-current" />
+ </ContextMenuPrimitive.RadioItemIndicator>
+ <div className="col-start-2 inline-flex items-center gap-2">
+ {children}
+ </div>
</ContextMenuPrimitive.RadioItem>
);
}
@@ -201,17 +226,15 @@ function ContextMenuLabel({
className,
inset,
...props
-}: React.ComponentProps<typeof ContextMenuPrimitive.Label> & {
- inset?: boolean;
-}) {
+}: ContextMenuPrimitive.GroupLabel.Props & { inset?: boolean }) {
return (
- <ContextMenuPrimitive.Label
- data-slot="context-menu-label"
- data-inset={inset}
+ <ContextMenuPrimitive.GroupLabel
className={cn(
- "text-foreground px-2 py-1.5 text-sm font-medium data-[inset]:pl-8",
+ "px-2 py-1.5 font-medium text-muted-foreground text-xs data-inset:ps-8",
className,
)}
+ data-inset={inset}
+ data-slot="context-menu-label"
{...props}
/>
);
@@ -220,11 +243,11 @@ function ContextMenuLabel({
function ContextMenuSeparator({
className,
...props
-}: React.ComponentProps<typeof ContextMenuPrimitive.Separator>) {
+}: ContextMenuPrimitive.Separator.Props) {
return (
<ContextMenuPrimitive.Separator
+ className={cn("mx-2 my-1 h-px bg-border", className)}
data-slot="context-menu-separator"
- className={cn("bg-border -mx-1 my-1 h-px", className)}
{...props}
/>
);
@@ -236,30 +259,19 @@ function ContextMenuShortcut({
}: React.ComponentProps<"span">) {
return (
<span
- data-slot="context-menu-shortcut"
className={cn(
- "text-muted-foreground ml-auto text-xs tracking-widest",
+ "ms-auto text-muted-foreground text-xs tracking-widest",
className,
)}
+ data-slot="context-menu-shortcut"
{...props}
/>
);
}
export {
- ContextMenu,
- ContextMenuTrigger,
- ContextMenuContent,
- ContextMenuItem,
- ContextMenuCheckboxItem,
- ContextMenuRadioItem,
- ContextMenuLabel,
- ContextMenuSeparator,
- ContextMenuShortcut,
- ContextMenuGroup,
- ContextMenuPortal,
- ContextMenuSub,
+ ContextMenu, ContextMenuCheckboxItem, ContextMenuContent, ContextMenuGroup, ContextMenuItem, ContextMenuLabel, ContextMenuPortal, ContextMenuRadioGroup, ContextMenuRadioItem, ContextMenuSeparator,
+ ContextMenuShortcut, ContextMenuSub,
ContextMenuSubContent,
- ContextMenuSubTrigger,
- ContextMenuRadioGroup,
+ ContextMenuSubTrigger, ContextMenuTrigger
};
diff --git a/apps/web/src/components/ui/dialog.tsx b/apps/web/src/components/ui/dialog.tsx
index f9f0b7921..5245a1982 100644
--- a/apps/web/src/components/ui/dialog.tsx
+++ b/apps/web/src/components/ui/dialog.tsx
@@ -1,79 +1,98 @@
-import * as DialogPrimitive from "@radix-ui/react-dialog";
-import { XIcon } from "lucide-react";
-import type * as React from "react";
+"use client";
+import { Dialog as DialogPrimitive } from "@base-ui/react/dialog";
+import { XIcon } from "lucide-react";
import { cn } from "@/lib/cn";
+import { Button } from "@/components/ui/button";
+import { ScrollArea } from "@/components/ui/scroll-area";
-function Dialog({
- ...props
-}: React.ComponentProps<typeof DialogPrimitive.Root>) {
- return <DialogPrimitive.Root data-slot="dialog" {...props} />;
-}
+const DialogCreateHandle = DialogPrimitive.createHandle;
-function DialogTrigger({
- ...props
-}: React.ComponentProps<typeof DialogPrimitive.Trigger>) {
+const Dialog = DialogPrimitive.Root;
+
+const DialogPortal = DialogPrimitive.Portal;
+
+function DialogTrigger(props: DialogPrimitive.Trigger.Props) {
return <DialogPrimitive.Trigger data-slot="dialog-trigger" {...props} />;
}
-function DialogPortal({
- ...props
-}: React.ComponentProps<typeof DialogPrimitive.Portal>) {
- return <DialogPrimitive.Portal data-slot="dialog-portal" {...props} />;
+function DialogClose(props: DialogPrimitive.Close.Props) {
+ return <DialogPrimitive.Close data-slot="dialog-close" {...props} />;
}
-function DialogClose({
+function DialogBackdrop({
+ className,
...props
-}: React.ComponentProps<typeof DialogPrimitive.Close>) {
- return <DialogPrimitive.Close data-slot="dialog-close" {...props} />;
+}: DialogPrimitive.Backdrop.Props) {
+ return (
+ <DialogPrimitive.Backdrop
+ className={cn(
+ "fixed inset-0 z-50 bg-black/32 backdrop-blur-sm transition-all duration-200 data-ending-style:opacity-0 data-starting-style:opacity-0",
+ className,
+ )}
+ data-slot="dialog-backdrop"
+ {...props}
+ />
+ );
}
-function DialogOverlay({
+function DialogViewport({
className,
...props
-}: React.ComponentProps<typeof DialogPrimitive.Overlay>) {
+}: DialogPrimitive.Viewport.Props) {
return (
- <DialogPrimitive.Overlay
- data-slot="dialog-overlay"
+ <DialogPrimitive.Viewport
className={cn(
- "data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50",
+ "fixed inset-0 z-50 grid grid-rows-[1fr_auto_3fr] justify-items-center p-4",
className,
)}
+ data-slot="dialog-viewport"
{...props}
/>
);
}
-function DialogContent({
+function DialogPopup({
className,
children,
showCloseButton = true,
+ bottomStickOnMobile = true,
...props
-}: React.ComponentProps<typeof DialogPrimitive.Content> & {
+}: DialogPrimitive.Popup.Props & {
showCloseButton?: boolean;
+ bottomStickOnMobile?: boolean;
}) {
return (
- <DialogPortal data-slot="dialog-portal">
- <DialogOverlay />
- <DialogPrimitive.Content
- data-slot="dialog-content"
+ <DialogPortal>
+ <DialogBackdrop />
+ <DialogViewport
className={cn(
- "bg-card border border-border backdrop-blur-xl shadow-2xl data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] rounded-lg duration-200 sm:max-w-md",
- className,
+ bottomStickOnMobile &&
+ "max-sm:grid-rows-[1fr_auto] max-sm:p-0 max-sm:pt-12",
)}
- {...props}
>
- {children}
- {showCloseButton && (
- <DialogPrimitive.Close
- data-slot="dialog-close"
- className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute top-3 right-3 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4"
- >
- <XIcon />
- <span className="sr-only">Close</span>
- </DialogPrimitive.Close>
- )}
- </DialogPrimitive.Content>
+ <DialogPrimitive.Popup
+ className={cn(
+ "-translate-y-[calc(1.25rem*var(--nested-dialogs))] relative row-start-2 flex max-h-full min-h-0 w-full min-w-0 max-w-lg scale-[calc(1-0.1*var(--nested-dialogs))] flex-col rounded-2xl border bg-popover not-dark:bg-clip-padding text-popover-foreground opacity-[calc(1-0.1*var(--nested-dialogs))] shadow-lg/5 transition-[scale,opacity,translate] duration-200 ease-in-out will-change-transform before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-2xl)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] data-nested:data-ending-style:translate-y-8 data-nested:data-starting-style:translate-y-8 data-nested-dialog-open:origin-top data-ending-style:scale-98 data-starting-style:scale-98 data-ending-style:opacity-0 data-starting-style:opacity-0 dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ bottomStickOnMobile &&
+ "max-sm:max-w-none max-sm:rounded-none max-sm:border-x-0 max-sm:border-t max-sm:border-b-0 max-sm:opacity-[calc(1-min(var(--nested-dialogs),1))] max-sm:data-ending-style:translate-y-4 max-sm:data-starting-style:translate-y-4 max-sm:before:hidden max-sm:before:rounded-none",
+ className,
+ )}
+ data-slot="dialog-popup"
+ {...props}
+ >
+ {children}
+ {showCloseButton && (
+ <DialogPrimitive.Close
+ aria-label="Close"
+ className="absolute end-2 top-2"
+ render={<Button size="icon" variant="ghost" />}
+ >
+ <XIcon />
+ </DialogPrimitive.Close>
+ )}
+ </DialogPrimitive.Popup>
+ </DialogViewport>
</DialogPortal>
);
}
@@ -81,34 +100,46 @@ function DialogContent({
function DialogHeader({ className, ...props }: React.ComponentProps<"div">) {
return (
<div
+ className={cn(
+ "flex flex-col gap-2 p-6 in-[[data-slot=dialog-popup]:has([data-slot=dialog-panel])]:pb-3 max-sm:pb-4",
+ className,
+ )}
data-slot="dialog-header"
- className={cn("pb-6 px-6 pt-6", className)}
{...props}
/>
);
}
-function DialogFooter({ className, ...props }: React.ComponentProps<"div">) {
+function DialogFooter({
+ className,
+ variant = "default",
+ ...props
+}: React.ComponentProps<"div"> & {
+ variant?: "default" | "bare";
+}) {
return (
<div
- data-slot="dialog-footer"
className={cn(
- "flex items-center justify-end gap-3 pt-4 px-4 pb-4 border-t border-border",
+ "flex flex-col-reverse gap-2 px-6 sm:flex-row sm:justify-end sm:rounded-b-[calc(var(--radius-2xl)-1px)]",
+ variant === "default" && "border-t bg-muted/72 py-4",
+ variant === "bare" &&
+ "in-[[data-slot=dialog-popup]:has([data-slot=dialog-panel])]:pt-3 pt-4 pb-6",
className,
)}
+ data-slot="dialog-footer"
{...props}
/>
);
}
-function DialogTitle({
- className,
- ...props
-}: React.ComponentProps<typeof DialogPrimitive.Title>) {
+function DialogTitle({ className, ...props }: DialogPrimitive.Title.Props) {
return (
<DialogPrimitive.Title
+ className={cn(
+ "font-heading font-semibold text-xl leading-none",
+ className,
+ )}
data-slot="dialog-title"
- className={cn("text-lg leading-none font-semibold", className)}
{...props}
/>
);
@@ -117,25 +148,49 @@ function DialogTitle({
function DialogDescription({
className,
...props
-}: React.ComponentProps<typeof DialogPrimitive.Description>) {
+}: DialogPrimitive.Description.Props) {
return (
<DialogPrimitive.Description
- data-slot="dialog-description"
className={cn("text-muted-foreground text-sm", className)}
+ data-slot="dialog-description"
{...props}
/>
);
}
+function DialogPanel({
+ className,
+ scrollFade = true,
+ ...props
+}: React.ComponentProps<"div"> & { scrollFade?: boolean }) {
+ return (
+ <ScrollArea scrollFade={scrollFade}>
+ <div
+ className={cn(
+ "p-6 in-[[data-slot=dialog-popup]:has([data-slot=dialog-header])]:pt-1 in-[[data-slot=dialog-popup]:has([data-slot=dialog-footer]:not(.border-t))]:pb-1",
+ className,
+ )}
+ data-slot="dialog-panel"
+ {...props}
+ />
+ </ScrollArea>
+ );
+}
+
export {
+ DialogCreateHandle,
Dialog,
+ DialogTrigger,
+ DialogPortal,
DialogClose,
- DialogContent,
- DialogDescription,
- DialogFooter,
+ DialogBackdrop,
+ DialogBackdrop as DialogOverlay,
+ DialogPopup,
+ DialogPopup as DialogContent,
DialogHeader,
- DialogOverlay,
- DialogPortal,
+ DialogFooter,
DialogTitle,
- DialogTrigger,
+ DialogDescription,
+ DialogPanel,
+ DialogViewport,
};
diff --git a/apps/web/src/components/ui/dropdown-menu.tsx b/apps/web/src/components/ui/dropdown-menu.tsx
deleted file mode 100644
index 9ec616fa0..000000000
--- a/apps/web/src/components/ui/dropdown-menu.tsx
+++ /dev/null
@@ -1,255 +0,0 @@
-import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
-import { CheckIcon, ChevronRightIcon, CircleIcon } from "lucide-react";
-import type * as React from "react";
-
-import { cn } from "@/lib/cn";
-
-function DropdownMenu({
- ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Root>) {
- return <DropdownMenuPrimitive.Root data-slot="dropdown-menu" {...props} />;
-}
-
-function DropdownMenuPortal({
- ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Portal>) {
- return (
- <DropdownMenuPrimitive.Portal data-slot="dropdown-menu-portal" {...props} />
- );
-}
-
-function DropdownMenuTrigger({
- ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Trigger>) {
- return (
- <DropdownMenuPrimitive.Trigger
- data-slot="dropdown-menu-trigger"
- {...props}
- />
- );
-}
-
-function DropdownMenuContent({
- className,
- sideOffset = 4,
- ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Content>) {
- return (
- <DropdownMenuPrimitive.Portal>
- <DropdownMenuPrimitive.Content
- data-slot="dropdown-menu-content"
- sideOffset={sideOffset}
- className={cn(
- "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 max-h-(--radix-dropdown-menu-content-available-height) min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border p-1 shadow-md",
- className,
- )}
- {...props}
- />
- </DropdownMenuPrimitive.Portal>
- );
-}
-
-function DropdownMenuGroup({
- ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Group>) {
- return (
- <DropdownMenuPrimitive.Group data-slot="dropdown-menu-group" {...props} />
- );
-}
-
-function DropdownMenuItem({
- className,
- inset,
- variant = "default",
- ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Item> & {
- inset?: boolean;
- variant?: "default" | "destructive";
-}) {
- return (
- <DropdownMenuPrimitive.Item
- data-slot="dropdown-menu-item"
- data-inset={inset}
- data-variant={variant}
- className={cn(
- "focus:bg-accent focus:text-accent-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 dark:data-[variant=destructive]:focus:bg-destructive/20 data-[variant=destructive]:focus:text-destructive data-[variant=destructive]:*:[svg]:!text-destructive [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
- className,
- )}
- {...props}
- />
- );
-}
-
-function DropdownMenuCheckboxItem({
- className,
- children,
- checked,
- ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.CheckboxItem>) {
- return (
- <DropdownMenuPrimitive.CheckboxItem
- data-slot="dropdown-menu-checkbox-item"
- className={cn(
- "focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
- className,
- )}
- checked={checked}
- {...props}
- >
- {children}
- <span className="pointer-events-none absolute right-2 flex size-3.5 items-center justify-center">
- <DropdownMenuPrimitive.ItemIndicator>
- <CheckIcon className="size-4" />
- </DropdownMenuPrimitive.ItemIndicator>
- </span>
- </DropdownMenuPrimitive.CheckboxItem>
- );
-}
-
-function DropdownMenuRadioGroup({
- ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.RadioGroup>) {
- return (
- <DropdownMenuPrimitive.RadioGroup
- data-slot="dropdown-menu-radio-group"
- {...props}
- />
- );
-}
-
-function DropdownMenuRadioItem({
- className,
- children,
- ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.RadioItem>) {
- return (
- <DropdownMenuPrimitive.RadioItem
- data-slot="dropdown-menu-radio-item"
- className={cn(
- "focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
- className,
- )}
- {...props}
- >
- <span className="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
- <DropdownMenuPrimitive.ItemIndicator>
- <CircleIcon className="size-2 fill-current" />
- </DropdownMenuPrimitive.ItemIndicator>
- </span>
- {children}
- </DropdownMenuPrimitive.RadioItem>
- );
-}
-
-function DropdownMenuLabel({
- className,
- inset,
- ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Label> & {
- inset?: boolean;
-}) {
- return (
- <DropdownMenuPrimitive.Label
- data-slot="dropdown-menu-label"
- data-inset={inset}
- className={cn(
- "px-2 py-1.5 text-sm font-medium data-[inset]:pl-8",
- className,
- )}
- {...props}
- />
- );
-}
-
-function DropdownMenuSeparator({
- className,
- ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Separator>) {
- return (
- <DropdownMenuPrimitive.Separator
- data-slot="dropdown-menu-separator"
- className={cn("bg-border -mx-1 my-1 h-px", className)}
- {...props}
- />
- );
-}
-
-function DropdownMenuShortcut({
- className,
- ...props
-}: React.ComponentProps<"span">) {
- return (
- <span
- data-slot="dropdown-menu-shortcut"
- className={cn(
- "text-muted-foreground ml-auto text-xs tracking-widest",
- className,
- )}
- {...props}
- />
- );
-}
-
-function DropdownMenuSub({
- ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Sub>) {
- return <DropdownMenuPrimitive.Sub data-slot="dropdown-menu-sub" {...props} />;
-}
-
-function DropdownMenuSubTrigger({
- className,
- inset,
- children,
- ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.SubTrigger> & {
- inset?: boolean;
-}) {
- return (
- <DropdownMenuPrimitive.SubTrigger
- data-slot="dropdown-menu-sub-trigger"
- data-inset={inset}
- className={cn(
- "focus:bg-accent focus:text-accent-foreground data-[state=open]:bg-accent data-[state=open]:text-accent-foreground flex cursor-default items-center rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[inset]:pl-8",
- className,
- )}
- {...props}
- >
- {children}
- <ChevronRightIcon className="ml-auto size-4" />
- </DropdownMenuPrimitive.SubTrigger>
- );
-}
-
-function DropdownMenuSubContent({
- className,
- ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.SubContent>) {
- return (
- <DropdownMenuPrimitive.SubContent
- data-slot="dropdown-menu-sub-content"
- className={cn(
- "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-hidden rounded-md border p-1 shadow-lg",
- className,
- )}
- {...props}
- />
- );
-}
-
-export {
- DropdownMenu,
- DropdownMenuPortal,
- DropdownMenuTrigger,
- DropdownMenuContent,
- DropdownMenuGroup,
- DropdownMenuLabel,
- DropdownMenuItem,
- DropdownMenuCheckboxItem,
- DropdownMenuRadioGroup,
- DropdownMenuRadioItem,
- DropdownMenuSeparator,
- DropdownMenuShortcut,
- DropdownMenuSub,
- DropdownMenuSubTrigger,
- DropdownMenuSubContent,
-};
diff --git a/apps/web/src/components/ui/empty.tsx b/apps/web/src/components/ui/empty.tsx
new file mode 100644
index 000000000..5cd331c86
--- /dev/null
+++ b/apps/web/src/components/ui/empty.tsx
@@ -0,0 +1,127 @@
+import { cva, type VariantProps } from "class-variance-authority";
+
+import { cn } from "@/lib/cn";
+
+function Empty({ className, ...props }: React.ComponentProps<"div">) {
+ return (
+ <div
+ className={cn(
+ "flex min-w-0 flex-1 flex-col items-center justify-center gap-6 text-balance p-6 text-center md:p-12",
+ className,
+ )}
+ data-slot="empty"
+ {...props}
+ />
+ );
+}
+
+function EmptyHeader({ className, ...props }: React.ComponentProps<"div">) {
+ return (
+ <div
+ className={cn(
+ "flex max-w-sm flex-col items-center text-center",
+ className,
+ )}
+ data-slot="empty-header"
+ {...props}
+ />
+ );
+}
+
+const emptyMediaVariants = cva(
+ "flex shrink-0 items-center justify-center [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ {
+ defaultVariants: {
+ variant: "default",
+ },
+ variants: {
+ variant: {
+ default: "bg-transparent",
+ icon: "relative flex size-9 shrink-0 items-center justify-center rounded-md border bg-card not-dark:bg-clip-padding text-foreground shadow-sm/5 before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-md)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] dark:before:shadow-[0_-1px_--theme(--color-white/6%)] [&_svg:not([class*='size-'])]:size-4.5",
+ },
+ },
+ },
+);
+
+function EmptyMedia({
+ className,
+ variant = "default",
+ ...props
+}: React.ComponentProps<"div"> & VariantProps<typeof emptyMediaVariants>) {
+ return (
+ <div
+ className={cn("relative mb-6", className)}
+ data-slot="empty-media"
+ data-variant={variant}
+ {...props}
+ >
+ {variant === "icon" && (
+ <>
+ <div
+ aria-hidden="true"
+ className={cn(
+ emptyMediaVariants({ className, variant }),
+ "-translate-x-0.5 -rotate-10 pointer-events-none absolute bottom-px origin-bottom-left scale-84 shadow-none",
+ )}
+ />
+ <div
+ aria-hidden="true"
+ className={cn(
+ emptyMediaVariants({ className, variant }),
+ "pointer-events-none absolute bottom-px origin-bottom-right translate-x-0.5 rotate-10 scale-84 shadow-none",
+ )}
+ />
+ </>
+ )}
+ <div
+ className={cn(emptyMediaVariants({ className, variant }))}
+ {...props}
+ />
+ </div>
+ );
+}
+
+function EmptyTitle({ className, ...props }: React.ComponentProps<"div">) {
+ return (
+ <div
+ className={cn("font-heading font-semibold text-xl", className)}
+ data-slot="empty-title"
+ {...props}
+ />
+ );
+}
+
+function EmptyDescription({ className, ...props }: React.ComponentProps<"p">) {
+ return (
+ <div
+ className={cn(
+ "text-muted-foreground text-sm [&>a:hover]:text-primary [&>a]:underline [&>a]:underline-offset-4 [[data-slot=empty-title]+&]:mt-1",
+ className,
+ )}
+ data-slot="empty-description"
+ {...props}
+ />
+ );
+}
+
+function EmptyContent({ className, ...props }: React.ComponentProps<"div">) {
+ return (
+ <div
+ className={cn(
+ "flex w-full min-w-0 max-w-sm flex-col items-center gap-4 text-balance text-sm",
+ className,
+ )}
+ data-slot="empty-content"
+ {...props}
+ />
+ );
+}
+
+export {
+ Empty,
+ EmptyHeader,
+ EmptyTitle,
+ EmptyDescription,
+ EmptyContent,
+ EmptyMedia,
+};
diff --git a/apps/web/src/components/ui/error-display.tsx b/apps/web/src/components/ui/error-display.tsx
index 007670845..6dcc96621 100644
--- a/apps/web/src/components/ui/error-display.tsx
+++ b/apps/web/src/components/ui/error-display.tsx
@@ -47,8 +47,8 @@ export function ErrorDisplay({
>
<Card className="w-full max-w-md">
<CardHeader className="text-center">
- <div className="mx-auto w-12 h-12 rounded-full bg-red-100 dark:bg-red-900/30 flex items-center justify-center mb-4">
- <AlertTriangle className="w-6 h-6 text-red-600 dark:text-red-400" />
+ <div className="mx-auto mb-4 flex h-12 w-12 items-center justify-center rounded-full bg-destructive/12">
+ <AlertTriangle className="h-6 w-6 text-destructive-foreground" />
</div>
<CardTitle className="text-lg">{title}</CardTitle>
<CardDescription className="text-sm">
@@ -58,16 +58,16 @@ export function ErrorDisplay({
<CardContent className="space-y-4">
{troubleshootingSteps.length > 0 && (
<div className="space-y-2">
- <h4 className="text-sm font-medium text-zinc-900 dark:text-zinc-100">
+ <h4 className="text-sm font-medium text-foreground">
Troubleshooting steps:
</h4>
- <ul className="text-xs text-zinc-600 dark:text-zinc-400 space-y-1">
+ <ul className="text-xs text-muted-foreground space-y-1">
{troubleshootingSteps.map((step, index) => (
<li
key={`step-${index}-${step.slice(0, 10)}`}
className="flex items-start gap-2"
>
- <span className="text-zinc-400 dark:text-zinc-500 mt-0.5">
+ <span className="text-muted-foreground mt-0.5">
•
</span>
<span>{step}</span>
diff --git a/apps/web/src/components/ui/field.tsx b/apps/web/src/components/ui/field.tsx
new file mode 100644
index 000000000..4c49edc78
--- /dev/null
+++ b/apps/web/src/components/ui/field.tsx
@@ -0,0 +1,74 @@
+"use client";
+
+import { Field as FieldPrimitive } from "@base-ui/react/field";
+
+import { cn } from "@/lib/cn";
+
+function Field({ className, ...props }: FieldPrimitive.Root.Props) {
+ return (
+ <FieldPrimitive.Root
+ className={cn("flex flex-col items-start gap-2", className)}
+ data-slot="field"
+ {...props}
+ />
+ );
+}
+
+function FieldLabel({ className, ...props }: FieldPrimitive.Label.Props) {
+ return (
+ <FieldPrimitive.Label
+ className={cn(
+ "inline-flex items-center gap-2 font-medium text-base/4.5 text-foreground sm:text-sm/4",
+ className,
+ )}
+ data-slot="field-label"
+ {...props}
+ />
+ );
+}
+
+function FieldItem({ className, ...props }: FieldPrimitive.Item.Props) {
+ return (
+ <FieldPrimitive.Item
+ className={cn("flex", className)}
+ data-slot="field-item"
+ {...props}
+ />
+ );
+}
+
+function FieldDescription({
+ className,
+ ...props
+}: FieldPrimitive.Description.Props) {
+ return (
+ <FieldPrimitive.Description
+ className={cn("text-muted-foreground text-xs", className)}
+ data-slot="field-description"
+ {...props}
+ />
+ );
+}
+
+function FieldError({ className, ...props }: FieldPrimitive.Error.Props) {
+ return (
+ <FieldPrimitive.Error
+ className={cn("text-destructive-foreground text-xs", className)}
+ data-slot="field-error"
+ {...props}
+ />
+ );
+}
+
+const FieldControl = FieldPrimitive.Control;
+const FieldValidity = FieldPrimitive.Validity;
+
+export {
+ Field,
+ FieldLabel,
+ FieldDescription,
+ FieldError,
+ FieldControl,
+ FieldItem,
+ FieldValidity,
+};
diff --git a/apps/web/src/components/ui/fieldset.tsx b/apps/web/src/components/ui/fieldset.tsx
new file mode 100644
index 000000000..edc84e069
--- /dev/null
+++ b/apps/web/src/components/ui/fieldset.tsx
@@ -0,0 +1,29 @@
+"use client";
+
+import { Fieldset as FieldsetPrimitive } from "@base-ui/react/fieldset";
+
+import { cn } from "@/lib/cn";
+
+function Fieldset({ className, ...props }: FieldsetPrimitive.Root.Props) {
+ return (
+ <FieldsetPrimitive.Root
+ className={cn("flex w-full max-w-64 flex-col gap-6", className)}
+ data-slot="fieldset"
+ {...props}
+ />
+ );
+}
+function FieldsetLegend({
+ className,
+ ...props
+}: FieldsetPrimitive.Legend.Props) {
+ return (
+ <FieldsetPrimitive.Legend
+ className={cn("font-semibold text-foreground", className)}
+ data-slot="fieldset-legend"
+ {...props}
+ />
+ );
+}
+
+export { Fieldset, FieldsetLegend };
diff --git a/apps/web/src/components/ui/form.tsx b/apps/web/src/components/ui/form.tsx
index 8b8a09757..3cc1bab9a 100644
--- a/apps/web/src/components/ui/form.tsx
+++ b/apps/web/src/components/ui/form.tsx
@@ -1,17 +1,18 @@
-import type * as LabelPrimitive from "@radix-ui/react-label";
+"use client";
+
import { Slot } from "@radix-ui/react-slot";
import * as React from "react";
import {
Controller,
+ FormProvider,
+ useFormContext,
type ControllerProps,
type FieldPath,
type FieldValues,
- FormProvider,
- useFormContext,
} from "react-hook-form";
-import { Label } from "@/components/ui/label";
import { cn } from "@/lib/cn";
+import { Label } from "@/components/ui/label";
const Form = FormProvider;
@@ -39,7 +40,15 @@ const FormField = <
);
};
-const useFormField = () => {
+type FormItemContextValue = {
+ id: string;
+};
+
+const FormItemContext = React.createContext<FormItemContextValue>(
+ {} as FormItemContextValue,
+);
+
+function useFormField() {
const fieldContext = React.useContext(FormFieldContext);
const itemContext = React.useContext(FormItemContext);
const { getFieldState, formState } = useFormContext();
@@ -55,98 +64,72 @@ const useFormField = () => {
return {
id,
name: fieldContext.name,
- formItemId: `${id}-form-item`,
formDescriptionId: `${id}-form-item-description`,
+ formItemId: `${id}-form-item`,
formMessageId: `${id}-form-item-message`,
...fieldState,
};
-};
+}
-type FormItemContextValue = {
- id: string;
-};
-
-const FormItemContext = React.createContext<FormItemContextValue>(
- {} as FormItemContextValue,
-);
-
-const FormItem = React.forwardRef<
- HTMLDivElement,
- React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => {
+function FormItem({ className, ...props }: React.ComponentProps<"div">) {
const id = React.useId();
return (
<FormItemContext.Provider value={{ id }}>
- <div ref={ref} className={cn("space-y-2", className)} {...props} />
+ <div
+ className={cn("space-y-2", className)}
+ data-slot="form-item"
+ {...props}
+ />
</FormItemContext.Provider>
);
-});
-FormItem.displayName = "FormItem";
+}
-const FormLabel = React.forwardRef<
- React.ElementRef<typeof LabelPrimitive.Root>,
- React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root>
->(({ className, ...props }, ref) => {
+function FormLabel({ className, ...props }: React.ComponentProps<typeof Label>) {
const { error, formItemId } = useFormField();
return (
<Label
- ref={ref}
className={cn(error && "text-destructive", className)}
+ data-slot="form-label"
htmlFor={formItemId}
{...props}
/>
);
-});
-FormLabel.displayName = "FormLabel";
+}
-const FormControl = React.forwardRef<
- React.ElementRef<typeof Slot>,
- React.ComponentPropsWithoutRef<typeof Slot>
->(({ ...props }, ref) => {
- const { error, formItemId, formDescriptionId, formMessageId } =
- useFormField();
+function FormControl({ ...props }: React.ComponentProps<typeof Slot>) {
+ const { error, formDescriptionId, formItemId, formMessageId } = useFormField();
return (
<Slot
- ref={ref}
- id={formItemId}
aria-describedby={
- !error
- ? `${formDescriptionId}`
- : `${formDescriptionId} ${formMessageId}`
+ error ? `${formDescriptionId} ${formMessageId}` : formDescriptionId
}
aria-invalid={!!error}
+ data-slot="form-control"
+ id={formItemId}
{...props}
/>
);
-});
-FormControl.displayName = "FormControl";
+}
-const FormDescription = React.forwardRef<
- HTMLParagraphElement,
- React.HTMLAttributes<HTMLParagraphElement>
->(({ className, ...props }, ref) => {
+function FormDescription({ className, ...props }: React.ComponentProps<"p">) {
const { formDescriptionId } = useFormField();
return (
<p
- ref={ref}
+ className={cn("text-muted-foreground text-sm", className)}
+ data-slot="form-description"
id={formDescriptionId}
- className={cn("text-[0.8rem] text-muted-foreground", className)}
{...props}
/>
);
-});
-FormDescription.displayName = "FormDescription";
+}
-const FormMessage = React.forwardRef<
- HTMLParagraphElement,
- React.HTMLAttributes<HTMLParagraphElement>
->(({ className, children, ...props }, ref) => {
+function FormMessage({ className, children, ...props }: React.ComponentProps<"p">) {
const { error, formMessageId } = useFormField();
- const body = error ? String(error?.message) : children;
+ const body = error ? String(error?.message ?? "") : children;
if (!body) {
return null;
@@ -154,24 +137,23 @@ const FormMessage = React.forwardRef<
return (
<p
- ref={ref}
+ className={cn("font-medium text-destructive text-sm", className)}
+ data-slot="form-message"
id={formMessageId}
- className={cn("text-[0.8rem] font-medium text-destructive", className)}
{...props}
>
{body}
</p>
);
-});
-FormMessage.displayName = "FormMessage";
+}
export {
- useFormField,
Form,
- FormItem,
- FormLabel,
FormControl,
FormDescription,
- FormMessage,
FormField,
+ FormItem,
+ FormLabel,
+ FormMessage,
+ useFormField,
};
diff --git a/apps/web/src/components/ui/frame.tsx b/apps/web/src/components/ui/frame.tsx
new file mode 100644
index 000000000..ee9e2e023
--- /dev/null
+++ b/apps/web/src/components/ui/frame.tsx
@@ -0,0 +1,82 @@
+import type * as React from "react";
+
+import { cn } from "@/lib/cn";
+
+function Frame({ className, ...props }: React.ComponentProps<"div">) {
+ return (
+ <div
+ className={cn(
+ "relative flex flex-col rounded-2xl bg-muted/72 p-1",
+ "*:[[data-slot=frame-panel]+[data-slot=frame-panel]]:mt-1",
+ className,
+ )}
+ data-slot="frame"
+ {...props}
+ />
+ );
+}
+
+function FramePanel({ className, ...props }: React.ComponentProps<"div">) {
+ return (
+ <div
+ className={cn(
+ "relative rounded-xl border bg-background bg-clip-padding p-5 shadow-xs/5 before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-xl)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ className,
+ )}
+ data-slot="frame-panel"
+ {...props}
+ />
+ );
+}
+
+function FrameHeader({ className, ...props }: React.ComponentProps<"header">) {
+ return (
+ <header
+ className={cn("flex flex-col px-5 py-4", className)}
+ data-slot="frame-panel-header"
+ {...props}
+ />
+ );
+}
+
+function FrameTitle({ className, ...props }: React.ComponentProps<"div">) {
+ return (
+ <div
+ className={cn("font-semibold text-sm", className)}
+ data-slot="frame-panel-title"
+ {...props}
+ />
+ );
+}
+
+function FrameDescription({
+ className,
+ ...props
+}: React.ComponentProps<"div">) {
+ return (
+ <div
+ className={cn("text-muted-foreground text-sm", className)}
+ data-slot="frame-panel-description"
+ {...props}
+ />
+ );
+}
+
+function FrameFooter({ className, ...props }: React.ComponentProps<"footer">) {
+ return (
+ <footer
+ className={cn("px-5 py-4", className)}
+ data-slot="frame-panel-footer"
+ {...props}
+ />
+ );
+}
+
+export {
+ Frame,
+ FramePanel,
+ FrameHeader,
+ FrameTitle,
+ FrameDescription,
+ FrameFooter,
+};
diff --git a/apps/web/src/components/ui/group.tsx b/apps/web/src/components/ui/group.tsx
new file mode 100644
index 000000000..96961d359
--- /dev/null
+++ b/apps/web/src/components/ui/group.tsx
@@ -0,0 +1,97 @@
+"use client";
+
+import { mergeProps } from "@base-ui/react/merge-props";
+import { useRender } from "@base-ui/react/use-render";
+import { cva, type VariantProps } from "class-variance-authority";
+import type * as React from "react";
+
+import { cn } from "@/lib/cn";
+import { Separator } from "@/components/ui/separator";
+
+const groupVariants = cva(
+ "flex w-fit *:focus-visible:z-1 has-[>[data-slot=group]]:gap-2 *:has-focus-visible:z-1 dark:*:[[data-slot=button]:hover~[data-slot=separator]:not([data-slot]:hover~[data-slot=separator]~[data-slot=separator]),[data-slot][data-pressed]~[data-slot=separator]:not([data-slot][data-pressed]~[data-slot=separator]~[data-slot=separator])]:before:bg-input/64 dark:*:[[data-slot=separator]:has(~[data-slot=button]:hover):not(:has(~[data-slot=separator]~[data-slot]:hover)),[data-slot=separator]:has(~[data-slot][data-pressed]):not(:has(~[data-slot=separator]~[data-slot][data-pressed]))]:before:bg-input/64",
+ {
+ defaultVariants: {
+ orientation: "horizontal",
+ },
+ variants: {
+ orientation: {
+ horizontal:
+ "*:[[data-slot]~[data-slot]:not([data-slot=separator])]:before:-start-[0.5px] *:data-slot:not-data-[slot=separator]:has-[~[data-slot]]:before:-end-[0.5px] *:pointer-coarse:after:min-w-auto *:data-slot:has-[~[data-slot]]:rounded-e-none *:data-slot:has-[~[data-slot]]:border-e-0 *:data-slot:has-[~[data-slot]]:before:rounded-e-none *:[[data-slot]~[data-slot]]:rounded-s-none *:[[data-slot]~[data-slot]]:border-s-0 *:[[data-slot]~[data-slot]]:before:rounded-s-none",
+ vertical:
+ "*:[[data-slot]~[data-slot]:not([data-slot=separator])]:before:-top-[0.5px] *:data-slot:not-data-[slot=separator]:has-[~[data-slot]]:before:-bottom-[0.5px] flex-col *:pointer-coarse:after:min-h-auto *:data-slot:has-[~[data-slot]]:rounded-b-none *:data-slot:has-[~[data-slot]]:border-b-0 *:data-slot:not-data-[slot=separator]:has-[~[data-slot]]:before:hidden *:data-slot:has-[~[data-slot]]:before:rounded-b-none dark:*:last:before:hidden dark:*:first:before:block *:[[data-slot]~[data-slot]]:rounded-t-none *:[[data-slot]~[data-slot]]:border-t-0 *:[[data-slot]~[data-slot]]:before:rounded-t-none",
+ },
+ },
+ },
+);
+
+function Group({
+ className,
+ orientation,
+ children,
+ ...props
+}: {
+ className?: string;
+ orientation?: VariantProps<typeof groupVariants>["orientation"];
+ children: React.ReactNode;
+} & React.ComponentProps<"div">) {
+ return (
+ <div
+ className={cn(groupVariants({ orientation }), className)}
+ data-orientation={orientation}
+ data-slot="group"
+ role="group"
+ {...props}
+ >
+ {children}
+ </div>
+ );
+}
+
+function GroupText({
+ className,
+ render,
+ ...props
+}: useRender.ComponentProps<"div">) {
+ const defaultProps = {
+ className: cn(
+ "relative inline-flex items-center whitespace-nowrap gap-2 rounded-lg border border-input bg-muted not-dark:bg-clip-padding px-[calc(--spacing(3)-1px)] text-muted-foreground text-base sm:text-sm shadow-xs/5 outline-none transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] before:shadow-[0_1px_--theme(--color-black/6%)] dark:bg-input/64 dark:before:shadow-[0_-1px_--theme(--color-white/6%)] [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:shrink-0 [&_svg]:-mx-0.5",
+ className,
+ ),
+ "data-slot": "group-text",
+ };
+ return useRender({
+ defaultTagName: "div",
+ props: mergeProps(defaultProps, props),
+ render,
+ });
+}
+
+function GroupSeparator({
+ className,
+ orientation = "vertical",
+ ...props
+}: {
+ className?: string;
+} & React.ComponentProps<typeof Separator>) {
+ return (
+ <Separator
+ className={cn(
+ "[[data-slot=input-control]:focus-within+&,[data-slot=input-group]:focus-within+&,[data-slot=select-trigger]:focus-visible+*+&,[data-slot=number-field]:focus-within+input+&]:-translate-x-px pointer-events-none relative z-2 bg-input before:absolute before:inset-0 has-[+[data-slot=input-control]:focus-within,+[data-slot=input-group]:focus-within,+[data-slot=select-trigger]:focus-visible+*,+[data-slot=number-field]:focus-within]:translate-x-px has-[+[data-slot=input-control]:focus-within,+[data-slot=input-group]:focus-within,+[data-slot=select-trigger]:focus-visible+*,+[data-slot=number-field]:focus-within]:bg-ring dark:before:bg-input/32 [[data-slot=input-control]:focus-within+&,[data-slot=input-group]:focus-within+&,[data-slot=select-trigger]:focus-visible+*+&,[data-slot=number-field]:focus-within+&,[data-slot=number-field]:focus-within+input+&]:bg-ring",
+ className,
+ )}
+ orientation={orientation}
+ {...props}
+ />
+ );
+}
+
+export {
+ Group,
+ Group as ButtonGroup,
+ GroupText,
+ GroupText as ButtonGroupText,
+ GroupSeparator,
+ GroupSeparator as ButtonGroupSeparator,
+ groupVariants,
+};
diff --git a/apps/web/src/components/ui/hover-card.tsx b/apps/web/src/components/ui/hover-card.tsx
deleted file mode 100644
index 9600dbd09..000000000
--- a/apps/web/src/components/ui/hover-card.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import * as HoverCardPrimitive from "@radix-ui/react-hover-card";
-import * as React from "react";
-
-import { cn } from "@/lib/cn";
-
-const HoverCard = HoverCardPrimitive.Root;
-
-const HoverCardTrigger = HoverCardPrimitive.Trigger;
-
-const HoverCardContent = React.forwardRef<
- React.ElementRef<typeof HoverCardPrimitive.Content>,
- React.ComponentPropsWithoutRef<typeof HoverCardPrimitive.Content>
->(({ className, align = "center", sideOffset = 4, ...props }, ref) => (
- <HoverCardPrimitive.Content
- ref={ref}
- align={align}
- sideOffset={sideOffset}
- className={cn(
- "z-50 w-64 rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-[--radix-hover-card-content-transform-origin]",
- className,
- )}
- {...props}
- />
-));
-HoverCardContent.displayName = HoverCardPrimitive.Content.displayName;
-
-export { HoverCard, HoverCardTrigger, HoverCardContent };
diff --git a/apps/web/src/components/ui/input-group.tsx b/apps/web/src/components/ui/input-group.tsx
new file mode 100644
index 000000000..c40afaa36
--- /dev/null
+++ b/apps/web/src/components/ui/input-group.tsx
@@ -0,0 +1,101 @@
+"use client";
+
+import { cva, type VariantProps } from "class-variance-authority";
+import type * as React from "react";
+
+import { cn } from "@/lib/cn";
+import { Input, type InputProps } from "@/components/ui/input";
+import { Textarea, type TextareaProps } from "@/components/ui/textarea";
+
+function InputGroup({ className, ...props }: React.ComponentProps<"div">) {
+ return (
+ <div
+ className={cn(
+ "relative inline-flex w-full min-w-0 items-center rounded-lg border border-input bg-background not-dark:bg-clip-padding text-base text-foreground shadow-xs/5 ring-ring/24 transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] not-has-[input:disabled,textarea:disabled]:not-has-[input:focus-visible,textarea:focus-visible]:not-has-[input[aria-invalid],textarea[aria-invalid]]:before:shadow-[0_1px_--theme(--color-black/4%)] has-[input:focus-visible,textarea:focus-visible]:has-[input[aria-invalid],textarea[aria-invalid]]:border-destructive/64 has-[input:focus-visible,textarea:focus-visible]:has-[input[aria-invalid],textarea[aria-invalid]]:ring-destructive/16 has-[textarea]:h-auto has-data-[align=block-end]:h-auto has-data-[align=block-start]:h-auto has-data-[align=block-end]:flex-col has-data-[align=block-start]:flex-col has-[input:focus-visible,textarea:focus-visible]:border-ring has-[input[aria-invalid],textarea[aria-invalid]]:border-destructive/36 has-autofill:bg-foreground/4 has-[input:disabled,textarea:disabled]:opacity-64 has-[input:disabled,textarea:disabled,input:focus-visible,textarea:focus-visible,input[aria-invalid],textarea[aria-invalid]]:shadow-none has-[input:focus-visible,textarea:focus-visible]:ring-[3px] sm:text-sm dark:bg-input/32 dark:has-autofill:bg-foreground/8 dark:has-[input[aria-invalid],textarea[aria-invalid]]:ring-destructive/24 dark:not-has-[input:disabled,textarea:disabled]:not-has-[input:focus-visible,textarea:focus-visible]:not-has-[input[aria-invalid],textarea[aria-invalid]]:before:shadow-[0_-1px_--theme(--color-white/6%)] has-data-[align=inline-start]:**:[[data-size=sm]_input]:ps-1.5 has-data-[align=inline-end]:**:[[data-size=sm]_input]:pe-1.5 *:[[data-slot=input-control],[data-slot=textarea-control]]:contents *:[[data-slot=input-control],[data-slot=textarea-control]]:before:hidden has-[[data-align=block-start],[data-align=block-end]]:**:[input]:h-auto has-data-[align=inline-start]:**:[input]:ps-2 has-data-[align=inline-end]:**:[input]:pe-2 has-data-[align=block-end]:**:[input]:pt-1.5 has-data-[align=block-start]:**:[input]:pb-1.5 **:[textarea]:min-h-20.5 **:[textarea]:resize-none **:[textarea]:py-[calc(--spacing(3)-1px)] **:[textarea]:max-sm:min-h-23.5 **:[textarea_button]:rounded-[calc(var(--radius-md)-1px)]",
+ className,
+ )}
+ data-slot="input-group"
+ role="group"
+ {...props}
+ />
+ );
+}
+
+const inputGroupAddonVariants = cva(
+ "[&_svg]:-mx-0.5 flex h-auto cursor-text select-none items-center justify-center gap-2 leading-none [&>kbd]:rounded-[calc(var(--radius)-5px)] in-[[data-slot=input-group]:has([data-slot=input-control],[data-slot=textarea-control])]:[&_svg:not([class*='size-'])]:size-4.5 sm:in-[[data-slot=input-group]:has([data-slot=input-control],[data-slot=textarea-control])]:[&_svg:not([class*='size-'])]:size-4 not-has-[button]:**:[svg:not([class*='opacity-'])]:opacity-80",
+ {
+ defaultVariants: {
+ align: "inline-start",
+ },
+ variants: {
+ align: {
+ "block-end":
+ "order-last w-full justify-start px-[calc(--spacing(3)-1px)] pb-[calc(--spacing(3)-1px)] [.border-t]:pt-[calc(--spacing(3)-1px)] [[data-size=sm]+&]:px-[calc(--spacing(2.5)-1px)]",
+ "block-start":
+ "order-first w-full justify-start px-[calc(--spacing(3)-1px)] pt-[calc(--spacing(3)-1px)] [.border-b]:pb-[calc(--spacing(3)-1px)] [[data-size=sm]+&]:px-[calc(--spacing(2.5)-1px)]",
+ "inline-end":
+ "has-[>:last-child[data-slot=badge]]:-me-1.5 has-[>button]:-me-2 order-last pe-[calc(--spacing(3)-1px)] has-[>kbd:last-child]:me-[-0.35rem] [[data-size=sm]+&]:pe-[calc(--spacing(2.5)-1px)]",
+ "inline-start":
+ "has-[>:last-child[data-slot=badge]]:-ms-1.5 has-[>button]:-ms-2 order-first ps-[calc(--spacing(3)-1px)] has-[>kbd:last-child]:ms-[-0.35rem] [[data-size=sm]+&]:ps-[calc(--spacing(2.5)-1px)]",
+ },
+ },
+ },
+);
+
+function InputGroupAddon({
+ className,
+ align = "inline-start",
+ ...props
+}: React.ComponentProps<"div"> & VariantProps<typeof inputGroupAddonVariants>) {
+ return (
+ <div
+ className={cn(inputGroupAddonVariants({ align }), className)}
+ data-align={align}
+ data-slot="input-group-addon"
+ onMouseDown={(e) => {
+ const target = e.target as HTMLElement;
+ const isInteractive = target.closest(
+ "button, a, input, select, textarea, [role='button'], [role='combobox'], [role='listbox'], [data-slot='select-trigger']",
+ );
+ if (isInteractive) return;
+ e.preventDefault();
+ const parent = e.currentTarget.parentElement;
+ const input = parent?.querySelector<
+ HTMLInputElement | HTMLTextAreaElement
+ >("input, textarea");
+ if (input && !parent?.querySelector("input:focus, textarea:focus")) {
+ input.focus();
+ }
+ }}
+ {...props}
+ />
+ );
+}
+
+function InputGroupText({ className, ...props }: React.ComponentProps<"span">) {
+ return (
+ <span
+ className={cn(
+ "[&_svg]:-mx-0.5 line-clamp-1 flex items-center gap-2 text-muted-foreground leading-none in-[[data-slot=input-group]:has([data-slot=input-control],[data-slot=textarea-control])]:[&_svg:not([class*='size-'])]:size-4.5 sm:in-[[data-slot=input-group]:has([data-slot=input-control],[data-slot=textarea-control])]:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none",
+ className,
+ )}
+ {...props}
+ />
+ );
+}
+
+function InputGroupInput({ className, ...props }: InputProps) {
+ return <Input className={className} unstyled {...props} />;
+}
+
+function InputGroupTextarea({ className, ...props }: TextareaProps) {
+ return <Textarea className={className} unstyled {...props} />;
+}
+
+export {
+ InputGroup,
+ InputGroupAddon,
+ InputGroupText,
+ InputGroupInput,
+ InputGroupTextarea,
+};
diff --git a/apps/web/src/components/ui/input.tsx b/apps/web/src/components/ui/input.tsx
index 017ee4f0b..ea54255be 100644
--- a/apps/web/src/components/ui/input.tsx
+++ b/apps/web/src/components/ui/input.tsx
@@ -1,21 +1,66 @@
+"use client";
+
+import { Input as InputPrimitive } from "@base-ui/react/input";
import type * as React from "react";
import { cn } from "@/lib/cn";
-function Input({ className, type, ...props }: React.ComponentProps<"input">) {
+type InputProps = Omit<
+ InputPrimitive.Props & React.RefAttributes<HTMLInputElement>,
+ "size"
+> & {
+ size?: "sm" | "default" | "lg" | number;
+ unstyled?: boolean;
+ nativeInput?: boolean;
+};
+
+function Input({
+ className,
+ size = "default",
+ unstyled = false,
+ nativeInput = false,
+ ...props
+}: InputProps) {
+ const inputClassName = cn(
+ "h-8.5 w-full min-w-0 rounded-[inherit] px-[calc(--spacing(3)-1px)] leading-8.5 outline-none placeholder:text-muted-foreground/72 sm:h-7.5 sm:leading-7.5 [transition:background-color_5000000s_ease-in-out_0s]",
+ size === "sm" &&
+ "h-7.5 px-[calc(--spacing(2.5)-1px)] leading-7.5 sm:h-6.5 sm:leading-6.5",
+ size === "lg" && "h-9.5 leading-9.5 sm:h-8.5 sm:leading-8.5",
+ props.type === "search" &&
+ "[&::-webkit-search-cancel-button]:appearance-none [&::-webkit-search-decoration]:appearance-none [&::-webkit-search-results-button]:appearance-none [&::-webkit-search-results-decoration]:appearance-none",
+ props.type === "file" &&
+ "text-muted-foreground file:me-3 file:bg-transparent file:font-medium file:text-foreground file:text-sm",
+ );
+
return (
- <input
- type={type}
- data-slot="input"
- className={cn(
- "file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input flex h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
- "focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]",
- "aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
- className,
+ <span
+ className={
+ cn(
+ !unstyled &&
+ "relative inline-flex w-full rounded-lg border border-input bg-background not-dark:bg-clip-padding text-base text-foreground shadow-xs/5 ring-ring/24 transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] not-has-disabled:not-has-focus-visible:not-has-aria-invalid:before:shadow-[0_1px_--theme(--color-black/4%)] has-focus-visible:has-aria-invalid:border-destructive/64 has-focus-visible:has-aria-invalid:ring-destructive/16 has-aria-invalid:border-destructive/36 has-focus-visible:border-ring has-autofill:bg-foreground/4 has-disabled:opacity-64 has-[:disabled,:focus-visible,[aria-invalid]]:shadow-none has-focus-visible:ring-[3px] sm:text-sm dark:bg-input/32 dark:has-autofill:bg-foreground/8 dark:has-aria-invalid:ring-destructive/24 dark:not-has-disabled:not-has-focus-visible:not-has-aria-invalid:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ className,
+ ) || undefined
+ }
+ data-size={size}
+ data-slot="input-control"
+ >
+ {nativeInput ? (
+ <input
+ className={inputClassName}
+ data-slot="input"
+ size={typeof size === "number" ? size : undefined}
+ {...props}
+ />
+ ) : (
+ <InputPrimitive
+ className={inputClassName}
+ data-slot="input"
+ size={typeof size === "number" ? size : undefined}
+ {...props}
+ />
)}
- {...props}
- />
+ </span>
);
}
-export { Input };
+export { Input, type InputProps };
diff --git a/apps/web/src/components/ui/kbd.tsx b/apps/web/src/components/ui/kbd.tsx
index ceb031a02..cf103c9ef 100644
--- a/apps/web/src/components/ui/kbd.tsx
+++ b/apps/web/src/components/ui/kbd.tsx
@@ -1,73 +1,46 @@
-import { cn } from "@/lib/cn";
+import type * as React from "react";
-type KbdProps = {
- children: React.ReactNode;
- className?: string;
- description?: string;
- hideDescription?: boolean;
-};
+import { cn } from "@/lib/cn";
-export function Kbd({
- children,
- className,
- description,
- hideDescription = false,
-}: KbdProps) {
+function Kbd({ className, ...props }: React.ComponentProps<"kbd">) {
return (
- <span className="flex items-center gap-1">
- {description && !hideDescription && (
- <span className="text-[10px] text-white">{description}</span>
+ <kbd
+ className={cn(
+ "pointer-events-none inline-flex h-5 min-w-5 select-none items-center justify-center gap-1 rounded bg-muted px-1 font-medium font-sans text-muted-foreground text-xs [&_svg:not([class*='size-'])]:size-3",
+ className,
)}
- <kbd
- className={cn(
- "pointer-events-none inline-flex h-4 select-none items-center gap-0.5 rounded border bg-muted px-1 font-mono text-[9px] font-medium text-muted-foreground opacity-100",
- className,
- )}
- >
- {children}
- </kbd>
- </span>
+ data-slot="kbd"
+ {...props}
+ />
);
}
-type KbdSequenceProps = {
- keys: string[];
- separator?: string;
- className?: string;
- description?: string;
-};
+function KbdGroup({ className, ...props }: React.ComponentProps<"kbd">) {
+ return (
+ <kbd
+ className={cn("inline-flex items-center gap-1", className)}
+ data-slot="kbd-group"
+ {...props}
+ />
+ );
+}
-export function KbdSequence({
+function KbdSequence({
keys,
- separator = "then",
className,
description,
-}: KbdSequenceProps) {
- const keyElements = keys.map((key, index) => ({
- key: key,
- position: index,
- id: `${key}-pos${index}-${Math.random().toString(36).substr(2, 9)}`,
- }));
-
+}: {
+ keys: string[];
+ className?: string;
+ description?: string;
+}) {
return (
- <span className={cn("flex items-center gap-1", className)}>
- {description && (
- <span className="text-[10px] text-popover-foreground">
- {description}
- </span>
- )}
- <span className="flex items-center gap-0.5">
- {keyElements.map((item) => (
- <span key={item.id} className="flex items-center gap-0.5">
- {item.position > 0 && (
- <span className="text-[9px] text-muted-foreground/60">
- {separator}
- </span>
- )}
- <Kbd hideDescription>{item.key}</Kbd>
- </span>
- ))}
- </span>
- </span>
+ <KbdGroup aria-label={description} className={className}>
+ {keys.map((key) => (
+ <Kbd key={key}>{key}</Kbd>
+ ))}
+ </KbdGroup>
);
}
+
+export { Kbd, KbdGroup, KbdSequence };
diff --git a/apps/web/src/components/ui/label.tsx b/apps/web/src/components/ui/label.tsx
index edf2e2765..cd5c13623 100644
--- a/apps/web/src/components/ui/label.tsx
+++ b/apps/web/src/components/ui/label.tsx
@@ -1,24 +1,28 @@
-import * as LabelPrimitive from "@radix-ui/react-label";
-import { cva, type VariantProps } from "class-variance-authority";
-import * as React from "react";
+"use client";
+
+import { mergeProps } from "@base-ui/react/merge-props";
+import { useRender } from "@base-ui/react/use-render";
import { cn } from "@/lib/cn";
-const labelVariants = cva(
- "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70",
-);
+function Label({
+ className,
+ render,
+ ...props
+}: useRender.ComponentProps<"label">) {
+ const defaultProps = {
+ className: cn(
+ "inline-flex items-center gap-2 text-base/4.5 sm:text-sm/4 font-medium text-foreground",
+ className,
+ ),
+ "data-slot": "label",
+ };
-const Label = React.forwardRef<
- React.ElementRef<typeof LabelPrimitive.Root>,
- React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root> &
- VariantProps<typeof labelVariants>
->(({ className, ...props }, ref) => (
- <LabelPrimitive.Root
- ref={ref}
- className={cn(labelVariants(), className)}
- {...props}
- />
-));
-Label.displayName = LabelPrimitive.Root.displayName;
+ return useRender({
+ defaultTagName: "label",
+ props: mergeProps<"label">(defaultProps, props),
+ render,
+ });
+}
export { Label };
diff --git a/apps/web/src/components/ui/loading-skeleton.tsx b/apps/web/src/components/ui/loading-skeleton.tsx
index 41945918a..f6a84b2c2 100644
--- a/apps/web/src/components/ui/loading-skeleton.tsx
+++ b/apps/web/src/components/ui/loading-skeleton.tsx
@@ -10,9 +10,9 @@ export function LoadingSkeleton({ className }: LoadingSkeletonProps) {
<div className="w-64 bg-sidebar border-r border-border flex flex-col">
<div className="p-3 border-b border-border">
<div className="flex items-center gap-2">
- <div className="w-8 h-8 bg-zinc-200 dark:bg-zinc-800 rounded animate-pulse" />
+ <div className="w-8 h-8 bg-muted rounded animate-pulse" />
<div className="flex-1">
- <div className="w-20 h-4 bg-zinc-200 dark:bg-zinc-800 rounded animate-pulse" />
+ <div className="w-20 h-4 bg-muted rounded animate-pulse" />
</div>
</div>
</div>
@@ -20,9 +20,9 @@ export function LoadingSkeleton({ className }: LoadingSkeletonProps) {
<div className="flex-1 p-3 space-y-6">
<div className="space-y-2">
<div className="flex items-center gap-2">
- <div className="w-6 h-6 bg-zinc-200 dark:bg-zinc-800 rounded-full animate-pulse" />
+ <div className="w-6 h-6 bg-muted rounded-full animate-pulse" />
<div className="flex-1">
- <div className="w-16 h-3 bg-zinc-200 dark:bg-zinc-800 rounded animate-pulse" />
+ <div className="w-16 h-3 bg-muted rounded animate-pulse" />
</div>
</div>
</div>
@@ -33,16 +33,16 @@ export function LoadingSkeleton({ className }: LoadingSkeletonProps) {
key={`nav-item-${item}`}
className="flex items-center gap-2 p-2 rounded"
>
- <div className="w-4 h-4 bg-zinc-200 dark:bg-zinc-800 rounded animate-pulse" />
- <div className="w-20 h-3 bg-zinc-200 dark:bg-zinc-800 rounded animate-pulse" />
+ <div className="w-4 h-4 bg-muted rounded animate-pulse" />
+ <div className="w-20 h-3 bg-muted rounded animate-pulse" />
</div>
))}
</div>
<div className="space-y-2">
<div className="flex items-center gap-2">
- <div className="w-3 h-3 bg-zinc-200 dark:bg-zinc-800 rounded animate-pulse" />
- <div className="w-16 h-3 bg-zinc-200 dark:bg-zinc-800 rounded animate-pulse" />
+ <div className="w-3 h-3 bg-muted rounded animate-pulse" />
+ <div className="w-16 h-3 bg-muted rounded animate-pulse" />
</div>
<div className="ml-4 space-y-1">
{["issues", "projects", "views", "settings"].map((item) => (
@@ -50,8 +50,8 @@ export function LoadingSkeleton({ className }: LoadingSkeletonProps) {
key={`workspace-item-${item}`}
className="flex items-center gap-2 p-1"
>
- <div className="w-4 h-4 bg-zinc-200 dark:bg-zinc-800 rounded animate-pulse" />
- <div className="w-16 h-3 bg-zinc-200 dark:bg-zinc-800 rounded animate-pulse" />
+ <div className="w-4 h-4 bg-muted rounded animate-pulse" />
+ <div className="w-16 h-3 bg-muted rounded animate-pulse" />
</div>
))}
</div>
@@ -60,9 +60,9 @@ export function LoadingSkeleton({ className }: LoadingSkeletonProps) {
<div className="p-3 border-t border-border">
<div className="flex items-center gap-2">
- <div className="w-6 h-6 bg-zinc-200 dark:bg-zinc-800 rounded-full animate-pulse" />
+ <div className="w-6 h-6 bg-muted rounded-full animate-pulse" />
<div className="flex-1">
- <div className="w-20 h-3 bg-zinc-200 dark:bg-zinc-800 rounded animate-pulse" />
+ <div className="w-20 h-3 bg-muted rounded animate-pulse" />
</div>
</div>
</div>
@@ -71,17 +71,17 @@ export function LoadingSkeleton({ className }: LoadingSkeletonProps) {
<div className="flex-1 flex flex-col bg-card border border-border rounded-md m-2">
<div className="h-12 border-b border-border flex items-center px-4">
<div className="flex items-center gap-2">
- <div className="w-6 h-6 bg-zinc-200 dark:bg-zinc-800 rounded animate-pulse" />
- <div className="w-32 h-4 bg-zinc-200 dark:bg-zinc-800 rounded animate-pulse" />
+ <div className="w-6 h-6 bg-muted rounded animate-pulse" />
+ <div className="w-32 h-4 bg-muted rounded animate-pulse" />
</div>
</div>
<div className="flex-1 flex items-center justify-center">
<div className="text-center space-y-4">
- <div className="w-16 h-16 bg-zinc-200 dark:bg-zinc-800 rounded-lg animate-pulse mx-auto" />
+ <div className="w-16 h-16 bg-muted rounded-lg animate-pulse mx-auto" />
<div className="space-y-2">
- <div className="w-48 h-4 bg-zinc-200 dark:bg-zinc-800 rounded animate-pulse mx-auto" />
- <div className="w-64 h-3 bg-zinc-200 dark:bg-zinc-800 rounded animate-pulse mx-auto" />
+ <div className="w-48 h-4 bg-muted rounded animate-pulse mx-auto" />
+ <div className="w-64 h-3 bg-muted rounded animate-pulse mx-auto" />
</div>
</div>
</div>
diff --git a/apps/web/src/components/ui/menu.tsx b/apps/web/src/components/ui/menu.tsx
new file mode 100644
index 000000000..cdba868e7
--- /dev/null
+++ b/apps/web/src/components/ui/menu.tsx
@@ -0,0 +1,326 @@
+"use client";
+
+import { Menu as MenuPrimitive } from "@base-ui/react/menu";
+import { ChevronRightIcon } from "lucide-react";
+import type * as React from "react";
+
+import { cn } from "@/lib/cn";
+
+const MenuCreateHandle = MenuPrimitive.createHandle;
+
+const Menu = MenuPrimitive.Root;
+
+const MenuPortal = MenuPrimitive.Portal;
+
+function MenuTrigger({
+ className,
+ children,
+ ...props
+}: MenuPrimitive.Trigger.Props) {
+ return (
+ <MenuPrimitive.Trigger
+ className={className}
+ data-slot="menu-trigger"
+ {...props}
+ >
+ {children}
+ </MenuPrimitive.Trigger>
+ );
+}
+
+function MenuPopup({
+ children,
+ className,
+ sideOffset = 4,
+ align = "center",
+ alignOffset,
+ side = "bottom",
+ anchor,
+ ...props
+}: MenuPrimitive.Popup.Props & {
+ align?: MenuPrimitive.Positioner.Props["align"];
+ sideOffset?: MenuPrimitive.Positioner.Props["sideOffset"];
+ alignOffset?: MenuPrimitive.Positioner.Props["alignOffset"];
+ side?: MenuPrimitive.Positioner.Props["side"];
+ anchor?: MenuPrimitive.Positioner.Props["anchor"];
+}) {
+ return (
+ <MenuPrimitive.Portal>
+ <MenuPrimitive.Positioner
+ align={align}
+ alignOffset={alignOffset}
+ anchor={anchor}
+ className="z-50"
+ data-slot="menu-positioner"
+ side={side}
+ sideOffset={sideOffset}
+ >
+ <MenuPrimitive.Popup
+ className={cn(
+ "relative flex not-[class*='w-']:min-w-32 origin-(--transform-origin) rounded-lg border bg-popover not-dark:bg-clip-padding shadow-lg/5 outline-none before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] focus:outline-none dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ className,
+ )}
+ data-slot="menu-popup"
+ {...props}
+ >
+ <div className="max-h-(--available-height) w-full overflow-y-auto p-1">
+ {children}
+ </div>
+ </MenuPrimitive.Popup>
+ </MenuPrimitive.Positioner>
+ </MenuPrimitive.Portal>
+ );
+}
+
+function MenuGroup(props: MenuPrimitive.Group.Props) {
+ return <MenuPrimitive.Group data-slot="menu-group" {...props} />;
+}
+
+function MenuItem({
+ className,
+ inset,
+ variant = "default",
+ ...props
+}: MenuPrimitive.Item.Props & {
+ inset?: boolean;
+ variant?: "default" | "destructive";
+}) {
+ return (
+ <MenuPrimitive.Item
+ className={cn(
+ "[&>svg]:-mx-0.5 flex min-h-8 cursor-default select-none items-center gap-2 rounded-sm px-2 py-1 text-base text-foreground outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-inset:ps-8 data-[variant=destructive]:text-destructive-foreground data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&>svg:not([class*='opacity-'])]:opacity-80 [&>svg:not([class*='size-'])]:size-4.5 sm:[&>svg:not([class*='size-'])]:size-4 [&>svg]:pointer-events-none [&>svg]:shrink-0",
+ className,
+ )}
+ data-inset={inset}
+ data-slot="menu-item"
+ data-variant={variant}
+ {...props}
+ />
+ );
+}
+
+function MenuCheckboxItem({
+ className,
+ children,
+ checked,
+ variant = "default",
+ ...props
+}: MenuPrimitive.CheckboxItem.Props & {
+ variant?: "default" | "switch";
+}) {
+ return (
+ <MenuPrimitive.CheckboxItem
+ checked={checked}
+ className={cn(
+ "grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default items-center gap-2 rounded-sm py-1 ps-2 text-base text-foreground outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ variant === "switch"
+ ? "grid-cols-[1fr_auto] gap-4 pe-1.5"
+ : "grid-cols-[1rem_1fr] pe-4",
+ className,
+ )}
+ data-slot="menu-checkbox-item"
+ {...props}
+ >
+ {variant === "switch" ? (
+ <>
+ <span className="col-start-1">{children}</span>
+ <MenuPrimitive.CheckboxItemIndicator
+ className="inset-shadow-[0_1px_--theme(--color-black/4%)] inline-flex h-[calc(var(--thumb-size)+2px)] w-[calc(var(--thumb-size)*2-2px)] shrink-0 items-center rounded-full p-px outline-none transition-[background-color,box-shadow] duration-200 [--thumb-size:--spacing(4)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-checked:bg-primary data-unchecked:bg-input data-disabled:opacity-64 sm:[--thumb-size:--spacing(3)]"
+ keepMounted
+ >
+ <span className="pointer-events-none block aspect-square h-full in-[[data-slot=menu-checkbox-item][data-checked]]:origin-[var(--thumb-size)_50%] origin-left in-[[data-slot=menu-checkbox-item][data-checked]]:translate-x-[calc(var(--thumb-size)-4px)] in-[[data-slot=menu-checkbox-item]:active]:not-data-disabled:scale-x-110 in-[[data-slot=menu-checkbox-item]:active]:rounded-[var(--thumb-size)/calc(var(--thumb-size)*1.10)] rounded-(--thumb-size) bg-background shadow-sm/5 will-change-transform [transition:translate_.15s,border-radius_.15s,scale_.1s_.1s,transform-origin_.15s]" />
+ </MenuPrimitive.CheckboxItemIndicator>
+ </>
+ ) : (
+ <>
+ <MenuPrimitive.CheckboxItemIndicator className="col-start-1">
+ <svg
+ fill="none"
+ height="24"
+ stroke="currentColor"
+ strokeLinecap="round"
+ strokeLinejoin="round"
+ strokeWidth="2"
+ viewBox="0 0 24 24"
+ width="24"
+ xmlns="http://www.w3.org/2000/svg"
+ >
+ <path d="M5.252 12.7 10.2 18.63 18.748 5.37" />
+ </svg>
+ </MenuPrimitive.CheckboxItemIndicator>
+ <span className="col-start-2">{children}</span>
+ </>
+ )}
+ </MenuPrimitive.CheckboxItem>
+ );
+}
+
+function MenuRadioGroup(props: MenuPrimitive.RadioGroup.Props) {
+ return <MenuPrimitive.RadioGroup data-slot="menu-radio-group" {...props} />;
+}
+
+function MenuRadioItem({
+ className,
+ children,
+ ...props
+}: MenuPrimitive.RadioItem.Props) {
+ return (
+ <MenuPrimitive.RadioItem
+ className={cn(
+ "grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default grid-cols-[1rem_1fr] items-center gap-2 rounded-sm py-1 ps-2 pe-4 text-base text-foreground outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ className,
+ )}
+ data-slot="menu-radio-item"
+ {...props}
+ >
+ <MenuPrimitive.RadioItemIndicator className="col-start-1">
+ <svg
+ fill="none"
+ height="24"
+ stroke="currentColor"
+ strokeLinecap="round"
+ strokeLinejoin="round"
+ strokeWidth="2"
+ viewBox="0 0 24 24"
+ width="24"
+ xmlns="http://www.w3.org/2000/svg"
+ >
+ <path d="M5.252 12.7 10.2 18.63 18.748 5.37" />
+ </svg>
+ </MenuPrimitive.RadioItemIndicator>
+ <span className="col-start-2">{children}</span>
+ </MenuPrimitive.RadioItem>
+ );
+}
+
+function MenuGroupLabel({
+ className,
+ inset,
+ ...props
+}: MenuPrimitive.GroupLabel.Props & {
+ inset?: boolean;
+}) {
+ return (
+ <MenuPrimitive.GroupLabel
+ className={cn(
+ "px-2 py-1.5 font-medium text-muted-foreground text-xs data-inset:ps-9 sm:data-inset:ps-8",
+ className,
+ )}
+ data-inset={inset}
+ data-slot="menu-label"
+ {...props}
+ />
+ );
+}
+
+function MenuSeparator({ className, ...props }: MenuPrimitive.Separator.Props) {
+ return (
+ <MenuPrimitive.Separator
+ className={cn("mx-2 my-1 h-px bg-border", className)}
+ data-slot="menu-separator"
+ {...props}
+ />
+ );
+}
+
+function MenuShortcut({ className, ...props }: React.ComponentProps<"kbd">) {
+ return (
+ <kbd
+ className={cn(
+ "ms-auto font-medium font-sans text-muted-foreground/72 text-xs tracking-widest",
+ className,
+ )}
+ data-slot="menu-shortcut"
+ {...props}
+ />
+ );
+}
+
+function MenuSub(props: MenuPrimitive.SubmenuRoot.Props) {
+ return <MenuPrimitive.SubmenuRoot data-slot="menu-sub" {...props} />;
+}
+
+function MenuSubTrigger({
+ className,
+ inset,
+ children,
+ ...props
+}: MenuPrimitive.SubmenuTrigger.Props & {
+ inset?: boolean;
+}) {
+ return (
+ <MenuPrimitive.SubmenuTrigger
+ className={cn(
+ "flex min-h-8 items-center gap-2 rounded-sm px-2 py-1 text-base text-foreground outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-popup-open:bg-accent data-inset:ps-8 data-highlighted:text-accent-foreground data-popup-open:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none",
+ className,
+ )}
+ data-inset={inset}
+ data-slot="menu-sub-trigger"
+ {...props}
+ >
+ {children}
+ <ChevronRightIcon className="-me-0.5 ms-auto opacity-80" />
+ </MenuPrimitive.SubmenuTrigger>
+ );
+}
+
+function MenuSubPopup({
+ className,
+ sideOffset = 0,
+ alignOffset,
+ align = "start",
+ ...props
+}: MenuPrimitive.Popup.Props & {
+ align?: MenuPrimitive.Positioner.Props["align"];
+ sideOffset?: MenuPrimitive.Positioner.Props["sideOffset"];
+ alignOffset?: MenuPrimitive.Positioner.Props["alignOffset"];
+}) {
+ const defaultAlignOffset = align !== "center" ? -5 : undefined;
+
+ return (
+ <MenuPopup
+ align={align}
+ alignOffset={alignOffset ?? defaultAlignOffset}
+ className={className}
+ data-slot="menu-sub-content"
+ side="inline-end"
+ sideOffset={sideOffset}
+ {...props}
+ />
+ );
+}
+
+export {
+ MenuCreateHandle,
+ MenuCreateHandle as DropdownMenuCreateHandle,
+ Menu,
+ Menu as DropdownMenu,
+ MenuPortal,
+ MenuPortal as DropdownMenuPortal,
+ MenuTrigger,
+ MenuTrigger as DropdownMenuTrigger,
+ MenuPopup,
+ MenuPopup as DropdownMenuContent,
+ MenuGroup,
+ MenuGroup as DropdownMenuGroup,
+ MenuItem,
+ MenuItem as DropdownMenuItem,
+ MenuCheckboxItem,
+ MenuCheckboxItem as DropdownMenuCheckboxItem,
+ MenuRadioGroup,
+ MenuRadioGroup as DropdownMenuRadioGroup,
+ MenuRadioItem,
+ MenuRadioItem as DropdownMenuRadioItem,
+ MenuGroupLabel,
+ MenuGroupLabel as DropdownMenuLabel,
+ MenuSeparator,
+ MenuSeparator as DropdownMenuSeparator,
+ MenuShortcut,
+ MenuShortcut as DropdownMenuShortcut,
+ MenuSub,
+ MenuSub as DropdownMenuSub,
+ MenuSubTrigger,
+ MenuSubTrigger as DropdownMenuSubTrigger,
+ MenuSubPopup,
+ MenuSubPopup as DropdownMenuSubContent,
+};
diff --git a/apps/web/src/components/ui/menubar.tsx b/apps/web/src/components/ui/menubar.tsx
index 153f9ff70..43d18ca51 100644
--- a/apps/web/src/components/ui/menubar.tsx
+++ b/apps/web/src/components/ui/menubar.tsx
@@ -1,238 +1,51 @@
-import * as MenubarPrimitive from "@radix-ui/react-menubar";
-import { Check, ChevronRight, Circle } from "lucide-react";
-import * as React from "react";
-
+"use client";
+
+import { Menubar as MenubarPrimitive } from "@base-ui/react/menubar";
+
+import {
+ Menu,
+ MenuCheckboxItem,
+ MenuGroup,
+ MenuGroupLabel,
+ MenuItem,
+ MenuPopup,
+ MenuPortal,
+ MenuRadioGroup,
+ MenuRadioItem,
+ MenuSeparator,
+ MenuShortcut,
+ MenuSub,
+ MenuSubPopup,
+ MenuSubTrigger,
+ MenuTrigger,
+} from "@/components/ui/menu";
import { cn } from "@/lib/cn";
-function MenubarMenu({
- ...props
-}: React.ComponentProps<typeof MenubarPrimitive.Menu>) {
- return <MenubarPrimitive.Menu {...props} />;
-}
-
-function MenubarGroup({
- ...props
-}: React.ComponentProps<typeof MenubarPrimitive.Group>) {
- return <MenubarPrimitive.Group {...props} />;
-}
-
-function MenubarPortal({
- ...props
-}: React.ComponentProps<typeof MenubarPrimitive.Portal>) {
- return <MenubarPrimitive.Portal {...props} />;
-}
-
-function MenubarRadioGroup({
- ...props
-}: React.ComponentProps<typeof MenubarPrimitive.RadioGroup>) {
- return <MenubarPrimitive.RadioGroup {...props} />;
-}
-
-function MenubarSub({
- ...props
-}: React.ComponentProps<typeof MenubarPrimitive.Sub>) {
- return <MenubarPrimitive.Sub data-slot="menubar-sub" {...props} />;
-}
-
-const Menubar = React.forwardRef<
- React.ElementRef<typeof MenubarPrimitive.Root>,
- React.ComponentPropsWithoutRef<typeof MenubarPrimitive.Root>
->(({ className, ...props }, ref) => (
- <MenubarPrimitive.Root
- ref={ref}
- className={cn(
- "flex h-9 items-center space-x-1 rounded-md border bg-background p-1 shadow-sm",
- className,
- )}
- {...props}
- />
-));
-Menubar.displayName = MenubarPrimitive.Root.displayName;
-
-const MenubarTrigger = React.forwardRef<
- React.ElementRef<typeof MenubarPrimitive.Trigger>,
- React.ComponentPropsWithoutRef<typeof MenubarPrimitive.Trigger>
->(({ className, ...props }, ref) => (
- <MenubarPrimitive.Trigger
- ref={ref}
- className={cn(
- "flex cursor-default select-none items-center rounded-sm px-3 py-1 text-sm font-medium outline-none focus:bg-accent focus:text-accent-foreground data-[state=open]:bg-accent data-[state=open]:text-accent-foreground",
- className,
- )}
- {...props}
- />
-));
-MenubarTrigger.displayName = MenubarPrimitive.Trigger.displayName;
-
-const MenubarSubTrigger = React.forwardRef<
- React.ElementRef<typeof MenubarPrimitive.SubTrigger>,
- React.ComponentPropsWithoutRef<typeof MenubarPrimitive.SubTrigger> & {
- inset?: boolean;
- }
->(({ className, inset, children, ...props }, ref) => (
- <MenubarPrimitive.SubTrigger
- ref={ref}
- className={cn(
- "flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[state=open]:bg-accent data-[state=open]:text-accent-foreground",
- inset && "pl-8",
- className,
- )}
- {...props}
- >
- {children}
- <ChevronRight className="ml-auto h-4 w-4" />
- </MenubarPrimitive.SubTrigger>
-));
-MenubarSubTrigger.displayName = MenubarPrimitive.SubTrigger.displayName;
-
-const MenubarSubContent = React.forwardRef<
- React.ElementRef<typeof MenubarPrimitive.SubContent>,
- React.ComponentPropsWithoutRef<typeof MenubarPrimitive.SubContent>
->(({ className, ...props }, ref) => (
- <MenubarPrimitive.SubContent
- ref={ref}
- className={cn(
- "z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-lg data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-[--radix-menubar-content-transform-origin]",
- className,
- )}
- {...props}
- />
-));
-MenubarSubContent.displayName = MenubarPrimitive.SubContent.displayName;
-
-const MenubarContent = React.forwardRef<
- React.ElementRef<typeof MenubarPrimitive.Content>,
- React.ComponentPropsWithoutRef<typeof MenubarPrimitive.Content>
->(
- (
- { className, align = "start", alignOffset = -4, sideOffset = 8, ...props },
- ref,
- ) => (
- <MenubarPrimitive.Portal>
- <MenubarPrimitive.Content
- ref={ref}
- align={align}
- alignOffset={alignOffset}
- sideOffset={sideOffset}
- className={cn(
- "z-50 min-w-[12rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-[--radix-menubar-content-transform-origin]",
- className,
- )}
- {...props}
- />
- </MenubarPrimitive.Portal>
- ),
-);
-MenubarContent.displayName = MenubarPrimitive.Content.displayName;
-
-const MenubarItem = React.forwardRef<
- React.ElementRef<typeof MenubarPrimitive.Item>,
- React.ComponentPropsWithoutRef<typeof MenubarPrimitive.Item> & {
- inset?: boolean;
- }
->(({ className, inset, ...props }, ref) => (
- <MenubarPrimitive.Item
- ref={ref}
- className={cn(
- "relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
- inset && "pl-8",
- className,
- )}
- {...props}
- />
-));
-MenubarItem.displayName = MenubarPrimitive.Item.displayName;
-
-const MenubarCheckboxItem = React.forwardRef<
- React.ElementRef<typeof MenubarPrimitive.CheckboxItem>,
- React.ComponentPropsWithoutRef<typeof MenubarPrimitive.CheckboxItem>
->(({ className, children, checked, ...props }, ref) => (
- <MenubarPrimitive.CheckboxItem
- ref={ref}
- className={cn(
- "relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
- className,
- )}
- checked={checked}
- {...props}
- >
- <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
- <MenubarPrimitive.ItemIndicator>
- <Check className="h-4 w-4" />
- </MenubarPrimitive.ItemIndicator>
- </span>
- {children}
- </MenubarPrimitive.CheckboxItem>
-));
-MenubarCheckboxItem.displayName = MenubarPrimitive.CheckboxItem.displayName;
-
-const MenubarRadioItem = React.forwardRef<
- React.ElementRef<typeof MenubarPrimitive.RadioItem>,
- React.ComponentPropsWithoutRef<typeof MenubarPrimitive.RadioItem>
->(({ className, children, ...props }, ref) => (
- <MenubarPrimitive.RadioItem
- ref={ref}
- className={cn(
- "relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
- className,
- )}
- {...props}
- >
- <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
- <MenubarPrimitive.ItemIndicator>
- <Circle className="h-4 w-4 fill-current" />
- </MenubarPrimitive.ItemIndicator>
- </span>
- {children}
- </MenubarPrimitive.RadioItem>
-));
-MenubarRadioItem.displayName = MenubarPrimitive.RadioItem.displayName;
-
-const MenubarLabel = React.forwardRef<
- React.ElementRef<typeof MenubarPrimitive.Label>,
- React.ComponentPropsWithoutRef<typeof MenubarPrimitive.Label> & {
- inset?: boolean;
- }
->(({ className, inset, ...props }, ref) => (
- <MenubarPrimitive.Label
- ref={ref}
- className={cn(
- "px-2 py-1.5 text-sm font-semibold",
- inset && "pl-8",
- className,
- )}
- {...props}
- />
-));
-MenubarLabel.displayName = MenubarPrimitive.Label.displayName;
-
-const MenubarSeparator = React.forwardRef<
- React.ElementRef<typeof MenubarPrimitive.Separator>,
- React.ComponentPropsWithoutRef<typeof MenubarPrimitive.Separator>
->(({ className, ...props }, ref) => (
- <MenubarPrimitive.Separator
- ref={ref}
- className={cn("-mx-1 my-1 h-px bg-muted", className)}
- {...props}
- />
-));
-MenubarSeparator.displayName = MenubarPrimitive.Separator.displayName;
-
-const MenubarShortcut = ({
- className,
- ...props
-}: React.HTMLAttributes<HTMLSpanElement>) => {
+function Menubar({ className, ...props }: MenubarPrimitive.Props) {
return (
- <span
- className={cn(
- "ml-auto text-xs tracking-widest text-muted-foreground",
- className,
- )}
+ <MenubarPrimitive
+ className={cn("flex items-center gap-1 rounded-lg border bg-background p-1", className)}
+ data-slot="menubar"
{...props}
/>
);
-};
-MenubarShortcut.displayname = "MenubarShortcut";
+}
+
+const MenubarMenu = Menu;
+const MenubarGroup = MenuGroup;
+const MenubarPortal = MenuPortal;
+const MenubarRadioGroup = MenuRadioGroup;
+const MenubarSub = MenuSub;
+const MenubarTrigger = MenuTrigger;
+const MenubarSubTrigger = MenuSubTrigger;
+const MenubarSubContent = MenuSubPopup;
+const MenubarContent = MenuPopup;
+const MenubarItem = MenuItem;
+const MenubarCheckboxItem = MenuCheckboxItem;
+const MenubarRadioItem = MenuRadioItem;
+const MenubarLabel = MenuGroupLabel;
+const MenubarSeparator = MenuSeparator;
+const MenubarShortcut = MenuShortcut;
export {
Menubar,
diff --git a/apps/web/src/components/ui/meter.tsx b/apps/web/src/components/ui/meter.tsx
new file mode 100644
index 000000000..3d612b902
--- /dev/null
+++ b/apps/web/src/components/ui/meter.tsx
@@ -0,0 +1,67 @@
+"use client";
+
+import { Meter as MeterPrimitive } from "@base-ui/react/meter";
+
+import { cn } from "@/lib/cn";
+
+function Meter({ className, children, ...props }: MeterPrimitive.Root.Props) {
+ return (
+ <MeterPrimitive.Root
+ className={cn("flex w-full flex-col gap-2", className)}
+ {...props}
+ >
+ {children ? (
+ children
+ ) : (
+ <MeterTrack>
+ <MeterIndicator />
+ </MeterTrack>
+ )}
+ </MeterPrimitive.Root>
+ );
+}
+
+function MeterLabel({ className, ...props }: MeterPrimitive.Label.Props) {
+ return (
+ <MeterPrimitive.Label
+ className={cn("font-medium text-foreground text-sm", className)}
+ data-slot="meter-label"
+ {...props}
+ />
+ );
+}
+
+function MeterTrack({ className, ...props }: MeterPrimitive.Track.Props) {
+ return (
+ <MeterPrimitive.Track
+ className={cn("block h-2 w-full overflow-hidden bg-input", className)}
+ data-slot="meter-track"
+ {...props}
+ />
+ );
+}
+
+function MeterIndicator({
+ className,
+ ...props
+}: MeterPrimitive.Indicator.Props) {
+ return (
+ <MeterPrimitive.Indicator
+ className={cn("bg-primary transition-all duration-500", className)}
+ data-slot="meter-indicator"
+ {...props}
+ />
+ );
+}
+
+function MeterValue({ className, ...props }: MeterPrimitive.Value.Props) {
+ return (
+ <MeterPrimitive.Value
+ className={cn("text-foreground text-sm tabular-nums", className)}
+ data-slot="meter-value"
+ {...props}
+ />
+ );
+}
+
+export { Meter, MeterLabel, MeterTrack, MeterIndicator, MeterValue };
diff --git a/apps/web/src/components/ui/number-field.tsx b/apps/web/src/components/ui/number-field.tsx
new file mode 100644
index 000000000..102479730
--- /dev/null
+++ b/apps/web/src/components/ui/number-field.tsx
@@ -0,0 +1,160 @@
+"use client";
+
+import { NumberField as NumberFieldPrimitive } from "@base-ui/react/number-field";
+import { MinusIcon, PlusIcon } from "lucide-react";
+import * as React from "react";
+
+import { cn } from "@/lib/cn";
+import { Label } from "@/components/ui/label";
+
+const NumberFieldContext = React.createContext<{
+ fieldId: string;
+} | null>(null);
+
+function NumberField({
+ id,
+ className,
+ size = "default",
+ ...props
+}: NumberFieldPrimitive.Root.Props & {
+ size?: "sm" | "default" | "lg";
+}) {
+ const generatedId = React.useId();
+ const fieldId = id ?? generatedId;
+
+ return (
+ <NumberFieldContext.Provider value={{ fieldId }}>
+ <NumberFieldPrimitive.Root
+ className={cn("flex w-full flex-col items-start gap-2", className)}
+ data-size={size}
+ data-slot="number-field"
+ id={fieldId}
+ {...props}
+ />
+ </NumberFieldContext.Provider>
+ );
+}
+
+function NumberFieldGroup({
+ className,
+ ...props
+}: NumberFieldPrimitive.Group.Props) {
+ return (
+ <NumberFieldPrimitive.Group
+ className={cn(
+ "relative flex w-full justify-between rounded-lg border border-input bg-background not-dark:bg-clip-padding text-base text-foreground shadow-xs/5 ring-ring/24 transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] not-data-disabled:not-focus-within:not-aria-invalid:before:shadow-[0_1px_--theme(--color-black/4%)] focus-within:border-ring focus-within:ring-[3px] has-aria-invalid:border-destructive/36 has-autofill:bg-foreground/4 focus-within:has-aria-invalid:border-destructive/64 focus-within:has-aria-invalid:ring-destructive/48 data-disabled:pointer-events-none data-disabled:opacity-64 sm:text-sm dark:bg-input/32 dark:has-autofill:bg-foreground/8 dark:has-aria-invalid:ring-destructive/24 dark:not-data-disabled:not-focus-within:not-aria-invalid:before:shadow-[0_-1px_--theme(--color-white/6%)] [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0 [[data-disabled],:focus-within,[aria-invalid]]:shadow-none",
+ className,
+ )}
+ data-slot="number-field-group"
+ {...props}
+ />
+ );
+}
+
+function NumberFieldDecrement({
+ className,
+ ...props
+}: NumberFieldPrimitive.Decrement.Props) {
+ return (
+ <NumberFieldPrimitive.Decrement
+ className={cn(
+ "relative flex shrink-0 cursor-pointer items-center justify-center rounded-s-[calc(var(--radius-lg)-1px)] in-data-[size=sm]:px-[calc(--spacing(2.5)-1px)] px-[calc(--spacing(3)-1px)] transition-colors pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11 hover:bg-accent",
+ className,
+ )}
+ data-slot="number-field-decrement"
+ {...props}
+ >
+ <MinusIcon />
+ </NumberFieldPrimitive.Decrement>
+ );
+}
+
+function NumberFieldIncrement({
+ className,
+ ...props
+}: NumberFieldPrimitive.Increment.Props) {
+ return (
+ <NumberFieldPrimitive.Increment
+ className={cn(
+ "relative flex shrink-0 cursor-pointer items-center justify-center rounded-e-[calc(var(--radius-lg)-1px)] in-data-[size=sm]:px-[calc(--spacing(2.5)-1px)] px-[calc(--spacing(3)-1px)] transition-colors pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11 hover:bg-accent",
+ className,
+ )}
+ data-slot="number-field-increment"
+ {...props}
+ >
+ <PlusIcon />
+ </NumberFieldPrimitive.Increment>
+ );
+}
+
+function NumberFieldInput({
+ className,
+ ...props
+}: NumberFieldPrimitive.Input.Props) {
+ return (
+ <NumberFieldPrimitive.Input
+ className={cn(
+ "h-8.5 in-data-[size=lg]:h-9.5 in-data-[size=sm]:h-7.5 w-full min-w-0 grow bg-transparent in-data-[size=sm]:px-[calc(--spacing(2.5)-1px)] px-[calc(--spacing(3)-1px)] text-center tabular-nums in-data-[size=lg]:leading-9.5 in-data-[size=sm]:leading-7.5 leading-8.5 outline-none [transition:background-color_5000000s_ease-in-out_0s] sm:h-7.5 sm:in-data-[size=lg]:h-8.5 sm:in-data-[size=sm]:h-6.5 sm:in-data-[size=lg]:leading-8.5 sm:in-data-[size=sm]:leading-8.5 sm:leading-7.5",
+ className,
+ )}
+ data-slot="number-field-input"
+ {...props}
+ />
+ );
+}
+
+function NumberFieldScrubArea({
+ className,
+ label,
+ ...props
+}: NumberFieldPrimitive.ScrubArea.Props & {
+ label: string;
+}) {
+ const context = React.useContext(NumberFieldContext);
+
+ if (!context) {
+ throw new Error(
+ "NumberFieldScrubArea must be used within a NumberField component for accessibility.",
+ );
+ }
+
+ return (
+ <NumberFieldPrimitive.ScrubArea
+ className={cn("flex cursor-ew-resize", className)}
+ data-slot="number-field-scrub-area"
+ {...props}
+ >
+ <Label className="cursor-ew-resize" htmlFor={context.fieldId}>
+ {label}
+ </Label>
+ <NumberFieldPrimitive.ScrubAreaCursor className="drop-shadow-[0_1px_1px_#0008] filter">
+ <CursorGrowIcon />
+ </NumberFieldPrimitive.ScrubAreaCursor>
+ </NumberFieldPrimitive.ScrubArea>
+ );
+}
+
+function CursorGrowIcon(props: React.ComponentProps<"svg">) {
+ return (
+ <svg
+ fill="black"
+ height="14"
+ stroke="white"
+ viewBox="0 0 24 14"
+ width="26"
+ xmlns="http://www.w3.org/2000/svg"
+ {...props}
+ >
+ <path d="M19.5 5.5L6.49737 5.51844V2L1 6.9999L6.5 12L6.49737 8.5L19.5 8.5V12L25 6.9999L19.5 2V5.5Z" />
+ </svg>
+ );
+}
+
+export {
+ NumberField,
+ NumberFieldScrubArea,
+ NumberFieldDecrement,
+ NumberFieldIncrement,
+ NumberFieldGroup,
+ NumberFieldInput,
+};
diff --git a/apps/web/src/components/ui/pagination.tsx b/apps/web/src/components/ui/pagination.tsx
new file mode 100644
index 000000000..d67334bcc
--- /dev/null
+++ b/apps/web/src/components/ui/pagination.tsx
@@ -0,0 +1,136 @@
+"use client";
+
+import { mergeProps } from "@base-ui/react/merge-props";
+import { useRender } from "@base-ui/react/use-render";
+import {
+ ChevronLeftIcon,
+ ChevronRightIcon,
+ MoreHorizontalIcon,
+} from "lucide-react";
+import type * as React from "react";
+
+import { cn } from "@/lib/cn";
+import { type Button, buttonVariants } from "@/components/ui/button";
+
+function Pagination({ className, ...props }: React.ComponentProps<"nav">) {
+ return (
+ <nav
+ aria-label="pagination"
+ className={cn("mx-auto flex w-full justify-center", className)}
+ data-slot="pagination"
+ {...props}
+ />
+ );
+}
+
+function PaginationContent({
+ className,
+ ...props
+}: React.ComponentProps<"ul">) {
+ return (
+ <ul
+ className={cn("flex flex-row items-center gap-1", className)}
+ data-slot="pagination-content"
+ {...props}
+ />
+ );
+}
+
+function PaginationItem({ ...props }: React.ComponentProps<"li">) {
+ return <li data-slot="pagination-item" {...props} />;
+}
+
+type PaginationLinkProps = {
+ isActive?: boolean;
+ size?: React.ComponentProps<typeof Button>["size"];
+} & useRender.ComponentProps<"a">;
+
+function PaginationLink({
+ className,
+ isActive,
+ size = "icon",
+ render,
+ ...props
+}: PaginationLinkProps) {
+ const defaultProps = {
+ "aria-current": isActive ? ("page" as const) : undefined,
+ className: render
+ ? className
+ : cn(
+ buttonVariants({
+ size,
+ variant: isActive ? "outline" : "ghost",
+ }),
+ className,
+ ),
+ "data-active": isActive,
+ "data-slot": "pagination-link",
+ };
+
+ return useRender({
+ defaultTagName: "a",
+ props: mergeProps<"a">(defaultProps, props),
+ render,
+ });
+}
+
+function PaginationPrevious({
+ className,
+ ...props
+}: React.ComponentProps<typeof PaginationLink>) {
+ return (
+ <PaginationLink
+ aria-label="Go to previous page"
+ className={cn("max-sm:aspect-square max-sm:p-0", className)}
+ size="default"
+ {...props}
+ >
+ <ChevronLeftIcon className="sm:-ms-1" />
+ <span className="max-sm:hidden">Previous</span>
+ </PaginationLink>
+ );
+}
+
+function PaginationNext({
+ className,
+ ...props
+}: React.ComponentProps<typeof PaginationLink>) {
+ return (
+ <PaginationLink
+ aria-label="Go to next page"
+ className={cn("max-sm:aspect-square max-sm:p-0", className)}
+ size="default"
+ {...props}
+ >
+ <span className="max-sm:hidden">Next</span>
+ <ChevronRightIcon className="sm:-me-1" />
+ </PaginationLink>
+ );
+}
+
+function PaginationEllipsis({
+ className,
+ ...props
+}: React.ComponentProps<"span">) {
+ return (
+ <span
+ aria-hidden
+ className={cn("flex min-w-7 justify-center", className)}
+ data-slot="pagination-ellipsis"
+ {...props}
+ >
+ <MoreHorizontalIcon className="size-5 sm:size-4" />
+ <span className="sr-only">More pages</span>
+ </span>
+ );
+}
+
+export {
+ Pagination,
+ PaginationContent,
+ PaginationLink,
+ PaginationItem,
+ PaginationPrevious,
+ PaginationNext,
+ PaginationEllipsis,
+};
diff --git a/apps/web/src/components/ui/popover.tsx b/apps/web/src/components/ui/popover.tsx
index 969b305cf..57fb6d9c9 100644
--- a/apps/web/src/components/ui/popover.tsx
+++ b/apps/web/src/components/ui/popover.tsx
@@ -1,31 +1,119 @@
-import * as PopoverPrimitive from "@radix-ui/react-popover";
-import * as React from "react";
+"use client";
+
+import { Popover as PopoverPrimitive } from "@base-ui/react/popover";
import { cn } from "@/lib/cn";
+const PopoverCreateHandle = PopoverPrimitive.createHandle;
+
const Popover = PopoverPrimitive.Root;
-const PopoverTrigger = PopoverPrimitive.Trigger;
-
-const PopoverAnchor = PopoverPrimitive.Anchor;
-
-const PopoverContent = React.forwardRef<
- React.ElementRef<typeof PopoverPrimitive.Content>,
- React.ComponentPropsWithoutRef<typeof PopoverPrimitive.Content>
->(({ className, align = "center", sideOffset = 4, ...props }, ref) => (
- <PopoverPrimitive.Portal>
- <PopoverPrimitive.Content
- ref={ref}
- align={align}
- sideOffset={sideOffset}
- className={cn(
- "z-50 w-56 rounded-md border bg-popover p-2 text-sm text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-[--radix-popover-content-transform-origin]",
- className,
- )}
+function PopoverTrigger({
+ className,
+ children,
+ ...props
+}: PopoverPrimitive.Trigger.Props) {
+ return (
+ <PopoverPrimitive.Trigger
+ className={className}
+ data-slot="popover-trigger"
+ {...props}
+ >
+ {children}
+ </PopoverPrimitive.Trigger>
+ );
+}
+
+function PopoverPopup({
+ children,
+ className,
+ side = "bottom",
+ align = "center",
+ sideOffset = 4,
+ alignOffset = 0,
+ tooltipStyle = false,
+ anchor,
+ ...props
+}: PopoverPrimitive.Popup.Props & {
+ side?: PopoverPrimitive.Positioner.Props["side"];
+ align?: PopoverPrimitive.Positioner.Props["align"];
+ sideOffset?: PopoverPrimitive.Positioner.Props["sideOffset"];
+ alignOffset?: PopoverPrimitive.Positioner.Props["alignOffset"];
+ tooltipStyle?: boolean;
+ anchor?: PopoverPrimitive.Positioner.Props["anchor"];
+}) {
+ return (
+ <PopoverPrimitive.Portal>
+ <PopoverPrimitive.Positioner
+ align={align}
+ alignOffset={alignOffset}
+ anchor={anchor}
+ className="z-50 h-(--positioner-height) w-(--positioner-width) max-w-(--available-width) transition-[top,left,right,bottom,transform] data-instant:transition-none"
+ data-slot="popover-positioner"
+ side={side}
+ sideOffset={sideOffset}
+ >
+ <PopoverPrimitive.Popup
+ className={cn(
+ "relative flex h-(--popup-height,auto) w-(--popup-width,auto) origin-(--transform-origin) rounded-lg border bg-popover not-dark:bg-clip-padding text-popover-foreground shadow-lg/5 outline-none transition-[width,height,scale,opacity] before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] has-data-[slot=calendar]:rounded-xl has-data-[slot=calendar]:before:rounded-[calc(var(--radius-xl)-1px)] data-starting-style:scale-98 data-starting-style:opacity-0 dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ tooltipStyle &&
+ "w-fit text-balance rounded-md text-xs shadow-md/5 before:rounded-[calc(var(--radius-md)-1px)]",
+ className,
+ )}
+ data-slot="popover-popup"
+ {...props}
+ >
+ <PopoverPrimitive.Viewport
+ className={cn(
+ "relative size-full max-h-(--available-height) overflow-clip px-(--viewport-inline-padding) py-4 [--viewport-inline-padding:--spacing(4)] has-data-[slot=calendar]:p-2 data-instant:transition-none **:data-current:data-ending-style:opacity-0 **:data-current:data-starting-style:opacity-0 **:data-previous:data-ending-style:opacity-0 **:data-previous:data-starting-style:opacity-0 **:data-current:w-[calc(var(--popup-width)-2*var(--viewport-inline-padding)-2px)] **:data-previous:w-[calc(var(--popup-width)-2*var(--viewport-inline-padding)-2px)] **:data-current:opacity-100 **:data-previous:opacity-100 **:data-current:transition-opacity **:data-previous:transition-opacity",
+ tooltipStyle
+ ? "py-1 [--viewport-inline-padding:--spacing(2)]"
+ : "not-data-transitioning:overflow-y-auto",
+ )}
+ data-slot="popover-viewport"
+ >
+ {children}
+ </PopoverPrimitive.Viewport>
+ </PopoverPrimitive.Popup>
+ </PopoverPrimitive.Positioner>
+ </PopoverPrimitive.Portal>
+ );
+}
+
+function PopoverClose({ ...props }: PopoverPrimitive.Close.Props) {
+ return <PopoverPrimitive.Close data-slot="popover-close" {...props} />;
+}
+
+function PopoverTitle({ className, ...props }: PopoverPrimitive.Title.Props) {
+ return (
+ <PopoverPrimitive.Title
+ className={cn("font-semibold text-lg leading-none", className)}
+ data-slot="popover-title"
+ {...props}
+ />
+ );
+}
+
+function PopoverDescription({
+ className,
+ ...props
+}: PopoverPrimitive.Description.Props) {
+ return (
+ <PopoverPrimitive.Description
+ className={cn("text-muted-foreground text-sm", className)}
+ data-slot="popover-description"
{...props}
/>
- </PopoverPrimitive.Portal>
-));
-PopoverContent.displayName = PopoverPrimitive.Content.displayName;
+ );
+}
-export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor };
+export {
+ PopoverCreateHandle,
+ Popover,
+ PopoverTrigger,
+ PopoverPopup,
+ PopoverPopup as PopoverContent,
+ PopoverTitle,
+ PopoverDescription,
+ PopoverClose,
+};
diff --git a/apps/web/src/components/ui/preview-card.tsx b/apps/web/src/components/ui/preview-card.tsx
new file mode 100644
index 000000000..6c0f6f52e
--- /dev/null
+++ b/apps/web/src/components/ui/preview-card.tsx
@@ -0,0 +1,58 @@
+"use client";
+
+import { PreviewCard as PreviewCardPrimitive } from "@base-ui/react/preview-card";
+
+import { cn } from "@/lib/cn";
+
+const PreviewCard = PreviewCardPrimitive.Root;
+
+function PreviewCardTrigger({ ...props }: PreviewCardPrimitive.Trigger.Props) {
+ return (
+ <PreviewCardPrimitive.Trigger data-slot="preview-card-trigger" {...props} />
+ );
+}
+
+function PreviewCardPopup({
+ className,
+ children,
+ align = "center",
+ sideOffset = 4,
+ anchor,
+ ...props
+}: PreviewCardPrimitive.Popup.Props & {
+ align?: PreviewCardPrimitive.Positioner.Props["align"];
+ sideOffset?: PreviewCardPrimitive.Positioner.Props["sideOffset"];
+ anchor?: PreviewCardPrimitive.Positioner.Props["anchor"];
+}) {
+ return (
+ <PreviewCardPrimitive.Portal>
+ <PreviewCardPrimitive.Positioner
+ align={align}
+ anchor={anchor}
+ className="z-50"
+ data-slot="preview-card-positioner"
+ sideOffset={sideOffset}
+ >
+ <PreviewCardPrimitive.Popup
+ className={cn(
+ "relative flex w-64 origin-(--transform-origin) text-balance rounded-lg border bg-popover not-dark:bg-clip-padding p-4 text-popover-foreground text-sm shadow-lg/5 transition-[scale,opacity] before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] data-ending-style:scale-98 data-starting-style:scale-98 data-ending-style:opacity-0 data-starting-style:opacity-0 dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ className,
+ )}
+ data-slot="preview-card-content"
+ {...props}
+ >
+ {children}
+ </PreviewCardPrimitive.Popup>
+ </PreviewCardPrimitive.Positioner>
+ </PreviewCardPrimitive.Portal>
+ );
+}
+
+export {
+ PreviewCard,
+ PreviewCard as HoverCard,
+ PreviewCardTrigger,
+ PreviewCardTrigger as HoverCardTrigger,
+ PreviewCardPopup,
+ PreviewCardPopup as HoverCardContent,
+};
diff --git a/apps/web/src/components/ui/progress.tsx b/apps/web/src/components/ui/progress.tsx
index e99f9850a..9215b555b 100644
--- a/apps/web/src/components/ui/progress.tsx
+++ b/apps/web/src/components/ui/progress.tsx
@@ -1,29 +1,81 @@
-import * as ProgressPrimitive from "@radix-ui/react-progress";
-import type * as React from "react";
+"use client";
+
+import { Progress as ProgressPrimitive } from "@base-ui/react/progress";
import { cn } from "@/lib/cn";
function Progress({
className,
- value,
+ children,
...props
-}: React.ComponentProps<typeof ProgressPrimitive.Root>) {
+}: ProgressPrimitive.Root.Props) {
return (
<ProgressPrimitive.Root
+ className={cn("flex w-full flex-col gap-2", className)}
data-slot="progress"
+ {...props}
+ >
+ {children ? (
+ children
+ ) : (
+ <ProgressTrack>
+ <ProgressIndicator />
+ </ProgressTrack>
+ )}
+ </ProgressPrimitive.Root>
+ );
+}
+
+function ProgressLabel({ className, ...props }: ProgressPrimitive.Label.Props) {
+ return (
+ <ProgressPrimitive.Label
+ className={cn("font-medium text-sm", className)}
+ data-slot="progress-label"
+ {...props}
+ />
+ );
+}
+
+function ProgressTrack({ className, ...props }: ProgressPrimitive.Track.Props) {
+ return (
+ <ProgressPrimitive.Track
className={cn(
- "bg-primary/20 relative h-2 w-full overflow-hidden rounded-full",
+ "block h-1.5 w-full overflow-hidden rounded-full bg-input",
className,
)}
+ data-slot="progress-track"
{...props}
- >
- <ProgressPrimitive.Indicator
- data-slot="progress-indicator"
- className="bg-primary h-full w-full flex-1 transition-all"
- style={{ transform: `translateX(-${100 - (value || 0)}%)` }}
- />
- </ProgressPrimitive.Root>
+ />
+ );
+}
+
+function ProgressIndicator({
+ className,
+ ...props
+}: ProgressPrimitive.Indicator.Props) {
+ return (
+ <ProgressPrimitive.Indicator
+ className={cn("bg-primary transition-all duration-500", className)}
+ data-slot="progress-indicator"
+ {...props}
+ />
+ );
+}
+
+function ProgressValue({ className, ...props }: ProgressPrimitive.Value.Props) {
+ return (
+ <ProgressPrimitive.Value
+ className={cn("text-sm tabular-nums", className)}
+ data-slot="progress-value"
+ {...props}
+ />
);
}
-export { Progress };
+export {
+ Progress,
+ ProgressLabel,
+ ProgressTrack,
+ ProgressIndicator,
+ ProgressValue,
+};
diff --git a/apps/web/src/components/ui/radio-group.tsx b/apps/web/src/components/ui/radio-group.tsx
new file mode 100644
index 000000000..5659c2642
--- /dev/null
+++ b/apps/web/src/components/ui/radio-group.tsx
@@ -0,0 +1,36 @@
+"use client";
+
+import { Radio as RadioPrimitive } from "@base-ui/react/radio";
+import { RadioGroup as RadioGroupPrimitive } from "@base-ui/react/radio-group";
+
+import { cn } from "@/lib/cn";
+
+function RadioGroup({ className, ...props }: RadioGroupPrimitive.Props) {
+ return (
+ <RadioGroupPrimitive
+ className={cn("flex flex-col gap-3", className)}
+ data-slot="radio-group"
+ {...props}
+ />
+ );
+}
+
+function Radio({ className, ...props }: RadioPrimitive.Root.Props) {
+ return (
+ <RadioPrimitive.Root
+ className={cn(
+ "relative inline-flex size-4.5 shrink-0 items-center justify-center rounded-full border border-input bg-background not-dark:bg-clip-padding shadow-xs/5 outline-none transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-full not-data-disabled:not-data-checked:not-aria-invalid:before:shadow-[0_1px_--theme(--color-black/4%)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background aria-invalid:border-destructive/36 focus-visible:aria-invalid:border-destructive/64 focus-visible:aria-invalid:ring-destructive/48 data-disabled:opacity-64 sm:size-4 dark:not-data-checked:bg-input/32 dark:aria-invalid:ring-destructive/24 dark:not-data-disabled:not-data-checked:not-aria-invalid:before:shadow-[0_-1px_--theme(--color-white/6%)] [[data-disabled],[data-checked],[aria-invalid]]:shadow-none",
+ className,
+ )}
+ data-slot="radio"
+ {...props}
+ >
+ <RadioPrimitive.Indicator
+ className="-inset-px absolute flex size-4.5 items-center justify-center rounded-full before:size-2 before:rounded-full before:bg-primary-foreground data-unchecked:hidden data-checked:bg-primary sm:size-4 sm:before:size-1.5"
+ data-slot="radio-indicator"
+ />
+ </RadioPrimitive.Root>
+ );
+}
+
+export { RadioGroup, Radio, Radio as RadioGroupItem };
diff --git a/apps/web/src/components/ui/scroll-area.tsx b/apps/web/src/components/ui/scroll-area.tsx
new file mode 100644
index 000000000..4a048b3b4
--- /dev/null
+++ b/apps/web/src/components/ui/scroll-area.tsx
@@ -0,0 +1,64 @@
+"use client";
+
+import { ScrollArea as ScrollAreaPrimitive } from "@base-ui/react/scroll-area";
+
+import { cn } from "@/lib/cn";
+
+function ScrollArea({
+ className,
+ children,
+ scrollFade = false,
+ scrollbarGutter = false,
+ ...props
+}: ScrollAreaPrimitive.Root.Props & {
+ scrollFade?: boolean;
+ scrollbarGutter?: boolean;
+}) {
+ return (
+ <ScrollAreaPrimitive.Root
+ className={cn("size-full min-h-0", className)}
+ {...props}
+ >
+ <ScrollAreaPrimitive.Viewport
+ className={cn(
+ "h-full overscroll-contain rounded-[inherit] outline-none transition-shadows focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-has-overflow-x:overscroll-x-contain",
+ 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",
+ )}
+ data-slot="scroll-area-viewport"
+ >
+ {children}
+ </ScrollAreaPrimitive.Viewport>
+ <ScrollBar orientation="vertical" />
+ <ScrollBar orientation="horizontal" />
+ <ScrollAreaPrimitive.Corner data-slot="scroll-area-corner" />
+ </ScrollAreaPrimitive.Root>
+ );
+}
+
+function ScrollBar({
+ className,
+ orientation = "vertical",
+ ...props
+}: ScrollAreaPrimitive.Scrollbar.Props) {
+ return (
+ <ScrollAreaPrimitive.Scrollbar
+ className={cn(
+ "m-1 flex opacity-0 transition-opacity delay-300 data-[orientation=horizontal]:h-1.5 data-[orientation=vertical]:w-1.5 data-[orientation=horizontal]:flex-col data-hovering:opacity-100 data-scrolling:opacity-100 data-hovering:delay-0 data-scrolling:delay-0 data-hovering:duration-100 data-scrolling:duration-100",
+ className,
+ )}
+ data-slot="scroll-area-scrollbar"
+ orientation={orientation}
+ {...props}
+ >
+ <ScrollAreaPrimitive.Thumb
+ className="relative flex-1 rounded-full bg-foreground/20"
+ data-slot="scroll-area-thumb"
+ />
+ </ScrollAreaPrimitive.Scrollbar>
+ );
+}
+
+export { ScrollArea, ScrollBar };
diff --git a/apps/web/src/components/ui/select.tsx b/apps/web/src/components/ui/select.tsx
index 6f4b520f6..40f967d12 100644
--- a/apps/web/src/components/ui/select.tsx
+++ b/apps/web/src/components/ui/select.tsx
@@ -1,25 +1,71 @@
-import * as SelectPrimitive from "@radix-ui/react-select";
-import { CheckIcon, ChevronDownIcon, ChevronUpIcon } from "lucide-react";
+"use client";
+
+import { mergeProps } from "@base-ui/react/merge-props";
+import { Select as SelectPrimitive } from "@base-ui/react/select";
+import { useRender } from "@base-ui/react/use-render";
+import { cva, type VariantProps } from "class-variance-authority";
+import {
+ ChevronDownIcon,
+ ChevronsUpDownIcon,
+ ChevronUpIcon,
+} from "lucide-react";
import type * as React from "react";
import { cn } from "@/lib/cn";
-function Select({
- ...props
-}: React.ComponentProps<typeof SelectPrimitive.Root>) {
- return <SelectPrimitive.Root data-slot="select" {...props} />;
-}
+const Select = SelectPrimitive.Root;
-function SelectGroup({
- ...props
-}: React.ComponentProps<typeof SelectPrimitive.Group>) {
- return <SelectPrimitive.Group data-slot="select-group" {...props} />;
+const selectTriggerVariants = cva(
+ "relative inline-flex min-h-9 w-full min-w-36 select-none items-center justify-between gap-2 rounded-lg border border-input bg-background not-dark:bg-clip-padding px-[calc(--spacing(3)-1px)] text-left text-base text-foreground shadow-xs/5 outline-none ring-ring/24 transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] not-data-disabled:not-focus-visible:not-aria-invalid:not-data-pressed:before:shadow-[0_1px_--theme(--color-black/4%)] pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 focus-visible:border-ring focus-visible:ring-[3px] aria-invalid:border-destructive/36 focus-visible:aria-invalid:border-destructive/64 focus-visible:aria-invalid:ring-destructive/16 data-disabled:pointer-events-none data-disabled:opacity-64 sm:min-h-8 sm:text-sm dark:bg-input/32 dark:aria-invalid:ring-destructive/24 dark:not-data-disabled:not-focus-visible:not-aria-invalid:not-data-pressed:before:shadow-[0_-1px_--theme(--color-white/6%)] [&_svg:not([class*='opacity-'])]:opacity-80 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0 [[data-disabled],:focus-visible,[aria-invalid],[data-pressed]]:shadow-none",
+ {
+ defaultVariants: {
+ size: "default",
+ },
+ variants: {
+ size: {
+ default: "",
+ lg: "min-h-10 sm:min-h-9",
+ sm: "min-h-8 gap-1.5 px-[calc(--spacing(2.5)-1px)] sm:min-h-7",
+ },
+ },
+ },
+);
+
+const selectTriggerIconClassName = "-me-1 size-4.5 opacity-80 sm:size-4";
+
+interface SelectButtonProps extends useRender.ComponentProps<"button"> {
+ size?: VariantProps<typeof selectTriggerVariants>["size"];
}
-function SelectValue({
+function SelectButton({
+ className,
+ size,
+ render,
+ children,
...props
-}: React.ComponentProps<typeof SelectPrimitive.Value>) {
- return <SelectPrimitive.Value data-slot="select-value" {...props} />;
+}: SelectButtonProps) {
+ const typeValue: React.ButtonHTMLAttributes<HTMLButtonElement>["type"] =
+ render ? undefined : "button";
+
+ const defaultProps = {
+ children: (
+ <>
+ <span className="flex-1 truncate in-data-placeholder:text-muted-foreground/72">
+ {children}
+ </span>
+ <ChevronsUpDownIcon className={selectTriggerIconClassName} />
+ </>
+ ),
+ className: cn(selectTriggerVariants({ size }), "min-w-none", className),
+ "data-slot": "select-button",
+ type: typeValue,
+ };
+
+ return useRender({
+ defaultTagName: "button",
+ props: mergeProps<"button">(defaultProps, props),
+ render,
+ });
}
function SelectTrigger({
@@ -27,95 +73,130 @@ function SelectTrigger({
size = "default",
children,
...props
-}: React.ComponentProps<typeof SelectPrimitive.Trigger> & {
- size?: "sm" | "default";
-}) {
+}: SelectPrimitive.Trigger.Props & VariantProps<typeof selectTriggerVariants>) {
return (
<SelectPrimitive.Trigger
+ className={cn(selectTriggerVariants({ size }), className)}
data-slot="select-trigger"
- data-size={size}
- className={cn(
- "border-input data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 dark:hover:bg-input/50 flex w-fit items-center justify-between gap-2 rounded-md border bg-transparent px-2 py-1.5 text-sm whitespace-nowrap shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-7 data-[size=sm]:h-6 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
- className,
- )}
{...props}
>
{children}
- <SelectPrimitive.Icon asChild>
- <ChevronDownIcon className="size-4 opacity-50" />
+ <SelectPrimitive.Icon data-slot="select-icon">
+ <ChevronsUpDownIcon className={selectTriggerIconClassName} />
</SelectPrimitive.Icon>
</SelectPrimitive.Trigger>
);
}
-function SelectContent({
+function SelectValue({ className, ...props }: SelectPrimitive.Value.Props) {
+ return (
+ <SelectPrimitive.Value
+ className={cn(
+ "flex-1 truncate data-placeholder:text-muted-foreground",
+ className,
+ )}
+ data-slot="select-value"
+ {...props}
+ />
+ );
+}
+
+function SelectPopup({
className,
children,
- position = "popper",
+ side = "bottom",
+ sideOffset = 4,
+ align = "start",
+ alignOffset = 0,
+ alignItemWithTrigger = true,
+ anchor,
...props
-}: React.ComponentProps<typeof SelectPrimitive.Content>) {
+}: SelectPrimitive.Popup.Props & {
+ side?: SelectPrimitive.Positioner.Props["side"];
+ sideOffset?: SelectPrimitive.Positioner.Props["sideOffset"];
+ align?: SelectPrimitive.Positioner.Props["align"];
+ alignOffset?: SelectPrimitive.Positioner.Props["alignOffset"];
+ alignItemWithTrigger?: SelectPrimitive.Positioner.Props["alignItemWithTrigger"];
+ anchor?: SelectPrimitive.Positioner.Props["anchor"];
+}) {
return (
<SelectPrimitive.Portal>
- <SelectPrimitive.Content
- data-slot="select-content"
- className={cn(
- "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-(--radix-select-content-available-height) min-w-[8rem] origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border shadow-md",
- position === "popper" &&
- "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
- className,
- )}
- position={position}
- {...props}
+ <SelectPrimitive.Positioner
+ align={align}
+ alignItemWithTrigger={alignItemWithTrigger}
+ alignOffset={alignOffset}
+ anchor={anchor}
+ className="z-50 select-none"
+ data-slot="select-positioner"
+ side={side}
+ sideOffset={sideOffset}
>
- <SelectScrollUpButton />
- <SelectPrimitive.Viewport
- className={cn(
- "p-1",
- position === "popper" &&
- "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)] scroll-my-1",
- )}
+ <SelectPrimitive.Popup
+ className="origin-(--transform-origin) text-foreground"
+ data-slot="select-popup"
+ {...props}
>
- {children}
- </SelectPrimitive.Viewport>
- <SelectScrollDownButton />
- </SelectPrimitive.Content>
+ <SelectPrimitive.ScrollUpArrow
+ className="top-0 z-50 flex h-6 w-full cursor-default items-center justify-center before:pointer-events-none before:absolute before:inset-x-px before:top-px before:h-[200%] before:rounded-t-[calc(var(--radius-lg)-1px)] before:bg-linear-to-b before:from-50% before:from-popover"
+ data-slot="select-scroll-up-arrow"
+ >
+ <ChevronUpIcon className="relative size-4.5 sm:size-4" />
+ </SelectPrimitive.ScrollUpArrow>
+ <div className="relative h-full min-w-(--anchor-width) rounded-lg border bg-popover not-dark:bg-clip-padding shadow-lg/5 before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] dark:before:shadow-[0_-1px_--theme(--color-white/6%)]">
+ <SelectPrimitive.List
+ className={cn(
+ "max-h-(--available-height) overflow-y-auto p-1",
+ className,
+ )}
+ data-slot="select-list"
+ >
+ {children}
+ </SelectPrimitive.List>
+ </div>
+ <SelectPrimitive.ScrollDownArrow
+ className="bottom-0 z-50 flex h-6 w-full cursor-default items-center justify-center before:pointer-events-none before:absolute before:inset-x-px before:bottom-px before:h-[200%] before:rounded-b-[calc(var(--radius-lg)-1px)] before:bg-linear-to-t before:from-50% before:from-popover"
+ data-slot="select-scroll-down-arrow"
+ >
+ <ChevronDownIcon className="relative size-4.5 sm:size-4" />
+ </SelectPrimitive.ScrollDownArrow>
+ </SelectPrimitive.Popup>
+ </SelectPrimitive.Positioner>
</SelectPrimitive.Portal>
);
}
-function SelectLabel({
- className,
- ...props
-}: React.ComponentProps<typeof SelectPrimitive.Label>) {
- return (
- <SelectPrimitive.Label
- data-slot="select-label"
- className={cn("text-muted-foreground px-1.5 py-1 text-xs", className)}
- {...props}
- />
- );
-}
-
function SelectItem({
className,
children,
...props
-}: React.ComponentProps<typeof SelectPrimitive.Item>) {
+}: SelectPrimitive.Item.Props) {
return (
<SelectPrimitive.Item
- data-slot="select-item"
className={cn(
- "focus:bg-accent focus:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1 pr-6 pl-1.5 text-xs outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-3.5 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
+ "grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default grid-cols-[1rem_1fr] items-center gap-2 rounded-sm py-1 ps-2 pe-4 text-base outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
className,
)}
+ data-slot="select-item"
{...props}
>
- <span className="absolute right-1.5 flex size-3 items-center justify-center">
- <SelectPrimitive.ItemIndicator>
- <CheckIcon className="size-3" />
- </SelectPrimitive.ItemIndicator>
- </span>
- <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
+ <SelectPrimitive.ItemIndicator className="col-start-1">
+ <svg
+ fill="none"
+ height="24"
+ stroke="currentColor"
+ strokeLinecap="round"
+ strokeLinejoin="round"
+ strokeWidth="2"
+ viewBox="0 0 24 24"
+ width="24"
+ xmlns="http://www.w3.org/1500/svg"
+ >
+ <path d="M5.252 12.7 10.2 18.63 18.748 5.37" />
+ </svg>
+ </SelectPrimitive.ItemIndicator>
+ <SelectPrimitive.ItemText className="col-start-2 min-w-0">
+ {children}
+ </SelectPrimitive.ItemText>
</SelectPrimitive.Item>
);
}
@@ -123,61 +204,40 @@ function SelectItem({
function SelectSeparator({
className,
...props
-}: React.ComponentProps<typeof SelectPrimitive.Separator>) {
+}: SelectPrimitive.Separator.Props) {
return (
<SelectPrimitive.Separator
+ className={cn("mx-2 my-1 h-px bg-border", className)}
data-slot="select-separator"
- className={cn("bg-border pointer-events-none -mx-1 my-1 h-px", className)}
{...props}
/>
);
}
-function SelectScrollUpButton({
- className,
- ...props
-}: React.ComponentProps<typeof SelectPrimitive.ScrollUpButton>) {
- return (
- <SelectPrimitive.ScrollUpButton
- data-slot="select-scroll-up-button"
- className={cn(
- "flex cursor-default items-center justify-center py-1",
- className,
- )}
- {...props}
- >
- <ChevronUpIcon className="size-4" />
- </SelectPrimitive.ScrollUpButton>
- );
+function SelectGroup(props: SelectPrimitive.Group.Props) {
+ return <SelectPrimitive.Group data-slot="select-group" {...props} />;
}
-function SelectScrollDownButton({
- className,
- ...props
-}: React.ComponentProps<typeof SelectPrimitive.ScrollDownButton>) {
+function SelectGroupLabel(props: SelectPrimitive.GroupLabel.Props) {
return (
- <SelectPrimitive.ScrollDownButton
- data-slot="select-scroll-down-button"
- className={cn(
- "flex cursor-default items-center justify-center py-1",
- className,
- )}
+ <SelectPrimitive.GroupLabel
+ className="px-2 py-1.5 font-medium text-muted-foreground text-xs"
+ data-slot="select-group-label"
{...props}
- >
- <ChevronDownIcon className="size-4" />
- </SelectPrimitive.ScrollDownButton>
+ />
);
}
export {
Select,
- SelectContent,
- SelectGroup,
- SelectItem,
- SelectLabel,
- SelectScrollDownButton,
- SelectScrollUpButton,
- SelectSeparator,
SelectTrigger,
+ SelectButton,
+ selectTriggerVariants,
SelectValue,
+ SelectPopup,
+ SelectPopup as SelectContent,
+ SelectItem,
+ SelectSeparator,
+ SelectGroup,
+ SelectGroupLabel,
};
diff --git a/apps/web/src/components/ui/separator.tsx b/apps/web/src/components/ui/separator.tsx
index 19778fffd..9c61ff7fd 100644
--- a/apps/web/src/components/ui/separator.tsx
+++ b/apps/web/src/components/ui/separator.tsx
@@ -1,23 +1,20 @@
-import * as SeparatorPrimitive from "@radix-ui/react-separator";
-import type * as React from "react";
+import { Separator as SeparatorPrimitive } from "@base-ui/react/separator";
import { cn } from "@/lib/cn";
function Separator({
className,
orientation = "horizontal",
- decorative = true,
...props
-}: React.ComponentProps<typeof SeparatorPrimitive.Root>) {
+}: SeparatorPrimitive.Props) {
return (
- <SeparatorPrimitive.Root
- data-slot="separator"
- decorative={decorative}
- orientation={orientation}
+ <SeparatorPrimitive
className={cn(
- "bg-border shrink-0 data-[orientation=horizontal]:h-px data-[orientation=horizontal]:w-full data-[orientation=vertical]:h-full data-[orientation=vertical]:w-px",
+ "shrink-0 bg-border data-[orientation=horizontal]:h-px data-[orientation=horizontal]:w-full data-[orientation=vertical]:w-px data-[orientation=vertical]:not-[[class^='h-']]:not-[[class*='_h-']]:self-stretch",
className,
)}
+ data-slot="separator"
+ orientation={orientation}
{...props}
/>
);
diff --git a/apps/web/src/components/ui/sheet.tsx b/apps/web/src/components/ui/sheet.tsx
index 7c9ceb399..ab284995e 100644
--- a/apps/web/src/components/ui/sheet.tsx
+++ b/apps/web/src/components/ui/sheet.tsx
@@ -1,80 +1,107 @@
-import * as SheetPrimitive from "@radix-ui/react-dialog";
-import { XIcon } from "lucide-react";
-import type * as React from "react";
+"use client";
+import { Dialog as SheetPrimitive } from "@base-ui/react/dialog";
+import { XIcon } from "lucide-react";
import { cn } from "@/lib/cn";
+import { Button } from "@/components/ui/button";
+import { ScrollArea } from "@/components/ui/scroll-area";
-function Sheet({ ...props }: React.ComponentProps<typeof SheetPrimitive.Root>) {
- return <SheetPrimitive.Root data-slot="sheet" {...props} />;
-}
+const Sheet = SheetPrimitive.Root;
-function SheetTrigger({
- ...props
-}: React.ComponentProps<typeof SheetPrimitive.Trigger>) {
+const SheetPortal = SheetPrimitive.Portal;
+
+function SheetTrigger(props: SheetPrimitive.Trigger.Props) {
return <SheetPrimitive.Trigger data-slot="sheet-trigger" {...props} />;
}
-function SheetClose({
- ...props
-}: React.ComponentProps<typeof SheetPrimitive.Close>) {
+function SheetClose(props: SheetPrimitive.Close.Props) {
return <SheetPrimitive.Close data-slot="sheet-close" {...props} />;
}
-function SheetPortal({
- ...props
-}: React.ComponentProps<typeof SheetPrimitive.Portal>) {
- return <SheetPrimitive.Portal data-slot="sheet-portal" {...props} />;
+function SheetBackdrop({ className, ...props }: SheetPrimitive.Backdrop.Props) {
+ return (
+ <SheetPrimitive.Backdrop
+ className={cn(
+ "fixed inset-0 z-50 bg-black/32 backdrop-blur-sm transition-all duration-200 data-ending-style:opacity-0 data-starting-style:opacity-0",
+ className,
+ )}
+ data-slot="sheet-backdrop"
+ {...props}
+ />
+ );
}
-function SheetOverlay({
+function SheetViewport({
className,
+ side,
+ variant = "default",
...props
-}: React.ComponentProps<typeof SheetPrimitive.Overlay>) {
+}: SheetPrimitive.Viewport.Props & {
+ side?: "right" | "left" | "top" | "bottom";
+ variant?: "default" | "inset";
+}) {
return (
- <SheetPrimitive.Overlay
- data-slot="sheet-overlay"
+ <SheetPrimitive.Viewport
className={cn(
- "data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50",
- className,
+ "fixed inset-0 z-50 grid",
+ side === "bottom" && "grid grid-rows-[1fr_auto] pt-12",
+ side === "top" && "grid grid-rows-[auto_1fr] pb-12",
+ side === "left" && "flex justify-start",
+ side === "right" && "flex justify-end",
+ variant === "inset" && "sm:p-4",
)}
+ data-slot="sheet-viewport"
{...props}
/>
);
}
-function SheetContent({
+function SheetPopup({
className,
children,
+ showCloseButton = true,
side = "right",
+ variant = "default",
...props
-}: React.ComponentProps<typeof SheetPrimitive.Content> & {
- side?: "top" | "right" | "bottom" | "left";
+}: SheetPrimitive.Popup.Props & {
+ showCloseButton?: boolean;
+ side?: "right" | "left" | "top" | "bottom";
+ variant?: "default" | "inset";
}) {
return (
<SheetPortal>
- <SheetOverlay />
- <SheetPrimitive.Content
- data-slot="sheet-content"
- className={cn(
- "bg-background data-[state=open]:animate-in data-[state=closed]:animate-out fixed z-50 flex flex-col gap-4 shadow-lg transition ease-in-out data-[state=closed]:duration-300 data-[state=open]:duration-500",
- side === "right" &&
- "data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right inset-y-0 right-0 h-full w-3/4 border-l sm:max-w-sm",
- side === "left" &&
- "data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left inset-y-0 left-0 h-full w-3/4 border-r sm:max-w-sm",
- side === "top" &&
- "data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top inset-x-0 top-0 h-auto border-b",
- side === "bottom" &&
- "data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom inset-x-0 bottom-0 h-auto border-t",
- className,
- )}
- {...props}
- >
- {children}
- <SheetPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-secondary absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none">
- <XIcon className="size-4" />
- <span className="sr-only">Close</span>
- </SheetPrimitive.Close>
- </SheetPrimitive.Content>
+ <SheetBackdrop />
+ <SheetViewport side={side} variant={variant}>
+ <SheetPrimitive.Popup
+ className={cn(
+ "relative flex max-h-full min-h-0 w-full min-w-0 flex-col bg-popover not-dark:bg-clip-padding text-popover-foreground shadow-lg/5 transition-[opacity,translate] duration-200 ease-in-out will-change-transform before:pointer-events-none before:absolute before:inset-0 before:shadow-[0_1px_--theme(--color-black/4%)] data-ending-style:opacity-0 data-starting-style:opacity-0 max-sm:before:hidden dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ side === "bottom" &&
+ "row-start-2 border-t data-ending-style:translate-y-8 data-starting-style:translate-y-8",
+ side === "top" &&
+ "data-ending-style:-translate-y-8 data-starting-style:-translate-y-8 border-b",
+ side === "left" &&
+ "data-ending-style:-translate-x-8 data-starting-style:-translate-x-8 w-[calc(100%-(--spacing(12)))] max-w-md border-e",
+ side === "right" &&
+ "col-start-2 w-[calc(100%-(--spacing(12)))] max-w-md border-s data-ending-style:translate-x-8 data-starting-style:translate-x-8",
+ variant === "inset" &&
+ "before:hidden sm:rounded-2xl sm:border sm:before:rounded-[calc(var(--radius-2xl)-1px)] sm:**:data-[slot=sheet-footer]:rounded-b-[calc(var(--radius-2xl)-1px)]",
+ className,
+ )}
+ data-slot="sheet-popup"
+ {...props}
+ >
+ {children}
+ {showCloseButton && (
+ <SheetPrimitive.Close
+ aria-label="Close"
+ className="absolute end-2 top-2"
+ render={<Button size="icon" variant="ghost" />}
+ >
+ <XIcon />
+ </SheetPrimitive.Close>
+ )}
+ </SheetPrimitive.Popup>
+ </SheetViewport>
</SheetPortal>
);
}
@@ -82,31 +109,46 @@ function SheetContent({
function SheetHeader({ className, ...props }: React.ComponentProps<"div">) {
return (
<div
+ className={cn(
+ "flex flex-col gap-2 p-6 in-[[data-slot=sheet-popup]:has([data-slot=sheet-panel])]:pb-3 max-sm:pb-4",
+ className,
+ )}
data-slot="sheet-header"
- className={cn("flex flex-col gap-1.5 p-4", className)}
{...props}
/>
);
}
-function SheetFooter({ className, ...props }: React.ComponentProps<"div">) {
+function SheetFooter({
+ className,
+ variant = "default",
+ ...props
+}: React.ComponentProps<"div"> & {
+ variant?: "default" | "bare";
+}) {
return (
<div
+ className={cn(
+ "flex flex-col-reverse gap-2 px-6 sm:flex-row sm:justify-end",
+ variant === "default" && "border-t bg-muted/72 py-4",
+ variant === "bare" &&
+ "in-[[data-slot=sheet-popup]:has([data-slot=sheet-panel])]:pt-3 pt-4 pb-6",
+ className,
+ )}
data-slot="sheet-footer"
- className={cn("mt-auto flex flex-col gap-2 p-4", className)}
{...props}
/>
);
}
-function SheetTitle({
- className,
- ...props
-}: React.ComponentProps<typeof SheetPrimitive.Title>) {
+function SheetTitle({ className, ...props }: SheetPrimitive.Title.Props) {
return (
<SheetPrimitive.Title
+ className={cn(
+ "font-heading font-semibold text-xl leading-none",
+ className,
+ )}
data-slot="sheet-title"
- className={cn("text-foreground font-semibold", className)}
{...props}
/>
);
@@ -115,23 +157,47 @@ function SheetTitle({
function SheetDescription({
className,
...props
-}: React.ComponentProps<typeof SheetPrimitive.Description>) {
+}: SheetPrimitive.Description.Props) {
return (
<SheetPrimitive.Description
- data-slot="sheet-description"
className={cn("text-muted-foreground text-sm", className)}
+ data-slot="sheet-description"
{...props}
/>
);
}
+function SheetPanel({
+ className,
+ scrollFade = true,
+ ...props
+}: React.ComponentProps<"div"> & { scrollFade?: boolean }) {
+ return (
+ <ScrollArea scrollFade={scrollFade}>
+ <div
+ className={cn(
+ "p-6 in-[[data-slot=sheet-popup]:has([data-slot=sheet-header])]:pt-1 in-[[data-slot=sheet-popup]:has([data-slot=sheet-footer]:not(.border-t))]:pb-1",
+ className,
+ )}
+ data-slot="sheet-panel"
+ {...props}
+ />
+ </ScrollArea>
+ );
+}
+
export {
Sheet,
SheetTrigger,
+ SheetPortal,
SheetClose,
- SheetContent,
+ SheetBackdrop,
+ SheetBackdrop as SheetOverlay,
+ SheetPopup,
+ SheetPopup as SheetContent,
SheetHeader,
SheetFooter,
SheetTitle,
SheetDescription,
+ SheetPanel,
};
diff --git a/apps/web/src/components/ui/sidebar.tsx b/apps/web/src/components/ui/sidebar.tsx
index 897adb363..eb9d1c7ac 100644
--- a/apps/web/src/components/ui/sidebar.tsx
+++ b/apps/web/src/components/ui/sidebar.tsx
@@ -1,35 +1,36 @@
-import { Slot } from "@radix-ui/react-slot";
+"use client";
+
+import { mergeProps } from "@base-ui/react/merge-props";
+import { useRender } from "@base-ui/react/use-render";
import { cva, type VariantProps } from "class-variance-authority";
import { PanelLeftIcon } from "lucide-react";
import * as React from "react";
-
+import { useIsMobile } from "@/hooks/use-mobile";
+import { cn } from "@/lib/cn";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
+import { ScrollArea } from "@/components/ui/scroll-area";
import { Separator } from "@/components/ui/separator";
import {
Sheet,
- SheetContent,
SheetDescription,
SheetHeader,
+ SheetPopup,
SheetTitle,
} from "@/components/ui/sheet";
import { Skeleton } from "@/components/ui/skeleton";
import {
Tooltip,
- TooltipContent,
- TooltipProvider,
+ TooltipPopup,
TooltipTrigger,
} from "@/components/ui/tooltip";
-import { shortcuts } from "@/constants/shortcuts";
-import { useIsMobile } from "@/hooks/use-mobile";
-import { cn } from "@/lib/cn";
-import { KbdSequence } from "./kbd";
const SIDEBAR_COOKIE_NAME = "sidebar_state";
const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;
const SIDEBAR_WIDTH = "16rem";
const SIDEBAR_WIDTH_MOBILE = "18rem";
const SIDEBAR_WIDTH_ICON = "3rem";
+const SIDEBAR_KEYBOARD_SHORTCUT = "b";
type SidebarContextProps = {
state: "expanded" | "collapsed";
@@ -73,7 +74,7 @@ function SidebarProvider({
const [_open, _setOpen] = React.useState(defaultOpen);
const open = openProp ?? _open;
const setOpen = React.useCallback(
- (value: boolean | ((value: boolean) => boolean)) => {
+ async (value: boolean | ((value: boolean) => boolean)) => {
const openState = typeof value === "function" ? value(open) : value;
if (setOpenProp) {
setOpenProp(openState);
@@ -82,36 +83,30 @@ function SidebarProvider({
}
// This sets the cookie to keep the sidebar state.
- // biome-ignore lint/suspicious/noDocumentCookie: we need to set the cookie to the sidebar state
- document.cookie = `${SIDEBAR_COOKIE_NAME}=${openState}; path=/; max-age=${SIDEBAR_COOKIE_MAX_AGE}`;
+ await cookieStore.set({
+ expires: Date.now() + SIDEBAR_COOKIE_MAX_AGE * 1000,
+ name: SIDEBAR_COOKIE_NAME,
+ path: "/",
+ value: String(openState),
+ });
},
[setOpenProp, open],
);
// Helper to toggle the sidebar.
- // biome-ignore lint/correctness/useExhaustiveDependencies: we need to use the setOpenMobile function
const toggleSidebar = React.useCallback(() => {
return isMobile ? setOpenMobile((open) => !open) : setOpen((open) => !open);
- }, [isMobile, setOpen, setOpenMobile]);
+ }, [isMobile, setOpen]);
+ // Adds a keyboard shortcut to toggle the sidebar.
React.useEffect(() => {
const handleKeyDown = (event: KeyboardEvent) => {
if (
- event.key === "[" &&
- !event.metaKey &&
- !event.ctrlKey &&
- !event.altKey &&
- !event.shiftKey
+ event.key === SIDEBAR_KEYBOARD_SHORTCUT &&
+ (event.metaKey || event.ctrlKey)
) {
- const target = event.target as HTMLElement;
- if (
- target.tagName !== "INPUT" &&
- target.tagName !== "TEXTAREA" &&
- !target.isContentEditable
- ) {
- event.preventDefault();
- toggleSidebar();
- }
+ event.preventDefault();
+ toggleSidebar();
}
};
@@ -123,41 +118,38 @@ function SidebarProvider({
// This makes it easier to style the sidebar with Tailwind classes.
const state = open ? "expanded" : "collapsed";
- // biome-ignore lint/correctness/useExhaustiveDependencies: we need to use the setOpenMobile function
const contextValue = React.useMemo<SidebarContextProps>(
() => ({
- state,
- open,
- setOpen,
isMobile,
+ open,
openMobile,
+ setOpen,
setOpenMobile,
+ state,
toggleSidebar,
}),
- [state, open, setOpen, isMobile, openMobile, setOpenMobile, toggleSidebar],
+ [state, open, setOpen, isMobile, openMobile, toggleSidebar],
);
return (
<SidebarContext.Provider value={contextValue}>
- <TooltipProvider delayDuration={0}>
- <div
- data-slot="sidebar-wrapper"
- style={
- {
- "--sidebar-width": SIDEBAR_WIDTH,
- "--sidebar-width-icon": SIDEBAR_WIDTH_ICON,
- ...style,
- } as React.CSSProperties
- }
- className={cn(
- "group/sidebar-wrapper has-data-[variant=inset]:bg-sidebar flex min-h-svh w-full",
- className,
- )}
- {...props}
- >
- {children}
- </div>
- </TooltipProvider>
+ <div
+ className={cn(
+ "group/sidebar-wrapper flex min-h-svh w-full has-data-[variant=inset]:bg-sidebar",
+ className,
+ )}
+ data-slot="sidebar-wrapper"
+ style={
+ {
+ "--sidebar-width": SIDEBAR_WIDTH,
+ "--sidebar-width-icon": SIDEBAR_WIDTH_ICON,
+ ...style,
+ } as React.CSSProperties
+ }
+ {...props}
+ >
+ {children}
+ </div>
</SidebarContext.Provider>
);
}
@@ -179,11 +171,11 @@ function Sidebar({
if (collapsible === "none") {
return (
<div
- data-slot="sidebar"
className={cn(
- "bg-sidebar text-sidebar-foreground flex h-full w-(--sidebar-width) flex-col",
+ "flex h-full w-(--sidebar-width) flex-col bg-sidebar text-sidebar-foreground",
className,
)}
+ data-slot="sidebar"
{...props}
>
{children}
@@ -193,41 +185,40 @@ function Sidebar({
if (isMobile) {
return (
- <Sheet open={openMobile} onOpenChange={setOpenMobile} {...props}>
- <SheetContent
+ <Sheet onOpenChange={setOpenMobile} open={openMobile} {...props}>
+ <SheetPopup
+ className="w-(--sidebar-width) bg-sidebar p-0 text-sidebar-foreground [&>button]:hidden"
+ data-mobile="true"
data-sidebar="sidebar"
data-slot="sidebar"
- data-mobile="true"
- className="bg-sidebar text-sidebar-foreground w-(--sidebar-width) p-0 [&>button]:hidden"
+ side={side}
style={
{
"--sidebar-width": SIDEBAR_WIDTH_MOBILE,
} as React.CSSProperties
}
- side={side}
>
<SheetHeader className="sr-only">
<SheetTitle>Sidebar</SheetTitle>
<SheetDescription>Displays the mobile sidebar.</SheetDescription>
</SheetHeader>
<div className="flex h-full w-full flex-col">{children}</div>
- </SheetContent>
+ </SheetPopup>
</Sheet>
);
}
return (
<div
- className="group peer text-sidebar-foreground hidden md:block"
- data-state={state}
+ className="group peer hidden text-sidebar-foreground md:block"
data-collapsible={state === "collapsed" ? collapsible : ""}
- data-variant={variant}
data-side={side}
data-slot="sidebar"
+ data-state={state}
+ data-variant={variant}
>
{/* This is what handles the sidebar gap on desktop */}
<div
- data-slot="sidebar-gap"
className={cn(
"relative w-(--sidebar-width) bg-transparent transition-[width] duration-200 ease-linear",
"group-data-[collapsible=offcanvas]:w-0",
@@ -236,9 +227,9 @@ function Sidebar({
? "group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4)))]"
: "group-data-[collapsible=icon]:w-(--sidebar-width-icon)",
)}
+ data-slot="sidebar-gap"
/>
<div
- data-slot="sidebar-container"
className={cn(
"fixed inset-y-0 z-10 hidden h-svh w-(--sidebar-width) transition-[left,right,width] duration-200 ease-linear md:flex",
side === "left"
@@ -250,12 +241,13 @@ function Sidebar({
: "group-data-[collapsible=icon]:w-(--sidebar-width-icon) group-data-[side=left]:border-r group-data-[side=right]:border-l",
className,
)}
+ data-slot="sidebar-container"
{...props}
>
<div
+ className="flex h-full w-full flex-col bg-sidebar group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:border group-data-[variant=floating]:border-sidebar-border group-data-[variant=floating]:shadow-sm/5"
data-sidebar="sidebar"
data-slot="sidebar-inner"
- className="bg-sidebar group-data-[variant=floating]:border-sidebar-border flex h-full w-full flex-col group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:border group-data-[variant=floating]:shadow-sm"
>
{children}
</div>
@@ -272,38 +264,21 @@ function SidebarTrigger({
const { toggleSidebar } = useSidebar();
return (
- <TooltipProvider>
- <Tooltip>
- <TooltipTrigger asChild>
- <Button
- data-sidebar="trigger"
- data-slot="sidebar-trigger"
- variant="ghost"
- size="icon"
- className={cn("size-7", className)}
- onClick={(event) => {
- onClick?.(event);
- toggleSidebar();
- }}
- {...props}
- >
- <PanelLeftIcon />
- <span className="sr-only">Toggle Sidebar</span>
- </Button>
- </TooltipTrigger>
- <TooltipContent
- side="bottom"
- className="bg-popover text-popover-foreground border"
- >
- <div className="flex items-center gap-2 text-[10px]">
- <KbdSequence
- keys={[shortcuts.sidebar.prefix, shortcuts.sidebar.toggle]}
- description="Toggle sidebar"
- />
- </div>
- </TooltipContent>
- </Tooltip>
- </TooltipProvider>
+ <Button
+ className={cn("size-7", className)}
+ data-sidebar="trigger"
+ data-slot="sidebar-trigger"
+ onClick={(event) => {
+ onClick?.(event);
+ toggleSidebar();
+ }}
+ size="icon"
+ variant="ghost"
+ {...props}
+ >
+ <PanelLeftIcon />
+ <span className="sr-only">Toggle Sidebar</span>
+ </Button>
);
}
@@ -312,21 +287,22 @@ function SidebarRail({ className, ...props }: React.ComponentProps<"button">) {
return (
<button
- data-sidebar="rail"
- data-slot="sidebar-rail"
aria-label="Toggle Sidebar"
- tabIndex={-1}
- onClick={toggleSidebar}
- title="Toggle Sidebar"
className={cn(
- "hover:after:bg-sidebar-border absolute inset-y-0 z-20 hidden w-4 -translate-x-1/2 transition-all ease-linear group-data-[side=left]:-right-4 group-data-[side=right]:left-0 after:absolute after:inset-y-0 after:left-1/2 after:w-[2px] sm:flex",
+ "-translate-x-1/2 group-data-[side=left]:-right-4 absolute inset-y-0 z-20 hidden w-4 transition-all ease-linear after:absolute after:inset-y-0 after:left-1/2 after:w-[2px] hover:after:bg-sidebar-border group-data-[side=right]:left-0 sm:flex",
"in-data-[side=left]:cursor-w-resize in-data-[side=right]:cursor-e-resize",
"[[data-side=left][data-state=collapsed]_&]:cursor-e-resize [[data-side=right][data-state=collapsed]_&]:cursor-w-resize",
- "hover:group-data-[collapsible=offcanvas]:bg-sidebar group-data-[collapsible=offcanvas]:translate-x-0 group-data-[collapsible=offcanvas]:after:left-full",
+ "group-data-[collapsible=offcanvas]:translate-x-0 hover:group-data-[collapsible=offcanvas]:bg-sidebar group-data-[collapsible=offcanvas]:after:left-full",
"[[data-side=left][data-collapsible=offcanvas]_&]:-right-2",
"[[data-side=right][data-collapsible=offcanvas]_&]:-left-2",
className,
)}
+ data-sidebar="rail"
+ data-slot="sidebar-rail"
+ onClick={toggleSidebar}
+ tabIndex={-1}
+ title="Toggle Sidebar"
+ type="button"
{...props}
/>
);
@@ -335,12 +311,12 @@ function SidebarRail({ className, ...props }: React.ComponentProps<"button">) {
function SidebarInset({ className, ...props }: React.ComponentProps<"main">) {
return (
<main
- data-slot="sidebar-inset"
className={cn(
- "bg-background relative flex w-full flex-1 flex-col",
- "md:peer-data-[variant=inset]:m-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow-sm md:peer-data-[variant=inset]:peer-data-[state=collapsed]:ml-2",
+ "relative flex w-full flex-1 flex-col bg-background",
+ "md:peer-data-[variant=inset]:peer-data-[state=collapsed]:ms-2 md:peer-data-[variant=inset]:m-2 md:peer-data-[variant=inset]:ms-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow-sm/5",
className,
)}
+ data-slot="sidebar-inset"
{...props}
/>
);
@@ -352,9 +328,9 @@ function SidebarInput({
}: React.ComponentProps<typeof Input>) {
return (
<Input
- data-slot="sidebar-input"
+ className={cn("h-8 w-full bg-background shadow-none", className)}
data-sidebar="input"
- className={cn("bg-background h-8 w-full shadow-none", className)}
+ data-slot="sidebar-input"
{...props}
/>
);
@@ -363,9 +339,9 @@ function SidebarInput({
function SidebarHeader({ className, ...props }: React.ComponentProps<"div">) {
return (
<div
- data-slot="sidebar-header"
- data-sidebar="header"
className={cn("flex flex-col gap-2 p-2", className)}
+ data-sidebar="header"
+ data-slot="sidebar-header"
{...props}
/>
);
@@ -374,9 +350,9 @@ function SidebarHeader({ className, ...props }: React.ComponentProps<"div">) {
function SidebarFooter({ className, ...props }: React.ComponentProps<"div">) {
return (
<div
- data-slot="sidebar-footer"
- data-sidebar="footer"
className={cn("flex flex-col gap-2 p-2", className)}
+ data-sidebar="footer"
+ data-slot="sidebar-footer"
{...props}
/>
);
@@ -388,9 +364,9 @@ function SidebarSeparator({
}: React.ComponentProps<typeof Separator>) {
return (
<Separator
- data-slot="sidebar-separator"
+ className={cn("mx-2 w-auto bg-sidebar-border", className)}
data-sidebar="separator"
- className={cn("bg-sidebar-border mx-2 w-auto", className)}
+ data-slot="sidebar-separator"
{...props}
/>
);
@@ -398,24 +374,29 @@ function SidebarSeparator({
function SidebarContent({ className, ...props }: React.ComponentProps<"div">) {
return (
- <div
- data-slot="sidebar-content"
- data-sidebar="content"
- className={cn(
- "flex min-h-0 flex-1 flex-col gap-1 overflow-auto group-data-[collapsible=icon]:overflow-hidden",
- className,
- )}
- {...props}
- />
+ <ScrollArea
+ className="**:data-[slot=scroll-area-scrollbar]:hidden"
+ scrollFade
+ >
+ <div
+ className={cn(
+ "flex min-h-0 flex-1 flex-col gap-2 overflow-auto group-data-[collapsible=icon]:overflow-hidden",
+ className,
+ )}
+ data-sidebar="content"
+ data-slot="sidebar-content"
+ {...props}
+ />
+ </ScrollArea>
);
}
function SidebarGroup({ className, ...props }: React.ComponentProps<"div">) {
return (
<div
- data-slot="sidebar-group"
- data-sidebar="group"
className={cn("relative flex w-full min-w-0 flex-col p-2", className)}
+ data-sidebar="group"
+ data-slot="sidebar-group"
{...props}
/>
);
@@ -423,46 +404,48 @@ function SidebarGroup({ className, ...props }: React.ComponentProps<"div">) {
function SidebarGroupLabel({
className,
- asChild = false,
+ render,
...props
-}: React.ComponentProps<"div"> & { asChild?: boolean }) {
- const Comp = asChild ? Slot : "div";
-
- return (
- <Comp
- data-slot="sidebar-group-label"
- data-sidebar="group-label"
- className={cn(
- "text-sidebar-foreground/70 ring-sidebar-ring flex h-8 shrink-0 items-center rounded-md px-2 text-xs font-medium outline-hidden transition-[margin,opacity] duration-200 ease-linear focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
- "group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0",
- className,
- )}
- {...props}
- />
- );
+}: useRender.ComponentProps<"div">) {
+ const defaultProps = {
+ className: cn(
+ "flex h-8 shrink-0 items-center rounded-lg px-2 font-medium text-sidebar-foreground text-xs outline-hidden ring-sidebar-ring transition-[margin,opacity] duration-200 ease-linear focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
+ "group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0",
+ className,
+ ),
+ "data-sidebar": "group-label",
+ "data-slot": "sidebar-group-label",
+ };
+
+ return useRender({
+ defaultTagName: "div",
+ props: mergeProps(defaultProps, props),
+ render,
+ });
}
function SidebarGroupAction({
className,
- asChild = false,
+ render,
...props
-}: React.ComponentProps<"button"> & { asChild?: boolean }) {
- const Comp = asChild ? Slot : "button";
-
- return (
- <Comp
- data-slot="sidebar-group-action"
- data-sidebar="group-action"
- className={cn(
- "text-sidebar-foreground ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground absolute top-3.5 right-3 flex aspect-square w-5 items-center justify-center rounded-md p-0 outline-hidden transition-transform focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
- // Increases the hit area of the button on mobile.
- "after:absolute after:-inset-2 md:after:hidden",
- "group-data-[collapsible=icon]:hidden",
- className,
- )}
- {...props}
- />
- );
+}: useRender.ComponentProps<"button">) {
+ const defaultProps = {
+ className: cn(
+ "absolute top-3.5 right-3 flex aspect-square w-5 items-center justify-center rounded-lg p-0 text-sidebar-foreground outline-hidden ring-sidebar-ring transition-transform hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 [&>svg:not([class*='size-'])]:size-4 [&>svg]:shrink-0",
+ // Increases the hit area of the button on mobile.
+ "after:-inset-2 after:absolute md:after:hidden",
+ "group-data-[collapsible=icon]:hidden",
+ className,
+ ),
+ "data-sidebar": "group-action",
+ "data-slot": "sidebar-group-action",
+ };
+
+ return useRender({
+ defaultTagName: "button",
+ props: mergeProps(defaultProps, props),
+ render,
+ });
}
function SidebarGroupContent({
@@ -471,9 +454,9 @@ function SidebarGroupContent({
}: React.ComponentProps<"div">) {
return (
<div
- data-slot="sidebar-group-content"
- data-sidebar="group-content"
className={cn("w-full text-sm", className)}
+ data-sidebar="group-content"
+ data-slot="sidebar-group-content"
{...props}
/>
);
@@ -482,9 +465,9 @@ function SidebarGroupContent({
function SidebarMenu({ className, ...props }: React.ComponentProps<"ul">) {
return (
<ul
- data-slot="sidebar-menu"
- data-sidebar="menu"
className={cn("flex w-full min-w-0 flex-col gap-1", className)}
+ data-sidebar="menu"
+ data-slot="sidebar-menu"
{...props}
/>
);
@@ -493,65 +476,68 @@ function SidebarMenu({ className, ...props }: React.ComponentProps<"ul">) {
function SidebarMenuItem({ className, ...props }: React.ComponentProps<"li">) {
return (
<li
- data-slot="sidebar-menu-item"
- data-sidebar="menu-item"
className={cn("group/menu-item relative", className)}
+ data-sidebar="menu-item"
+ data-slot="sidebar-menu-item"
{...props}
/>
);
}
const sidebarMenuButtonVariants = cva(
- "peer/menu-button flex w-full items-center gap-2 overflow-hidden rounded-md p-2 text-left text-sm outline-hidden ring-sidebar-ring transition-[width,height,padding] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 group-has-data-[sidebar=menu-action]/menu-item:pr-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-sidebar-accent data-[active=true]:font-medium data-[active=true]:text-sidebar-accent-foreground data-[state=open]:hover:bg-sidebar-accent data-[state=open]:hover:text-sidebar-accent-foreground group-data-[collapsible=icon]:size-8! group-data-[collapsible=icon]:p-2! [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0",
+ "peer/menu-button flex w-full items-center gap-2 overflow-hidden rounded-lg p-2 text-left text-sm outline-hidden ring-sidebar-ring transition-[width,height,padding] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 group-has-data-[sidebar=menu-action]/menu-item:pe-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-sidebar-accent data-[active=true]:font-medium data-[active=true]:text-sidebar-accent-foreground data-[state=open]:hover:bg-sidebar-accent data-[state=open]:hover:text-sidebar-accent-foreground group-data-[collapsible=icon]:size-8! group-data-[collapsible=icon]:p-2! [&>span:last-child]:truncate [&>svg:not([class*='size-'])]:size-4 [&>svg]:shrink-0",
{
+ defaultVariants: {
+ size: "default",
+ variant: "default",
+ },
variants: {
+ size: {
+ default: "h-8 text-sm",
+ lg: "h-12 text-sm group-data-[collapsible=icon]:p-0!",
+ sm: "h-7 text-xs",
+ },
variant: {
default: "hover:bg-sidebar-accent hover:text-sidebar-accent-foreground",
outline:
"bg-background shadow-[0_0_0_1px_hsl(var(--sidebar-border))] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground hover:shadow-[0_0_0_1px_hsl(var(--sidebar-accent))]",
},
- size: {
- default: "h-8 text-sm",
- sm: "h-7 text-xs",
- lg: "h-12 text-sm group-data-[collapsible=icon]:p-0!",
- },
- },
- defaultVariants: {
- variant: "default",
- size: "default",
},
},
);
function SidebarMenuButton({
- asChild = false,
isActive = false,
variant = "default",
size = "default",
tooltip,
className,
+ render,
...props
-}: React.ComponentProps<"button"> & {
- asChild?: boolean;
+}: useRender.ComponentProps<"button"> & {
isActive?: boolean;
- tooltip?: string | React.ComponentProps<typeof TooltipContent>;
+ tooltip?: string | React.ComponentProps<typeof TooltipPopup>;
} & VariantProps<typeof sidebarMenuButtonVariants>) {
- const Comp = asChild ? Slot : "button";
const { isMobile, state } = useSidebar();
- const button = (
- <Comp
- data-slot="sidebar-menu-button"
- data-sidebar="menu-button"
- data-size={size}
- data-active={isActive}
- className={cn(sidebarMenuButtonVariants({ variant, size }), className)}
- {...props}
- />
- );
+ const defaultProps = {
+ className: cn(sidebarMenuButtonVariants({ size, variant }), className),
+ "data-active": isActive,
+ "data-sidebar": "menu-button",
+ "data-size": size,
+ "data-slot": "sidebar-menu-button",
+ };
+
+ const buttonProps = mergeProps<"button">(defaultProps, props);
+
+ const buttonElement = useRender({
+ defaultTagName: "button",
+ props: buttonProps,
+ render,
+ });
if (!tooltip) {
- return button;
+ return buttonElement;
}
if (typeof tooltip === "string") {
@@ -562,11 +548,13 @@ function SidebarMenuButton({
return (
<Tooltip>
- <TooltipTrigger asChild>{button}</TooltipTrigger>
- <TooltipContent
- side="right"
+ <TooltipTrigger
+ render={buttonElement as React.ReactElement<Record<string, unknown>>}
+ />
+ <TooltipPopup
align="center"
hidden={state !== "collapsed" || isMobile}
+ side="right"
{...tooltip}
/>
</Tooltip>
@@ -575,34 +563,34 @@ function SidebarMenuButton({
function SidebarMenuAction({
className,
- asChild = false,
showOnHover = false,
+ render,
...props
-}: React.ComponentProps<"button"> & {
- asChild?: boolean;
+}: useRender.ComponentProps<"button"> & {
showOnHover?: boolean;
}) {
- const Comp = asChild ? Slot : "button";
-
- return (
- <Comp
- data-slot="sidebar-menu-action"
- data-sidebar="menu-action"
- className={cn(
- "text-sidebar-foreground ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground peer-hover/menu-button:text-sidebar-accent-foreground absolute top-1.5 right-1 flex aspect-square w-5 items-center justify-center rounded-md p-0 outline-hidden transition-transform focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
- // Increases the hit area of the button on mobile.
- "after:absolute after:-inset-2 md:after:hidden",
- "peer-data-[size=sm]/menu-button:top-1",
- "peer-data-[size=default]/menu-button:top-1.5",
- "peer-data-[size=lg]/menu-button:top-2.5",
- "group-data-[collapsible=icon]:hidden",
- showOnHover &&
- "peer-data-[active=true]/menu-button:text-sidebar-accent-foreground group-focus-within/menu-item:opacity-100 group-hover/menu-item:opacity-100 data-[state=open]:opacity-100 md:opacity-0",
- className,
- )}
- {...props}
- />
- );
+ const defaultProps = {
+ className: cn(
+ "absolute top-1.5 right-1 flex aspect-square w-5 items-center justify-center rounded-lg p-0 text-sidebar-foreground outline-hidden ring-sidebar-ring transition-transform hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 peer-hover/menu-button:text-sidebar-accent-foreground [&>svg:not([class*='size-'])]:size-4 [&>svg]:shrink-0",
+ // Increases the hit area of the button on mobile.
+ "after:-inset-2 after:absolute md:after:hidden",
+ "peer-data-[size=sm]/menu-button:top-1",
+ "peer-data-[size=default]/menu-button:top-1.5",
+ "peer-data-[size=lg]/menu-button:top-2.5",
+ "group-data-[collapsible=icon]:hidden",
+ showOnHover &&
+ "group-focus-within/menu-item:opacity-100 group-hover/menu-item:opacity-100 data-[state=open]:opacity-100 peer-data-[active=true]/menu-button:text-sidebar-accent-foreground md:opacity-0",
+ className,
+ ),
+ "data-sidebar": "menu-action",
+ "data-slot": "sidebar-menu-action",
+ };
+
+ return useRender({
+ defaultTagName: "button",
+ props: mergeProps<"button">(defaultProps, props),
+ render,
+ });
}
function SidebarMenuBadge({
@@ -611,10 +599,8 @@ function SidebarMenuBadge({
}: React.ComponentProps<"div">) {
return (
<div
- data-slot="sidebar-menu-badge"
- data-sidebar="menu-badge"
className={cn(
- "text-sidebar-foreground pointer-events-none absolute right-1 flex h-5 min-w-5 items-center justify-center rounded-md px-1 text-xs font-medium tabular-nums select-none",
+ "pointer-events-none absolute right-1 flex h-5 min-w-5 select-none items-center justify-center rounded-lg px-1 font-medium text-sidebar-foreground text-xs tabular-nums",
"peer-hover/menu-button:text-sidebar-accent-foreground peer-data-[active=true]/menu-button:text-sidebar-accent-foreground",
"peer-data-[size=sm]/menu-button:top-1",
"peer-data-[size=default]/menu-button:top-1.5",
@@ -622,6 +608,8 @@ function SidebarMenuBadge({
"group-data-[collapsible=icon]:hidden",
className,
)}
+ data-sidebar="menu-badge"
+ data-slot="sidebar-menu-badge"
{...props}
/>
);
@@ -641,14 +629,14 @@ function SidebarMenuSkeleton({
return (
<div
- data-slot="sidebar-menu-skeleton"
+ className={cn("flex h-8 items-center gap-2 rounded-lg px-2", className)}
data-sidebar="menu-skeleton"
- className={cn("flex h-8 items-center gap-2 rounded-md px-2", className)}
+ data-slot="sidebar-menu-skeleton"
{...props}
>
{showIcon && (
<Skeleton
- className="size-4 rounded-md"
+ className="size-4 rounded-lg"
data-sidebar="menu-skeleton-icon"
/>
)}
@@ -668,13 +656,13 @@ function SidebarMenuSkeleton({
function SidebarMenuSub({ className, ...props }: React.ComponentProps<"ul">) {
return (
<ul
- data-slot="sidebar-menu-sub"
- data-sidebar="menu-sub"
className={cn(
- "border-sidebar-border mx-3.5 flex min-w-0 translate-x-px flex-col gap-1 border-l px-2.5 py-0.5",
+ "mx-3.5 flex min-w-0 translate-x-px flex-col gap-1 border-sidebar-border border-l px-2.5 py-0.5",
"group-data-[collapsible=icon]:hidden",
className,
)}
+ data-sidebar="menu-sub"
+ data-slot="sidebar-menu-sub"
{...props}
/>
);
@@ -686,44 +674,44 @@ function SidebarMenuSubItem({
}: React.ComponentProps<"li">) {
return (
<li
- data-slot="sidebar-menu-sub-item"
- data-sidebar="menu-sub-item"
className={cn("group/menu-sub-item relative", className)}
+ data-sidebar="menu-sub-item"
+ data-slot="sidebar-menu-sub-item"
{...props}
/>
);
}
function SidebarMenuSubButton({
- asChild = false,
size = "md",
isActive = false,
className,
+ render,
...props
-}: React.ComponentProps<"a"> & {
- asChild?: boolean;
+}: useRender.ComponentProps<"a"> & {
size?: "sm" | "md";
isActive?: boolean;
}) {
- const Comp = asChild ? Slot : "a";
-
- return (
- <Comp
- data-slot="sidebar-menu-sub-button"
- data-sidebar="menu-sub-button"
- data-size={size}
- data-active={isActive}
- className={cn(
- "text-sidebar-foreground ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground active:bg-sidebar-accent active:text-sidebar-accent-foreground [&>svg]:text-sidebar-accent-foreground flex h-7 min-w-0 -translate-x-px items-center gap-2 overflow-hidden rounded-md px-2 outline-hidden focus-visible:ring-2 disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0",
- "data-[active=true]:bg-sidebar-accent data-[active=true]:text-sidebar-accent-foreground",
- size === "sm" && "text-xs",
- size === "md" && "text-sm",
- "group-data-[collapsible=icon]:hidden",
- className,
- )}
- {...props}
- />
- );
+ const defaultProps = {
+ className: cn(
+ "-translate-x-px flex h-7 min-w-0 items-center gap-2 overflow-hidden rounded-lg px-2 text-sidebar-foreground outline-hidden ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&>span:last-child]:truncate [&>svg:not([class*='size-'])]:size-4 [&>svg]:shrink-0 [&>svg]:text-sidebar-accent-foreground",
+ "data-[active=true]:bg-sidebar-accent data-[active=true]:text-sidebar-accent-foreground",
+ size === "sm" && "text-xs",
+ size === "md" && "text-sm",
+ "group-data-[collapsible=icon]:hidden",
+ className,
+ ),
+ "data-active": isActive,
+ "data-sidebar": "menu-sub-button",
+ "data-size": size,
+ "data-slot": "sidebar-menu-sub-button",
+ };
+
+ return useRender({
+ defaultTagName: "a",
+ props: mergeProps<"a">(defaultProps, props),
+ render,
+ });
}
export {
diff --git a/apps/web/src/components/ui/skeleton.tsx b/apps/web/src/components/ui/skeleton.tsx
index 9ad04384d..479fda7c9 100644
--- a/apps/web/src/components/ui/skeleton.tsx
+++ b/apps/web/src/components/ui/skeleton.tsx
@@ -3,8 +3,11 @@ import { cn } from "@/lib/cn";
function Skeleton({ className, ...props }: React.ComponentProps<"div">) {
return (
<div
+ className={cn(
+ "animate-skeleton rounded-sm [--skeleton-highlight:--alpha(var(--color-white)/64%)] [background:linear-gradient(120deg,transparent_40%,var(--skeleton-highlight),transparent_60%)_var(--color-muted)_0_0/200%_100%_fixed] dark:[--skeleton-highlight:--alpha(var(--color-white)/4%)]",
+ className,
+ )}
data-slot="skeleton"
- className={cn("bg-accent animate-pulse rounded-md", className)}
{...props}
/>
);
diff --git a/apps/web/src/components/ui/slider.tsx b/apps/web/src/components/ui/slider.tsx
new file mode 100644
index 000000000..9e0c2c185
--- /dev/null
+++ b/apps/web/src/components/ui/slider.tsx
@@ -0,0 +1,74 @@
+"use client";
+
+import { Slider as SliderPrimitive } from "@base-ui/react/slider";
+import * as React from "react";
+
+import { cn } from "@/lib/cn";
+
+function Slider({
+ className,
+ children,
+ defaultValue,
+ value,
+ min = 0,
+ max = 100,
+ ...props
+}: SliderPrimitive.Root.Props) {
+ const _values = React.useMemo(() => {
+ if (value !== undefined) {
+ return Array.isArray(value) ? value : [value];
+ }
+ if (defaultValue !== undefined) {
+ return Array.isArray(defaultValue) ? defaultValue : [defaultValue];
+ }
+ return [min];
+ }, [value, defaultValue, min]);
+
+ return (
+ <SliderPrimitive.Root
+ className={cn("data-[orientation=horizontal]:w-full", className)}
+ defaultValue={defaultValue}
+ max={max}
+ min={min}
+ thumbAlignment="edge"
+ value={value}
+ {...props}
+ >
+ {children}
+ <SliderPrimitive.Control
+ className="flex touch-none select-none data-disabled:pointer-events-none data-[orientation=vertical]:h-full data-[orientation=vertical]:min-h-44 data-[orientation=horizontal]:w-full data-[orientation=horizontal]:min-w-44 data-[orientation=vertical]:flex-col data-disabled:opacity-64"
+ data-slot="slider-control"
+ >
+ <SliderPrimitive.Track
+ className="relative grow select-none before:absolute before:rounded-full before:bg-input data-[orientation=horizontal]:h-1 data-[orientation=vertical]:h-full data-[orientation=horizontal]:w-full data-[orientation=vertical]:w-1 data-[orientation=horizontal]:before:inset-x-0.5 data-[orientation=vertical]:before:inset-x-0 data-[orientation=horizontal]:before:inset-y-0 data-[orientation=vertical]:before:inset-y-0.5"
+ data-slot="slider-track"
+ >
+ <SliderPrimitive.Indicator
+ className="select-none rounded-full bg-primary data-[orientation=horizontal]:ms-0.5 data-[orientation=vertical]:mb-0.5"
+ data-slot="slider-indicator"
+ />
+ {Array.from({ length: _values.length }, (_, index) => (
+ <SliderPrimitive.Thumb
+ className="block size-5 shrink-0 select-none rounded-full border border-input bg-background not-dark:bg-clip-padding shadow-xs/5 outline-none transition-[box-shadow,scale] before:absolute before:inset-0 before:rounded-full before:shadow-[0_1px_--theme(--color-black/4%)] has-focus-visible:ring-[3px] has-focus-visible:ring-ring/24 data-dragging:scale-120 sm:size-4 dark:border-background dark:has-focus-visible:ring-ring/48 [:has(*:focus-visible),[data-dragging]]:shadow-none"
+ data-slot="slider-thumb"
+ index={index}
+ key={String(index)}
+ />
+ ))}
+ </SliderPrimitive.Track>
+ </SliderPrimitive.Control>
+ </SliderPrimitive.Root>
+ );
+}
+
+function SliderValue({ className, ...props }: SliderPrimitive.Value.Props) {
+ return (
+ <SliderPrimitive.Value
+ className={cn("flex justify-end text-sm", className)}
+ data-slot="slider-value"
+ {...props}
+ />
+ );
+}
+
+export { Slider, SliderValue };
diff --git a/apps/web/src/components/ui/spinner.tsx b/apps/web/src/components/ui/spinner.tsx
index 6b2d1b711..63c060240 100644
--- a/apps/web/src/components/ui/spinner.tsx
+++ b/apps/web/src/components/ui/spinner.tsx
@@ -1,48 +1,18 @@
-import { cva, type VariantProps } from "class-variance-authority";
-import { Loader2 } from "lucide-react";
+import { Loader2Icon } from "lucide-react";
import { cn } from "@/lib/cn";
-const spinnerVariants = cva("flex-col items-center justify-center", {
- variants: {
- show: {
- true: "flex",
- false: "hidden",
- },
- },
- defaultVariants: {
- show: true,
- },
-});
-
-const loaderVariants = cva("animate-spin text-primary", {
- variants: {
- size: {
- small: "size-6",
- medium: "size-8",
- large: "size-12",
- },
- },
- defaultVariants: {
- size: "medium",
- },
-});
-
-type SpinnerContentProps = VariantProps<typeof spinnerVariants> &
- VariantProps<typeof loaderVariants> & {
- className?: string;
- children?: React.ReactNode;
- };
-
-export function Spinner({
- size,
- show,
- children,
+function Spinner({
className,
-}: SpinnerContentProps) {
+ ...props
+}: React.ComponentProps<typeof Loader2Icon>) {
return (
- <span className={spinnerVariants({ show })}>
- <Loader2 className={cn(loaderVariants({ size }), className)} />
- {children}
- </span>
+ <Loader2Icon
+ aria-label="Loading"
+ className={cn("animate-spin", className)}
+ role="status"
+ {...props}
+ />
);
}
+
+export { Spinner };
diff --git a/apps/web/src/components/ui/switch.tsx b/apps/web/src/components/ui/switch.tsx
index c5d3843ad..3f9852c94 100644
--- a/apps/web/src/components/ui/switch.tsx
+++ b/apps/web/src/components/ui/switch.tsx
@@ -1,27 +1,27 @@
-import * as SwitchPrimitives from "@radix-ui/react-switch";
-import * as React from "react";
+"use client";
+
+import { Switch as SwitchPrimitive } from "@base-ui/react/switch";
import { cn } from "@/lib/cn";
-const Switch = React.forwardRef<
- React.ElementRef<typeof SwitchPrimitives.Root>,
- React.ComponentPropsWithoutRef<typeof SwitchPrimitives.Root>
->(({ className, ...props }, ref) => (
- <SwitchPrimitives.Root
- className={cn(
- "peer inline-flex h-5 w-9 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent shadow-sm transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=unchecked]:bg-input",
- className,
- )}
- {...props}
- ref={ref}
- >
- <SwitchPrimitives.Thumb
+function Switch({ className, ...props }: SwitchPrimitive.Root.Props) {
+ return (
+ <SwitchPrimitive.Root
className={cn(
- "pointer-events-none block h-4 w-4 rounded-full bg-background shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-4 data-[state=unchecked]:translate-x-0",
+ "inline-flex h-[calc(var(--thumb-size)+2px)] w-[calc(var(--thumb-size)*2-2px)] shrink-0 items-center rounded-full p-px outline-none transition-[background-color,box-shadow] duration-200 [--thumb-size:--spacing(5)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-checked:bg-primary data-unchecked:bg-input data-disabled:opacity-64 sm:[--thumb-size:--spacing(4)]",
+ className,
)}
- />
- </SwitchPrimitives.Root>
-));
-Switch.displayName = SwitchPrimitives.Root.displayName;
+ data-slot="switch"
+ {...props}
+ >
+ <SwitchPrimitive.Thumb
+ className={cn(
+ "pointer-events-none block aspect-square h-full origin-left in-[[role=switch]:active,[data-slot=label]:active,[data-slot=field-label]:active]:not-data-disabled:scale-x-110 in-[[role=switch]:active,[data-slot=label]:active,[data-slot=field-label]:active]:rounded-[var(--thumb-size)/calc(var(--thumb-size)*1.1)] rounded-(--thumb-size) bg-background shadow-sm/5 will-change-transform [transition:translate_.15s,border-radius_.15s,scale_.1s_.1s,transform-origin_.15s] data-checked:origin-[var(--thumb-size)_50%] data-checked:translate-x-[calc(var(--thumb-size)-4px)]",
+ )}
+ data-slot="switch-thumb"
+ />
+ </SwitchPrimitive.Root>
+ );
+}
export { Switch };
diff --git a/apps/web/src/components/ui/table.tsx b/apps/web/src/components/ui/table.tsx
index a710704f6..e06e3fe8d 100644
--- a/apps/web/src/components/ui/table.tsx
+++ b/apps/web/src/components/ui/table.tsx
@@ -5,12 +5,15 @@ import { cn } from "@/lib/cn";
function Table({ className, ...props }: React.ComponentProps<"table">) {
return (
<div
- data-slot="table-container"
className="relative w-full overflow-x-auto"
+ data-slot="table-container"
>
<table
+ className={cn(
+ "w-full caption-bottom in-data-[slot=frame]:border-separate in-data-[slot=frame]:border-spacing-0 text-sm",
+ className,
+ )}
data-slot="table"
- className={cn("w-full caption-bottom text-sm", className)}
{...props}
/>
</div>
@@ -20,8 +23,11 @@ function Table({ className, ...props }: React.ComponentProps<"table">) {
function TableHeader({ className, ...props }: React.ComponentProps<"thead">) {
return (
<thead
+ className={cn(
+ "[&_tr]:border-b in-data-[slot=frame]:**:[th]:h-9 in-data-[slot=frame]:*:[tr]:border-none in-data-[slot=frame]:*:[tr]:hover:bg-transparent",
+ className,
+ )}
data-slot="table-header"
- className={cn("[&_tr]:border-b", className)}
{...props}
/>
);
@@ -30,8 +36,11 @@ function TableHeader({ className, ...props }: React.ComponentProps<"thead">) {
function TableBody({ className, ...props }: React.ComponentProps<"tbody">) {
return (
<tbody
+ className={cn(
+ "relative in-data-[slot=frame]:rounded-xl in-data-[slot=frame]:shadow-xs/5 before:pointer-events-none before:absolute before:inset-px not-in-data-[slot=frame]:before:hidden before:rounded-[calc(var(--radius-xl)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] dark:before:shadow-[0_-1px_--theme(--color-white/8%)] [&_tr:last-child]:border-0 in-data-[slot=frame]:*:[tr]:border-0 in-data-[slot=frame]:*:[tr]:*:[td]:border-b in-data-[slot=frame]:*:[tr]:*:[td]:bg-background in-data-[slot=frame]:*:[tr]:*:[td]:bg-clip-padding in-data-[slot=frame]:*:[tr]:first:*:[td]:first:rounded-ss-xl in-data-[slot=frame]:*:[tr]:*:[td]:first:border-s in-data-[slot=frame]:*:[tr]:first:*:[td]:border-t in-data-[slot=frame]:*:[tr]:last:*:[td]:last:rounded-ee-xl in-data-[slot=frame]:*:[tr]:*:[td]:last:border-e in-data-[slot=frame]:*:[tr]:first:*:[td]:last:rounded-se-xl in-data-[slot=frame]:*:[tr]:last:*:[td]:first:rounded-es-xl in-data-[slot=frame]:*:[tr]:hover:*:[td]:bg-transparent in-data-[slot=frame]:*:[tr]:data-[state=selected]:*:[td]:bg-muted/72",
+ className,
+ )}
data-slot="table-body"
- className={cn("[&_tr:last-child]:border-0", className)}
{...props}
/>
);
@@ -40,11 +49,11 @@ function TableBody({ className, ...props }: React.ComponentProps<"tbody">) {
function TableFooter({ className, ...props }: React.ComponentProps<"tfoot">) {
return (
<tfoot
- data-slot="table-footer"
className={cn(
- "bg-muted/50 border-t font-medium [&>tr]:last:border-b-0",
+ "border-t in-data-[slot=frame]:border-none bg-muted/72 in-data-[slot=frame]:bg-transparent font-medium [&>tr]:last:border-b-0 in-data-[slot=frame]:*:[tr]:hover:bg-transparent",
className,
)}
+ data-slot="table-footer"
{...props}
/>
);
@@ -53,11 +62,11 @@ function TableFooter({ className, ...props }: React.ComponentProps<"tfoot">) {
function TableRow({ className, ...props }: React.ComponentProps<"tr">) {
return (
<tr
- data-slot="table-row"
className={cn(
- "hover:bg-muted/50 data-[state=selected]:bg-muted border-b transition-colors",
+ "border-b transition-colors hover:bg-muted/72 in-data-[slot=frame]:hover:bg-transparent data-[state=selected]:bg-muted/72 in-data-[slot=frame]:data-[state=selected]:bg-transparent",
className,
)}
+ data-slot="table-row"
{...props}
/>
);
@@ -66,11 +75,11 @@ function TableRow({ className, ...props }: React.ComponentProps<"tr">) {
function TableHead({ className, ...props }: React.ComponentProps<"th">) {
return (
<th
- data-slot="table-head"
className={cn(
- "text-foreground h-8 px-2 text-left align-middle font-medium whitespace-nowrap [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",
+ "h-10 whitespace-nowrap px-2.5 text-left align-middle font-medium text-muted-foreground leading-none has-[[role=checkbox]]:w-px has-[[role=checkbox]]:pe-0",
className,
)}
+ data-slot="table-head"
{...props}
/>
);
@@ -79,11 +88,11 @@ function TableHead({ className, ...props }: React.ComponentProps<"th">) {
function TableCell({ className, ...props }: React.ComponentProps<"td">) {
return (
<td
- data-slot="table-cell"
className={cn(
- "p-2 align-middle whitespace-nowrap [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",
+ "whitespace-nowrap p-2.5 align-middle leading-none in-data-[slot=frame]:first:p-[calc(--spacing(2.5)-1px)] in-data-[slot=frame]:last:p-[calc(--spacing(2.5)-1px)] has-[[role=checkbox]]:pe-0",
className,
)}
+ data-slot="table-cell"
{...props}
/>
);
@@ -95,8 +104,11 @@ function TableCaption({
}: React.ComponentProps<"caption">) {
return (
<caption
+ className={cn(
+ "in-data-[slot=frame]:my-4 mt-4 text-muted-foreground text-sm",
+ className,
+ )}
data-slot="table-caption"
- className={cn("text-muted-foreground mt-4 text-sm", className)}
{...props}
/>
);
diff --git a/apps/web/src/components/ui/tabs.tsx b/apps/web/src/components/ui/tabs.tsx
index 44d7a8412..c8b121e0f 100644
--- a/apps/web/src/components/ui/tabs.tsx
+++ b/apps/web/src/components/ui/tabs.tsx
@@ -1,53 +1,87 @@
-import * as TabsPrimitive from "@radix-ui/react-tabs";
-import * as React from "react";
+"use client";
+
+import { Tabs as TabsPrimitive } from "@base-ui/react/tabs";
import { cn } from "@/lib/cn";
-const Tabs = TabsPrimitive.Root;
-
-const TabsList = React.forwardRef<
- React.ElementRef<typeof TabsPrimitive.List>,
- React.ComponentPropsWithoutRef<typeof TabsPrimitive.List>
->(({ className, ...props }, ref) => (
- <TabsPrimitive.List
- ref={ref}
- className={cn(
- "inline-flex h-9 items-center justify-center rounded-lg bg-muted p-1 text-muted-foreground",
- className,
- )}
- {...props}
- />
-));
-TabsList.displayName = TabsPrimitive.List.displayName;
-
-const TabsTrigger = React.forwardRef<
- React.ElementRef<typeof TabsPrimitive.Trigger>,
- React.ComponentPropsWithoutRef<typeof TabsPrimitive.Trigger>
->(({ className, ...props }, ref) => (
- <TabsPrimitive.Trigger
- ref={ref}
- className={cn(
- "inline-flex items-center justify-center whitespace-nowrap rounded-md px-3 py-1 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow",
- className,
- )}
- {...props}
- />
-));
-TabsTrigger.displayName = TabsPrimitive.Trigger.displayName;
-
-const TabsContent = React.forwardRef<
- React.ElementRef<typeof TabsPrimitive.Content>,
- React.ComponentPropsWithoutRef<typeof TabsPrimitive.Content>
->(({ className, ...props }, ref) => (
- <TabsPrimitive.Content
- ref={ref}
- className={cn(
- "mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
- className,
- )}
- {...props}
- />
-));
-TabsContent.displayName = TabsPrimitive.Content.displayName;
-
-export { Tabs, TabsList, TabsTrigger, TabsContent };
+type TabsVariant = "default" | "underline";
+
+function Tabs({ className, ...props }: TabsPrimitive.Root.Props) {
+ return (
+ <TabsPrimitive.Root
+ className={cn(
+ "flex flex-col gap-2 data-[orientation=vertical]:flex-row",
+ className,
+ )}
+ data-slot="tabs"
+ {...props}
+ />
+ );
+}
+
+function TabsList({
+ variant = "default",
+ className,
+ children,
+ ...props
+}: TabsPrimitive.List.Props & {
+ variant?: TabsVariant;
+}) {
+ return (
+ <TabsPrimitive.List
+ className={cn(
+ "relative z-0 flex w-fit items-center justify-center gap-x-0.5 text-muted-foreground",
+ "data-[orientation=vertical]:flex-col",
+ variant === "default"
+ ? "rounded-lg bg-muted p-0.5 text-muted-foreground/72"
+ : "data-[orientation=vertical]:px-1 data-[orientation=horizontal]:py-1 *:data-[slot=tabs-tab]:hover:bg-accent",
+ className,
+ )}
+ data-slot="tabs-list"
+ {...props}
+ >
+ {children}
+ <TabsPrimitive.Indicator
+ className={cn(
+ "-translate-y-(--active-tab-bottom) absolute bottom-0 left-0 h-(--active-tab-height) w-(--active-tab-width) translate-x-(--active-tab-left) transition-[width,translate] duration-200 ease-in-out",
+ variant === "underline"
+ ? "data-[orientation=vertical]:-translate-x-px z-10 bg-primary data-[orientation=horizontal]:h-0.5 data-[orientation=vertical]:w-0.5 data-[orientation=horizontal]:translate-y-px"
+ : "-z-1 rounded-md bg-background shadow-sm/5 dark:bg-input",
+ )}
+ data-slot="tab-indicator"
+ />
+ </TabsPrimitive.List>
+ );
+}
+
+function TabsTab({ className, ...props }: TabsPrimitive.Tab.Props) {
+ return (
+ <TabsPrimitive.Tab
+ className={cn(
+ "[&_svg]:-mx-0.5 relative flex h-9 shrink-0 grow cursor-pointer items-center justify-center gap-1.5 whitespace-nowrap rounded-md border border-transparent px-[calc(--spacing(2.5)-1px)] font-medium text-base outline-none transition-[color,background-color,box-shadow] hover:text-muted-foreground focus-visible:ring-2 focus-visible:ring-ring data-disabled:pointer-events-none data-[orientation=vertical]:w-full data-[orientation=vertical]:justify-start data-active:text-foreground data-disabled:opacity-64 sm:h-8 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ className,
+ )}
+ data-slot="tabs-tab"
+ {...props}
+ />
+ );
+}
+
+function TabsPanel({ className, ...props }: TabsPrimitive.Panel.Props) {
+ return (
+ <TabsPrimitive.Panel
+ className={cn("flex-1 outline-none", className)}
+ data-slot="tabs-content"
+ {...props}
+ />
+ );
+}
+
+export {
+ Tabs,
+ TabsList,
+ TabsTab,
+ TabsTab as TabsTrigger,
+ TabsPanel,
+ TabsPanel as TabsContent,
+};
diff --git a/apps/web/src/components/ui/textarea.tsx b/apps/web/src/components/ui/textarea.tsx
index c7ee2acb2..3ab4a83d7 100644
--- a/apps/web/src/components/ui/textarea.tsx
+++ b/apps/web/src/components/ui/textarea.tsx
@@ -1,17 +1,51 @@
+"use client";
+
+import { Field as FieldPrimitive } from "@base-ui/react/field";
+import { mergeProps } from "@base-ui/react/merge-props";
import type * as React from "react";
+
import { cn } from "@/lib/cn";
-function Textarea({ className, ...props }: React.ComponentProps<"textarea">) {
+type TextareaProps = React.ComponentProps<"textarea"> & {
+ size?: "sm" | "default" | "lg" | number;
+ unstyled?: boolean;
+};
+
+function Textarea({
+ className,
+ size = "default",
+ unstyled = false,
+ ...props
+}: TextareaProps) {
return (
- <textarea
- data-slot="textarea"
- className={cn(
- "border-input placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 flex field-sizing-content min-h-16 w-full rounded-md border bg-transparent px-3 py-2 text-base shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
- className,
- )}
- {...props}
- />
+ <span
+ className={
+ cn(
+ !unstyled &&
+ "relative inline-flex w-full rounded-lg border border-input bg-background not-dark:bg-clip-padding text-base text-foreground shadow-xs/5 ring-ring/24 transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] has-focus-visible:has-aria-invalid:border-destructive/64 has-focus-visible:has-aria-invalid:ring-destructive/16 has-aria-invalid:border-destructive/36 has-focus-visible:border-ring has-disabled:opacity-64 has-[:disabled,:focus-visible,[aria-invalid]]:shadow-none has-focus-visible:ring-[3px] not-has-disabled:has-not-focus-visible:not-has-aria-invalid:before:shadow-[0_1px_--theme(--color-black/4%)] sm:text-sm dark:bg-input/32 dark:has-aria-invalid:ring-destructive/24 dark:not-has-disabled:has-not-focus-visible:not-has-aria-invalid:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ className,
+ ) || undefined
+ }
+ data-size={size}
+ data-slot="textarea-control"
+ >
+ <FieldPrimitive.Control
+ render={(defaultProps) => (
+ <textarea
+ className={cn(
+ "field-sizing-content min-h-17.5 w-full rounded-[inherit] px-[calc(--spacing(3)-1px)] py-[calc(--spacing(1.5)-1px)] outline-none max-sm:min-h-20.5",
+ size === "sm" &&
+ "min-h-16.5 px-[calc(--spacing(2.5)-1px)] py-[calc(--spacing(1)-1px)] max-sm:min-h-19.5",
+ size === "lg" &&
+ "min-h-18.5 py-[calc(--spacing(2)-1px)] max-sm:min-h-21.5",
+ )}
+ data-slot="textarea"
+ {...mergeProps(defaultProps, props)}
+ />
+ )}
+ />
+ </span>
);
}
-export { Textarea };
+export { Textarea, type TextareaProps };
diff --git a/apps/web/src/components/ui/toast.tsx b/apps/web/src/components/ui/toast.tsx
new file mode 100644
index 000000000..46ddf9b82
--- /dev/null
+++ b/apps/web/src/components/ui/toast.tsx
@@ -0,0 +1,269 @@
+"use client";
+
+import { Toast } from "@base-ui/react/toast";
+import {
+ CircleAlertIcon,
+ CircleCheckIcon,
+ InfoIcon,
+ LoaderCircleIcon,
+ TriangleAlertIcon,
+} from "lucide-react";
+
+import { cn } from "@/lib/cn";
+import { buttonVariants } from "@/components/ui/button";
+
+const toastManager = Toast.createToastManager();
+const anchoredToastManager = Toast.createToastManager();
+
+const TOAST_ICONS = {
+ error: CircleAlertIcon,
+ info: InfoIcon,
+ loading: LoaderCircleIcon,
+ success: CircleCheckIcon,
+ warning: TriangleAlertIcon,
+} as const;
+
+type ToastPosition =
+ | "top-left"
+ | "top-center"
+ | "top-right"
+ | "bottom-left"
+ | "bottom-center"
+ | "bottom-right";
+
+interface ToastProviderProps extends Toast.Provider.Props {
+ position?: ToastPosition;
+}
+
+function ToastProvider({
+ children,
+ position = "bottom-right",
+ ...props
+}: ToastProviderProps) {
+ return (
+ <Toast.Provider toastManager={toastManager} {...props}>
+ {children}
+ <Toasts position={position} />
+ </Toast.Provider>
+ );
+}
+
+function Toasts({ position = "bottom-right" }: { position: ToastPosition }) {
+ const { toasts } = Toast.useToastManager();
+ const isTop = position.startsWith("top");
+
+ return (
+ <Toast.Portal data-slot="toast-portal">
+ <Toast.Viewport
+ className={cn(
+ "fixed z-50 mx-auto flex w-[calc(100%-var(--toast-inset)*2)] max-w-90 [--toast-inset:--spacing(4)] sm:[--toast-inset:--spacing(8)]",
+ // Vertical positioning
+ "data-[position*=top]:top-(--toast-inset)",
+ "data-[position*=bottom]:bottom-(--toast-inset)",
+ // Horizontal positioning
+ "data-[position*=left]:left-(--toast-inset)",
+ "data-[position*=right]:right-(--toast-inset)",
+ "data-[position*=center]:-translate-x-1/2 data-[position*=center]:left-1/2",
+ )}
+ data-position={position}
+ data-slot="toast-viewport"
+ >
+ {toasts.map((toast) => {
+ const Icon = toast.type
+ ? TOAST_ICONS[toast.type as keyof typeof TOAST_ICONS]
+ : null;
+
+ return (
+ <Toast.Root
+ className={cn(
+ "absolute z-[calc(9999-var(--toast-index))] h-(--toast-calc-height) w-full select-none rounded-lg border bg-popover not-dark:bg-clip-padding text-popover-foreground shadow-lg/5 [transition:transform_.5s_cubic-bezier(.22,1,.36,1),opacity_.5s,height_.15s] before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ // Base positioning using data-position
+ "data-[position*=right]:right-0 data-[position*=right]:left-auto",
+ "data-[position*=left]:right-auto data-[position*=left]:left-0",
+ "data-[position*=center]:right-0 data-[position*=center]:left-0",
+ "data-[position*=top]:top-0 data-[position*=top]:bottom-auto data-[position*=top]:origin-top",
+ "data-[position*=bottom]:top-auto data-[position*=bottom]:bottom-0 data-[position*=bottom]:origin-bottom",
+ // Gap fill for hover
+ "after:absolute after:left-0 after:h-[calc(var(--toast-gap)+1px)] after:w-full",
+ "data-[position*=top]:after:top-full",
+ "data-[position*=bottom]:after:bottom-full",
+ // Define some variables
+ "[--toast-calc-height:var(--toast-frontmost-height,var(--toast-height))] [--toast-gap:--spacing(3)] [--toast-peek:--spacing(3)] [--toast-scale:calc(max(0,1-(var(--toast-index)*.1)))] [--toast-shrink:calc(1-var(--toast-scale))]",
+ // Define offset-y variable
+ "data-[position*=top]:[--toast-calc-offset-y:calc(var(--toast-offset-y)+var(--toast-index)*var(--toast-gap)+var(--toast-swipe-movement-y))]",
+ "data-[position*=bottom]:[--toast-calc-offset-y:calc(var(--toast-offset-y)*-1+var(--toast-index)*var(--toast-gap)*-1+var(--toast-swipe-movement-y))]",
+ // Default state transform
+ "data-[position*=top]:transform-[translateX(var(--toast-swipe-movement-x))_translateY(calc(var(--toast-swipe-movement-y)+(var(--toast-index)*var(--toast-peek))+(var(--toast-shrink)*var(--toast-calc-height))))_scale(var(--toast-scale))]",
+ "data-[position*=bottom]:transform-[translateX(var(--toast-swipe-movement-x))_translateY(calc(var(--toast-swipe-movement-y)-(var(--toast-index)*var(--toast-peek))-(var(--toast-shrink)*var(--toast-calc-height))))_scale(var(--toast-scale))]",
+ // Limited state
+ "data-limited:opacity-0",
+ // Expanded state
+ "data-expanded:h-(--toast-height)",
+ "data-position:data-expanded:transform-[translateX(var(--toast-swipe-movement-x))_translateY(var(--toast-calc-offset-y))]",
+ // Starting and ending animations
+ "data-[position*=top]:data-starting-style:transform-[translateY(calc(-100%-var(--toast-inset)))]",
+ "data-[position*=bottom]:data-starting-style:transform-[translateY(calc(100%+var(--toast-inset)))]",
+ "data-ending-style:opacity-0",
+ // Ending animations (direction-aware)
+ "data-ending-style:not-data-limited:not-data-swipe-direction:transform-[translateY(calc(100%+var(--toast-inset)))]",
+ "data-ending-style:data-[swipe-direction=left]:transform-[translateX(calc(var(--toast-swipe-movement-x)-100%-var(--toast-inset)))_translateY(var(--toast-calc-offset-y))]",
+ "data-ending-style:data-[swipe-direction=right]:transform-[translateX(calc(var(--toast-swipe-movement-x)+100%+var(--toast-inset)))_translateY(var(--toast-calc-offset-y))]",
+ "data-ending-style:data-[swipe-direction=up]:transform-[translateY(calc(var(--toast-swipe-movement-y)-100%-var(--toast-inset)))]",
+ "data-ending-style:data-[swipe-direction=down]:transform-[translateY(calc(var(--toast-swipe-movement-y)+100%+var(--toast-inset)))]",
+ // Ending animations (expanded)
+ "data-expanded:data-ending-style:data-[swipe-direction=left]:transform-[translateX(calc(var(--toast-swipe-movement-x)-100%-var(--toast-inset)))_translateY(var(--toast-calc-offset-y))]",
+ "data-expanded:data-ending-style:data-[swipe-direction=right]:transform-[translateX(calc(var(--toast-swipe-movement-x)+100%+var(--toast-inset)))_translateY(var(--toast-calc-offset-y))]",
+ "data-expanded:data-ending-style:data-[swipe-direction=up]:transform-[translateY(calc(var(--toast-swipe-movement-y)-100%-var(--toast-inset)))]",
+ "data-expanded:data-ending-style:data-[swipe-direction=down]:transform-[translateY(calc(var(--toast-swipe-movement-y)+100%+var(--toast-inset)))]",
+ )}
+ data-position={position}
+ key={toast.id}
+ swipeDirection={
+ position.includes("center")
+ ? [isTop ? "up" : "down"]
+ : position.includes("left")
+ ? ["left", isTop ? "up" : "down"]
+ : ["right", isTop ? "up" : "down"]
+ }
+ toast={toast}
+ >
+ <Toast.Content className="pointer-events-auto flex items-center justify-between gap-1.5 overflow-hidden px-3.5 py-3 text-sm transition-opacity duration-250 data-behind:not-data-expanded:pointer-events-none data-behind:opacity-0 data-expanded:opacity-100">
+ <div className="flex gap-2">
+ {Icon && (
+ <div
+ className="[&>svg]:h-lh [&>svg]:w-4 [&_svg]:pointer-events-none [&_svg]:shrink-0"
+ data-slot="toast-icon"
+ >
+ <Icon className="in-data-[type=loading]:animate-spin in-data-[type=error]:text-destructive in-data-[type=info]:text-info in-data-[type=success]:text-success in-data-[type=warning]:text-warning in-data-[type=loading]:opacity-80" />
+ </div>
+ )}
+
+ <div className="flex flex-col gap-0.5">
+ <Toast.Title
+ className="font-medium"
+ data-slot="toast-title"
+ />
+ <Toast.Description
+ className="text-muted-foreground"
+ data-slot="toast-description"
+ />
+ </div>
+ </div>
+ {toast.actionProps && (
+ <Toast.Action
+ className={buttonVariants({ size: "xs" })}
+ data-slot="toast-action"
+ >
+ {toast.actionProps.children}
+ </Toast.Action>
+ )}
+ </Toast.Content>
+ </Toast.Root>
+ );
+ })}
+ </Toast.Viewport>
+ </Toast.Portal>
+ );
+}
+
+function AnchoredToastProvider({ children, ...props }: Toast.Provider.Props) {
+ return (
+ <Toast.Provider toastManager={anchoredToastManager} {...props}>
+ {children}
+ <AnchoredToasts />
+ </Toast.Provider>
+ );
+}
+
+function AnchoredToasts() {
+ const { toasts } = Toast.useToastManager();
+
+ return (
+ <Toast.Portal data-slot="toast-portal-anchored">
+ <Toast.Viewport
+ className="outline-none"
+ data-slot="toast-viewport-anchored"
+ >
+ {toasts.map((toast) => {
+ const Icon = toast.type
+ ? TOAST_ICONS[toast.type as keyof typeof TOAST_ICONS]
+ : null;
+ const tooltipStyle =
+ (toast.data as { tooltipStyle?: boolean })?.tooltipStyle ?? false;
+ const positionerProps = toast.positionerProps;
+
+ if (!positionerProps?.anchor) {
+ return null;
+ }
+
+ return (
+ <Toast.Positioner
+ className="z-50 max-w-[min(--spacing(64),var(--available-width))]"
+ data-slot="toast-positioner"
+ key={toast.id}
+ sideOffset={positionerProps.sideOffset ?? 4}
+ toast={toast}
+ >
+ <Toast.Root
+ className={cn(
+ "relative text-balance border bg-popover not-dark:bg-clip-padding text-popover-foreground text-xs transition-[scale,opacity] before:pointer-events-none before:absolute before:inset-0 before:shadow-[0_1px_--theme(--color-black/4%)] data-ending-style:scale-98 data-starting-style:scale-98 data-ending-style:opacity-0 data-starting-style:opacity-0 dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ tooltipStyle
+ ? "rounded-md shadow-md/5 before:rounded-[calc(var(--radius-md)-1px)]"
+ : "rounded-lg shadow-lg/5 before:rounded-[calc(var(--radius-lg)-1px)]",
+ )}
+ data-slot="toast-popup"
+ toast={toast}
+ >
+ {tooltipStyle ? (
+ <Toast.Content className="pointer-events-auto px-2 py-1">
+ <Toast.Title data-slot="toast-title" />
+ </Toast.Content>
+ ) : (
+ <Toast.Content className="pointer-events-auto flex items-center justify-between gap-1.5 overflow-hidden px-3.5 py-3 text-sm">
+ <div className="flex gap-2">
+ {Icon && (
+ <div
+ className="[&>svg]:h-lh [&>svg]:w-4 [&_svg]:pointer-events-none [&_svg]:shrink-0"
+ data-slot="toast-icon"
+ >
+ <Icon className="in-data-[type=loading]:animate-spin in-data-[type=error]:text-destructive in-data-[type=info]:text-info in-data-[type=success]:text-success in-data-[type=warning]:text-warning in-data-[type=loading]:opacity-80" />
+ </div>
+ )}
+
+ <div className="flex flex-col gap-0.5">
+ <Toast.Title
+ className="font-medium"
+ data-slot="toast-title"
+ />
+ <Toast.Description
+ className="text-muted-foreground"
+ data-slot="toast-description"
+ />
+ </div>
+ </div>
+ {toast.actionProps && (
+ <Toast.Action
+ className={buttonVariants({ size: "xs" })}
+ data-slot="toast-action"
+ >
+ {toast.actionProps.children}
+ </Toast.Action>
+ )}
+ </Toast.Content>
+ )}
+ </Toast.Root>
+ </Toast.Positioner>
+ );
+ })}
+ </Toast.Viewport>
+ </Toast.Portal>
+ );
+}
+
+export {
+ ToastProvider,
+ type ToastPosition,
+ toastManager,
+ AnchoredToastProvider,
+ anchoredToastManager,
+};
diff --git a/apps/web/src/components/ui/toggle-group.tsx b/apps/web/src/components/ui/toggle-group.tsx
new file mode 100644
index 000000000..8d001a41f
--- /dev/null
+++ b/apps/web/src/components/ui/toggle-group.tsx
@@ -0,0 +1,102 @@
+"use client";
+
+import type { Toggle as TogglePrimitive } from "@base-ui/react/toggle";
+import { ToggleGroup as ToggleGroupPrimitive } from "@base-ui/react/toggle-group";
+import type { VariantProps } from "class-variance-authority";
+import * as React from "react";
+
+import { cn } from "@/lib/cn";
+import { Separator } from "@/components/ui/separator";
+import {
+ Toggle as ToggleComponent,
+ type toggleVariants,
+} from "@/components/ui/toggle";
+
+const ToggleGroupContext = React.createContext<
+ VariantProps<typeof toggleVariants>
+>({
+ size: "default",
+ variant: "default",
+});
+
+function ToggleGroup({
+ className,
+ variant = "default",
+ size = "default",
+ orientation = "horizontal",
+ children,
+ ...props
+}: ToggleGroupPrimitive.Props & VariantProps<typeof toggleVariants>) {
+ return (
+ <ToggleGroupPrimitive
+ className={cn(
+ "flex w-fit *:focus-visible:z-10 dark:*:[[data-slot=separator]:has(+[data-slot=toggle]:hover)]:before:bg-input/64 dark:*:[[data-slot=separator]:has(+[data-slot=toggle][data-pressed])]:before:bg-input dark:*:[[data-slot=toggle]:hover+[data-slot=separator]]:before:bg-input/64 dark:*:[[data-slot=toggle][data-pressed]+[data-slot=separator]]:before:bg-input",
+ orientation === "horizontal"
+ ? "*:pointer-coarse:after:min-w-auto"
+ : "*:pointer-coarse:after:min-h-auto",
+ variant === "default"
+ ? "gap-0.5"
+ : orientation === "horizontal"
+ ? "*:not-first:not-data-[slot=separator]:before:-start-[0.5px] *:not-last:not-data-[slot=separator]:before:-end-[0.5px] *:not-first:rounded-s-none *:not-last:rounded-e-none *:not-first:border-s-0 *:not-last:border-e-0 *:not-first:before:rounded-s-none *:not-last:before:rounded-e-none"
+ : "*:not-first:not-data-[slot=separator]:before:-top-[0.5px] *:not-last:not-data-[slot=separator]:before:-bottom-[0.5px] flex-col *:not-first:rounded-t-none *:not-last:rounded-b-none *:not-first:border-t-0 *:not-last:border-b-0 *:not-first:before:rounded-t-none *:not-last:before:rounded-b-none *:data-[slot=toggle]:not-last:before:hidden dark:*:last:before:hidden dark:*:first:before:block",
+ className,
+ )}
+ data-size={size}
+ data-slot="toggle-group"
+ data-variant={variant}
+ orientation={orientation}
+ {...props}
+ >
+ <ToggleGroupContext.Provider value={{ size, variant }}>
+ {children}
+ </ToggleGroupContext.Provider>
+ </ToggleGroupPrimitive>
+ );
+}
+
+function Toggle({
+ className,
+ children,
+ variant,
+ size,
+ ...props
+}: TogglePrimitive.Props & VariantProps<typeof toggleVariants>) {
+ const context = React.useContext(ToggleGroupContext);
+
+ const resolvedVariant = context.variant || variant;
+ const resolvedSize = context.size || size;
+
+ return (
+ <ToggleComponent
+ className={className}
+ data-size={resolvedSize}
+ data-variant={resolvedVariant}
+ size={resolvedSize}
+ variant={resolvedVariant}
+ {...props}
+ >
+ {children}
+ </ToggleComponent>
+ );
+}
+
+function ToggleGroupSeparator({
+ className,
+ orientation = "vertical",
+ ...props
+}: {
+ className?: string;
+} & React.ComponentProps<typeof Separator>) {
+ return (
+ <Separator
+ className={cn(
+ "pointer-events-none relative bg-input before:absolute before:inset-0 dark:before:bg-input/32",
+ className,
+ )}
+ orientation={orientation}
+ {...props}
+ />
+ );
+}
+
+export { ToggleGroup, Toggle, Toggle as ToggleGroupItem, ToggleGroupSeparator };
diff --git a/apps/web/src/components/ui/toggle.tsx b/apps/web/src/components/ui/toggle.tsx
new file mode 100644
index 000000000..c04f29a37
--- /dev/null
+++ b/apps/web/src/components/ui/toggle.tsx
@@ -0,0 +1,45 @@
+"use client";
+
+import { Toggle as TogglePrimitive } from "@base-ui/react/toggle";
+import { cva, type VariantProps } from "class-variance-authority";
+
+import { cn } from "@/lib/cn";
+
+const toggleVariants = cva(
+ "[&_svg]:-mx-0.5 relative inline-flex shrink-0 cursor-pointer select-none items-center justify-center gap-2 whitespace-nowrap rounded-lg border font-medium text-base text-foreground outline-none transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11 hover:bg-accent focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background disabled:pointer-events-none disabled:opacity-64 data-pressed:bg-input/64 data-pressed:text-accent-foreground sm:text-sm [&_svg:not([class*='opacity-'])]:opacity-80 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ {
+ defaultVariants: {
+ size: "default",
+ variant: "default",
+ },
+ variants: {
+ size: {
+ default: "h-9 min-w-9 px-[calc(--spacing(2)-1px)] sm:h-8 sm:min-w-8",
+ lg: "h-10 min-w-10 px-[calc(--spacing(2.5)-1px)] sm:h-9 sm:min-w-9",
+ sm: "h-8 min-w-8 px-[calc(--spacing(1.5)-1px)] sm:h-7 sm:min-w-7",
+ },
+ variant: {
+ default: "border-transparent",
+ outline:
+ "border-input bg-background not-dark:bg-clip-padding shadow-xs/5 not-disabled:not-active:not-data-pressed:before:shadow-[0_1px_--theme(--color-black/4%)] dark:bg-input/32 dark:data-pressed:bg-input dark:hover:bg-input/64 dark:not-disabled:not-active:not-data-pressed:before:shadow-[0_-1px_--theme(--color-white/6%)] dark:not-disabled:not-data-pressed:before:shadow-[0_-1px_--theme(--color-white/2%)] [:disabled,:active,[data-pressed]]:shadow-none",
+ },
+ },
+ },
+);
+
+function Toggle({
+ className,
+ variant,
+ size,
+ ...props
+}: TogglePrimitive.Props & VariantProps<typeof toggleVariants>) {
+ return (
+ <TogglePrimitive
+ className={cn(toggleVariants({ className, size, variant }))}
+ data-slot="toggle"
+ {...props}
+ />
+ );
+}
+
+export { Toggle, toggleVariants };
diff --git a/apps/web/src/components/ui/toolbar.tsx b/apps/web/src/components/ui/toolbar.tsx
new file mode 100644
index 000000000..2b3a19e45
--- /dev/null
+++ b/apps/web/src/components/ui/toolbar.tsx
@@ -0,0 +1,83 @@
+"use client";
+
+import { Toolbar as ToolbarPrimitive } from "@base-ui/react/toolbar";
+
+import { cn } from "@/lib/cn";
+
+function Toolbar({ className, ...props }: ToolbarPrimitive.Root.Props) {
+ return (
+ <ToolbarPrimitive.Root
+ className={cn(
+ "relative flex gap-2 rounded-xl border bg-card not-dark:bg-clip-padding p-1 text-card-foreground",
+ className,
+ )}
+ data-slot="toolbar"
+ {...props}
+ />
+ );
+}
+
+function ToolbarButton({ className, ...props }: ToolbarPrimitive.Button.Props) {
+ return (
+ <ToolbarPrimitive.Button
+ className={cn(className)}
+ data-slot="toolbar-button"
+ {...props}
+ />
+ );
+}
+
+function ToolbarLink({ className, ...props }: ToolbarPrimitive.Link.Props) {
+ return (
+ <ToolbarPrimitive.Link
+ className={cn(className)}
+ data-slot="toolbar-link"
+ {...props}
+ />
+ );
+}
+
+function ToolbarInput({ className, ...props }: ToolbarPrimitive.Input.Props) {
+ return (
+ <ToolbarPrimitive.Input
+ className={cn(className)}
+ data-slot="toolbar-input"
+ {...props}
+ />
+ );
+}
+
+function ToolbarGroup({ className, ...props }: ToolbarPrimitive.Group.Props) {
+ return (
+ <ToolbarPrimitive.Group
+ className={cn("flex items-center gap-1", className)}
+ data-slot="toolbar-group"
+ {...props}
+ />
+ );
+}
+
+function ToolbarSeparator({
+ className,
+ ...props
+}: ToolbarPrimitive.Separator.Props) {
+ return (
+ <ToolbarPrimitive.Separator
+ className={cn(
+ "shrink-0 bg-border data-[orientation=horizontal]:my-0.5 data-[orientation=vertical]:my-1.5 data-[orientation=horizontal]:h-px data-[orientation=horizontal]:w-full data-[orientation=vertical]:w-px data-[orientation=vertical]:not-[[class^='h-']]:not-[[class*='_h-']]:self-stretch",
+ className,
+ )}
+ data-slot="toolbar-separator"
+ {...props}
+ />
+ );
+}
+
+export {
+ Toolbar,
+ ToolbarGroup,
+ ToolbarSeparator,
+ ToolbarButton,
+ ToolbarLink,
+ ToolbarInput,
+};
diff --git a/apps/web/src/components/ui/tooltip.tsx b/apps/web/src/components/ui/tooltip.tsx
index 780d25b2a..c0fb3d7c5 100644
--- a/apps/web/src/components/ui/tooltip.tsx
+++ b/apps/web/src/components/ui/tooltip.tsx
@@ -1,60 +1,68 @@
"use client";
-import * as TooltipPrimitive from "@radix-ui/react-tooltip";
-import type * as React from "react";
+import { Tooltip as TooltipPrimitive } from "@base-ui/react/tooltip";
import { cn } from "@/lib/cn";
-function TooltipProvider({
- delayDuration = 500,
- ...props
-}: React.ComponentProps<typeof TooltipPrimitive.Provider>) {
- return (
- <TooltipPrimitive.Provider
- data-slot="tooltip-provider"
- delayDuration={delayDuration}
- {...props}
- />
- );
-}
+const TooltipCreateHandle = TooltipPrimitive.createHandle;
-function Tooltip({
- ...props
-}: React.ComponentProps<typeof TooltipPrimitive.Root>) {
- return (
- <TooltipProvider>
- <TooltipPrimitive.Root data-slot="tooltip" {...props} />
- </TooltipProvider>
- );
-}
+const TooltipProvider = TooltipPrimitive.Provider;
-function TooltipTrigger({
- ...props
-}: React.ComponentProps<typeof TooltipPrimitive.Trigger>) {
+const Tooltip = TooltipPrimitive.Root;
+
+function TooltipTrigger(props: TooltipPrimitive.Trigger.Props) {
return <TooltipPrimitive.Trigger data-slot="tooltip-trigger" {...props} />;
}
-function TooltipContent({
+function TooltipPopup({
className,
- sideOffset = 0,
+ align = "center",
+ sideOffset = 4,
+ side = "top",
+ anchor,
children,
...props
-}: React.ComponentProps<typeof TooltipPrimitive.Content>) {
+}: TooltipPrimitive.Popup.Props & {
+ align?: TooltipPrimitive.Positioner.Props["align"];
+ side?: TooltipPrimitive.Positioner.Props["side"];
+ sideOffset?: TooltipPrimitive.Positioner.Props["sideOffset"];
+ anchor?: TooltipPrimitive.Positioner.Props["anchor"];
+}) {
return (
<TooltipPrimitive.Portal>
- <TooltipPrimitive.Content
- data-slot="tooltip-content"
- sideOffset={sideOffset || 16}
- className={cn(
- "bg-popover text-popover-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-fit origin-(--radix-tooltip-content-transform-origin) rounded px-2 py-1 text-[11px] text-balance border border-border/50",
- className,
- )}
- {...props}
+ <TooltipPrimitive.Positioner
+ align={align}
+ anchor={anchor}
+ className="z-50 h-(--positioner-height) w-(--positioner-width) max-w-(--available-width) transition-[top,left,right,bottom,transform] data-instant:transition-none"
+ data-slot="tooltip-positioner"
+ side={side}
+ sideOffset={sideOffset}
>
- {children}
- </TooltipPrimitive.Content>
+ <TooltipPrimitive.Popup
+ className={cn(
+ "relative flex h-(--popup-height,auto) w-(--popup-width,auto) origin-(--transform-origin) text-balance rounded-md border bg-popover not-dark:bg-clip-padding text-popover-foreground text-xs shadow-md/5 transition-[width,height,scale,opacity] before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-md)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] data-ending-style:scale-98 data-starting-style:scale-98 data-ending-style:opacity-0 data-starting-style:opacity-0 data-instant:duration-0 dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ className,
+ )}
+ data-slot="tooltip-popup"
+ {...props}
+ >
+ <TooltipPrimitive.Viewport
+ className="relative size-full overflow-clip px-(--viewport-inline-padding) py-1 [--viewport-inline-padding:--spacing(2)] data-instant:transition-none **:data-current:data-ending-style:opacity-0 **:data-current:data-starting-style:opacity-0 **:data-previous:data-ending-style:opacity-0 **:data-previous:data-starting-style:opacity-0 **:data-current:w-[calc(var(--popup-width)-2*var(--viewport-inline-padding)-2px)] **:data-previous:w-[calc(var(--popup-width)-2*var(--viewport-inline-padding)-2px)] **:data-previous:truncate **:data-current:opacity-100 **:data-previous:opacity-100 **:data-current:transition-opacity **:data-previous:transition-opacity"
+ data-slot="tooltip-viewport"
+ >
+ {children}
+ </TooltipPrimitive.Viewport>
+ </TooltipPrimitive.Popup>
+ </TooltipPrimitive.Positioner>
</TooltipPrimitive.Portal>
);
}
-export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };
+export {
+ TooltipCreateHandle,
+ TooltipProvider,
+ Tooltip,
+ TooltipTrigger,
+ TooltipPopup,
+ TooltipPopup as TooltipContent,
+};
diff --git a/apps/web/src/components/user-avatar.tsx b/apps/web/src/components/user-avatar.tsx
index c1e12d00f..6105805d1 100644
--- a/apps/web/src/components/user-avatar.tsx
+++ b/apps/web/src/components/user-avatar.tsx
@@ -2,7 +2,7 @@ import { useQueryClient } from "@tanstack/react-query";
import { useNavigate } from "@tanstack/react-router";
import { LogOut, Settings } from "lucide-react";
import * as React from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { useAuth } from "@/components/providers/auth-provider/hooks/use-auth";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { Button } from "@/components/ui/button";
@@ -59,10 +59,10 @@ export function UserAvatar() {
<PopoverTrigger asChild>
<Button
variant="ghost"
- size="sm"
- className="h-6 w-6 rounded-full p-0 hover:bg-secondary/50"
+ size="icon"
+ className="h-7 w-7 rounded-full p-0 hover:bg-sidebar-accent/70"
>
- <Avatar className="h-6 w-6">
+ <Avatar className="h-7 w-7">
<AvatarImage src={user.image ?? ""} alt={user.name || ""} />
<AvatarFallback className="text-xs font-medium border border-border/30">
{initials}
diff --git a/apps/web/src/components/workspace-switcher.tsx b/apps/web/src/components/workspace-switcher.tsx
index 3352f8d04..dd5afcc7e 100644
--- a/apps/web/src/components/workspace-switcher.tsx
+++ b/apps/web/src/components/workspace-switcher.tsx
@@ -1,13 +1,17 @@
import { useNavigate } from "@tanstack/react-router";
-import { ChevronDown, Plus } from "lucide-react";
+import { ChevronDown } from "lucide-react";
import * as React from "react";
import {
- Popover,
- PopoverContent,
- PopoverTrigger,
-} from "@/components/ui/popover";
-import { Separator } from "@/components/ui/separator";
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuGroup,
+ DropdownMenuItem,
+ DropdownMenuLabel,
+ DropdownMenuSeparator,
+ DropdownMenuShortcut,
+ DropdownMenuTrigger,
+} from "@/components/ui/menu";
import {
SidebarMenu,
SidebarMenuButton,
@@ -105,98 +109,79 @@ export function WorkspaceSwitcher() {
<div className="flex items-center justify-between w-full gap-2">
<SidebarMenu>
<SidebarMenuItem>
- <Popover open={isOpen} onOpenChange={setIsOpen}>
- <PopoverTrigger asChild>
- <SidebarMenuButton
- size="sm"
- className="h-8 py-0 w-auto w-full group"
- >
- <div className="flex items-end gap-2 min-w-0 w-full">
- <div className="bg-primary flex aspect-square size-5 items-end justify-center rounded-sm">
- <span className="text-xs font-medium text-white">
- {workspace.name.charAt(0).toUpperCase()}
- </span>
- </div>
- <span
- className={`truncate text-sm text-foreground/90 font-medium ${isSwitching ? "opacity-50" : ""}`}
- >
- {workspace.name}
- </span>
- </div>
- <ChevronDown
- className={`ml-1 size-3 text-muted-foreground/50 opacity-0 group-hover:opacity-100 data-[state=open]:opacity-100 data-[state=open]:rotate-180 transition-all duration-500 ease-out ${isSwitching ? "animate-spin" : ""}`}
- data-state={isOpen ? "open" : "closed"}
+ <DropdownMenu open={isOpen} onOpenChange={setIsOpen}>
+ <DropdownMenuTrigger
+ render={
+ <SidebarMenuButton
+ className="group h-9 w-full rounded-md px-2.5 text-sidebar-foreground data-[active=true]:bg-sidebar-accent/60"
+ size="default"
/>
- </SidebarMenuButton>
- </PopoverTrigger>
- <PopoverContent
- className="w-fit min-w-48 p-0 rounded-lg"
+ }
+ >
+ <div className="flex items-center min-w-0 w-full">
+ <span
+ className={`truncate text-base font-medium text-sidebar-foreground ${isSwitching ? "opacity-50" : ""}`}
+ >
+ {workspace.name}
+ </span>
+ </div>
+ <ChevronDown
+ className={`ml-1 size-4 text-sidebar-foreground/85 opacity-90 group-hover:opacity-100 data-[state=open]:opacity-100 data-[state=open]:rotate-180 transition-all duration-200 ease-out ${isSwitching ? "animate-spin" : ""}`}
+ data-state={isOpen ? "open" : "closed"}
+ />
+ </DropdownMenuTrigger>
+ <DropdownMenuContent
+ className="min-w-56 text-sidebar-foreground"
align="start"
side="bottom"
sideOffset={4}
>
- <div className="p-3">
- <div className="text-muted-foreground/60 text-xs">
- Workspaces
- </div>
- </div>
-
- <Separator />
-
- <div className="p-1">
- {workspaces?.map((ws: Workspace, index: number) => (
- <button
- type="button"
- key={ws.id}
- onClick={() => {
+ <DropdownMenuGroup>
+ <DropdownMenuLabel>Workspaces</DropdownMenuLabel>
+ </DropdownMenuGroup>
+ <DropdownMenuSeparator />
+
+ {workspaces?.map((ws: Workspace, index: number) => (
+ <DropdownMenuItem
+ key={ws.id}
+ onClick={() => {
+ if (!isSwitching && ws.id !== workspace.id) {
handleWorkspaceChange(ws);
setIsOpen(false);
- }}
- disabled={isSwitching || ws.id === workspace.id}
- className={`w-full flex items-center gap-2 px-2 py-1.5 hover:bg-secondary/80 focus:bg-secondary/80 rounded-sm transition-colors text-sm font-normal ${isSwitching || ws.id === workspace.id ? "opacity-50 cursor-not-allowed" : ""}`}
- >
- <div className="bg-muted/20 border border-border/30 flex size-5 items-center justify-center rounded-sm">
- <span className="text-xs font-medium text-muted-foreground">
- {ws.name.charAt(0).toUpperCase()}
- </span>
- </div>
- <span className="text-foreground/90 flex-1 text-left">
- {isSwitching && ws.id === workspace?.id
- ? "Switching..."
- : ws.name}
- </span>
- <span className="text-xs text-muted-foreground/50">
- {getModifierKeyText()} {index > 8 ? "0" : index + 1}
- </span>
- </button>
- ))}
- </div>
-
- <Separator />
-
- <div className="p-1">
- <button
- type="button"
- className="w-full flex items-center gap-2 px-2 py-1.5 hover:bg-secondary/80 focus:bg-secondary/80 rounded-sm transition-colors text-sm font-normal"
- onClick={() => {
- setIsCreateWorkspaceModalOpen(true);
- setIsOpen(false);
+ }
}}
+ disabled={isSwitching || ws.id === workspace.id}
+ className="h-8 text-sm data-highlighted:bg-sidebar-accent data-highlighted:text-sidebar-accent-foreground"
>
- <div className="bg-muted/20 border border-border/30 flex size-5 items-center justify-center rounded-sm">
- <Plus className="size-3 text-muted-foreground" />
- </div>
- <span className="text-muted-foreground flex-1 text-left">
- Add workspace
+ <span className="flex-1 text-left">
+ {isSwitching && ws.id === workspace?.id
+ ? "Switching..."
+ : ws.name}
</span>
- </button>
- </div>
- </PopoverContent>
- </Popover>
+ <DropdownMenuShortcut>
+ {getModifierKeyText()} {index > 8 ? "0" : index + 1}
+ </DropdownMenuShortcut>
+ </DropdownMenuItem>
+ ))}
+
+ <DropdownMenuSeparator />
+ <DropdownMenuItem
+ onClick={() => {
+ setIsCreateWorkspaceModalOpen(true);
+ setIsOpen(false);
+ }}
+ className="h-8 text-sm data-highlighted:bg-sidebar-accent data-highlighted:text-sidebar-accent-foreground"
+ >
+ <span>Add workspace</span>
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
</SidebarMenuItem>
</SidebarMenu>
- <UserAvatar />
+ <div className="h-7 w-7 shrink-0">
+ <UserAvatar />
+ </div>
</div>
<CreateWorkspaceModal
diff --git a/apps/web/src/constants/label-colors.ts b/apps/web/src/constants/label-colors.ts
index 741c55f7b..bc7d63055 100644
--- a/apps/web/src/constants/label-colors.ts
+++ b/apps/web/src/constants/label-colors.ts
@@ -1,13 +1,13 @@
const labelColors = [
- { value: "gray", label: "Stone", color: "#78716c" },
- { value: "dark-gray", label: "Slate", color: "#64748b" },
- { value: "purple", label: "Lavender", color: "#8b5cf6" },
- { value: "teal", label: "Sage", color: "#059669" },
- { value: "green", label: "Forest", color: "#16a34a" },
- { value: "yellow", label: "Amber", color: "#d97706" },
- { value: "orange", label: "Terracotta", color: "#ea580c" },
- { value: "pink", label: "Rose", color: "#e11d48" },
- { value: "red", label: "Crimson", color: "#dc2626" },
+ { value: "gray", label: "Stone", color: "var(--color-stone-500)" },
+ { value: "dark-gray", label: "Slate", color: "var(--color-slate-500)" },
+ { value: "purple", label: "Lavender", color: "var(--color-violet-500)" },
+ { value: "teal", label: "Sage", color: "var(--color-emerald-600)" },
+ { value: "green", label: "Forest", color: "var(--color-green-600)" },
+ { value: "yellow", label: "Amber", color: "var(--color-amber-600)" },
+ { value: "orange", label: "Terracotta", color: "var(--color-orange-600)" },
+ { value: "pink", label: "Rose", color: "var(--color-rose-600)" },
+ { value: "red", label: "Crimson", color: "var(--color-red-600)" },
];
export default labelColors;
diff --git a/apps/web/src/constants/priority-colors.ts b/apps/web/src/constants/priority-colors.ts
index f5d1fad05..e8d0abb7e 100644
--- a/apps/web/src/constants/priority-colors.ts
+++ b/apps/web/src/constants/priority-colors.ts
@@ -1,13 +1,13 @@
export const priorityColorsFilter = {
- low: "text-blue-700 dark:text-blue-500",
- medium: "text-yellow-700 dark:text-yellow-500",
- high: "text-orange-700 dark:text-orange-500",
- urgent: "text-red-700 dark:text-red-500",
+ low: "text-info-foreground",
+ medium: "text-warning-foreground/85",
+ high: "text-warning-foreground",
+ urgent: "text-destructive-foreground",
};
export const priorityColorsTaskCard = {
- low: "text-blue-700 dark:text-blue-500",
- medium: "text-yellow-700 dark:text-yellow-500",
- high: "text-orange-700 dark:text-orange-500",
- urgent: "text-red-700 dark:text-red-500",
+ low: "text-info-foreground",
+ medium: "text-warning-foreground/85",
+ high: "text-warning-foreground",
+ urgent: "text-destructive-foreground",
};
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index fbc822f22..2bc3dd0fe 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -1,315 +1,355 @@
-@import url('https://fonts.googleapis.com/css2?family=Geist:[email protected]&display=swap');
-@import 'tailwindcss';
-
-@custom-variant dark (&:is(.dark *));
-
-@layer base {
- :root {
- color-scheme: light;
- --font-geist: 'Geist', sans-serif;
- --background: oklch(0.9881 0 0);
- --foreground: oklch(0.1881 0.0060 285.8056);
- --card: oklch(1.0000 0 0);
- --card-foreground: oklch(0.1881 0.0060 285.8056);
- --card-gradient: linear-gradient(to bottom right, oklch(1.0000 0 0), oklch(1.0000 0 0), oklch(0.9881 0 0));
- --popover: oklch(0.9881 0 0);
- --popover-foreground: oklch(0.1881 0.0060 285.8056);
- --primary: oklch(0.5820 0.2289 272.7771);
- --primary-foreground: oklch(0.9851 0 0);
- --secondary: oklch(0.9524 0.0013 286.3747);
- --secondary-foreground: oklch(0.1881 0.0060 285.8056);
- --muted: oklch(0.9674 0.0013 286.3752);
- --muted-foreground: oklch(0.5343 0.0139 285.9192);
- --accent: oklch(0.9524 0.0013 286.3747);
- --accent-foreground: oklch(0.1881 0.0060 285.8056);
- --destructive: oklch(0.5785 0.2138 27.1723);
- --destructive-foreground: oklch(0.9851 0 0);
- --border: oklch(0.8714 0.0068 286.2574);
- --input: oklch(0.8714 0.0068 286.2574);
- --ring: oklch(0.5820 0.2289 272.7771);
- --chart-1: oklch(0.8688 0.1348 154.6144);
- --chart-2: oklch(0.5820 0.2289 272.7771);
- --chart-3: oklch(0.7118 0.0129 286.0665);
- --chart-4: oklch(0.9197 0.0040 286.3202);
- --chart-5: oklch(0.5343 0.0139 285.9192);
- --sidebar: oklch(0.9794 0.0013 286.3747);
- --sidebar-foreground: oklch(0.1881 0.0060 285.8056);
- --sidebar-primary: oklch(0.5820 0.2289 272.7771);
- --sidebar-primary-foreground: oklch(1.0000 0 0);
- --sidebar-accent: oklch(0.9674 0.0013 286.3752);
- --sidebar-accent-foreground: oklch(0.1881 0.0060 285.8056);
- --sidebar-border: oklch(0.8714 0.0068 286.2574);
- --sidebar-ring: oklch(0.5820 0.2289 272.7771);
- --font-sans: 'Inter', system-ui, sans-serif;
- --font-serif: 'Georgia', serif;
- --font-mono: 'JetBrains Mono', 'Fira Code', monospace;
- --radius: 0.5rem;
- --shadow-2xs: 0px 1px 2px 0px hsl(0 0% 0% / 0.09);
- --shadow-xs: 0px 1px 2px 0px hsl(0 0% 0% / 0.09);
- --shadow-sm: 0px 1px 2px 0px hsl(0 0% 0% / 0.18), 0px 1px 2px -1px hsl(0 0% 0% / 0.18);
- --shadow: 0px 1px 2px 0px hsl(0 0% 0% / 0.18), 0px 1px 2px -1px hsl(0 0% 0% / 0.18);
- --shadow-md: 0px 1px 2px 0px hsl(0 0% 0% / 0.18), 0px 2px 4px -1px hsl(0 0% 0% / 0.18);
- --shadow-lg: 0px 1px 2px 0px hsl(0 0% 0% / 0.18), 0px 4px 6px -1px hsl(0 0% 0% / 0.18);
- --shadow-xl: 0px 1px 2px 0px hsl(0 0% 0% / 0.18), 0px 8px 10px -1px hsl(0 0% 0% / 0.18);
- --shadow-2xl: 0px 1px 2px 0px hsl(0 0% 0% / 0.45);
- --tracking-normal: 0em;
- --spacing: 0.25rem;
- }
-
- .dark {
- color-scheme: dark;
- --font-geist: 'Geist', sans-serif;
- --background: oklch(0.1252 0.0018 286.1313);
- --foreground: oklch(0.9674 0.0013 286.3752);
- --card: oklch(0.1717 0.0018 286.2103);
- --card-foreground: oklch(0.9674 0.0013 286.3752);
- --card-gradient: linear-gradient(to bottom right, rgb(24 24 27), rgb(24 24 27), rgb(39 39 42));
- --popover: oklch(0.2100 0.0025 286.1774);
- --popover-foreground: oklch(0.9674 0.0013 286.3752);
- --primary: oklch(0.5820 0.2289 272.7771);
- --primary-foreground: oklch(0.1252 0.0018 286.1313);
- --secondary: oklch(0.2120 0.0047 285.9459);
- --secondary-foreground: oklch(0.9674 0.0013 286.3752);
- --muted: oklch(0.1903 0.0049 285.8852);
- --muted-foreground: oklch(0.6879 0.0091 286.1398);
- --accent: oklch(0.2332 0.0046 285.9939);
- --accent-foreground: oklch(0.9674 0.0013 286.3752);
- --destructive: oklch(0.5618 0.1955 26.2182);
- --destructive-foreground: oklch(0.9674 0.0013 286.3752);
- --border: oklch(0.2947 0.0061 285.9873);
- --input: oklch(0.2539 0.0045 286.0326);
- --ring: oklch(0.5820 0.2289 272.7771);
- --chart-1: oklch(0.7362 0.0089 286.1606);
- --chart-2: oklch(0.5820 0.2289 272.7771);
- --chart-3: oklch(0.6944 0.0090 286.1428);
- --chart-4: oklch(0.4356 0.0103 285.9442);
- --chart-5: oklch(0.5213 0.0129 285.9271);
- --sidebar: oklch(0.1903 0.0049 285.8852);
- --sidebar-foreground: oklch(0.9674 0.0013 286.3752);
- --sidebar-primary: oklch(0.5820 0.2289 272.7771);
- --sidebar-primary-foreground: oklch(0.1903 0.0049 285.8852);
- --sidebar-accent: oklch(0.2332 0.0046 285.9939);
- --sidebar-accent-foreground: oklch(0.9674 0.0013 286.3752);
- --sidebar-border: oklch(0.2947 0.0061 285.9873);
- --sidebar-ring: oklch(0.5820 0.2289 272.7771);
- --font-sans: 'Inter', system-ui, sans-serif;
- --font-serif: 'Georgia', serif;
- --font-mono: 'JetBrains Mono', 'Fira Code', monospace;
- --radius: 0.5rem;
- --shadow-2xs: 0px 1px 2px 0px hsl(0 0% 0% / 0.09);
- --shadow-xs: 0px 1px 2px 0px hsl(0 0% 0% / 0.09);
- --shadow-sm: 0px 1px 2px 0px hsl(0 0% 0% / 0.18), 0px 1px 2px -1px hsl(0 0% 0% / 0.18);
- --shadow: 0px 1px 2px 0px hsl(0 0% 0% / 0.18), 0px 1px 2px -1px hsl(0 0% 0% / 0.18);
- --shadow-md: 0px 1px 2px 0px hsl(0 0% 0% / 0.18), 0px 2px 4px -1px hsl(0 0% 0% / 0.18);
- --shadow-lg: 0px 1px 2px 0px hsl(0 0% 0% / 0.18), 0px 4px 6px -1px hsl(0 0% 0% / 0.18);
- --shadow-xl: 0px 1px 2px 0px hsl(0 0% 0% / 0.18), 0px 8px 10px -1px hsl(0 0% 0% / 0.18);
- --shadow-2xl: 0px 1px 2px 0px hsl(0 0% 0% / 0.45);
- --tracking-normal: 0em;
- --spacing: 0.25rem;
- }
-
- * {
- scrollbar-width: thin;
- }
-
- *::-webkit-scrollbar {
- width: 6px;
- height: 6px;
- }
-
- *::-webkit-scrollbar-thumb {
- background-color: hsl(var(--muted));
- border-radius: 9999px;
- }
-
- .dark *::-webkit-scrollbar-thumb {
- background-color: hsl(var(--muted));
- }
-
- *::-webkit-scrollbar-track {
- background-color: transparent;
- }
-
- *,
- ::after,
- ::before,
- ::backdrop,
- ::file-selector-button {
- border-color: var(--color-border, currentColor);
- }
-
- button {
- cursor: pointer;
- }
-
- body {
- @apply bg-background text-foreground antialiased;
- }
+@import "tailwindcss";
+
+@font-face {
+ font-family: "Cal Sans UI";
+ src: url("./assets/fonts/CalSansUI[MODE,wght].woff2") format("woff2");
+ font-display: swap;
+ font-style: normal;
+ font-weight: 300 700;
}
-@theme inline {
- --font-geist: var(--font-geist);
- --color-background: var(--background);
- --color-foreground: var(--foreground);
- --color-card: var(--card);
- --color-card-foreground: var(--card-foreground);
- --color-card-gradient: var(--card-gradient);
- --color-popover: var(--popover);
- --color-popover-foreground: var(--popover-foreground);
- --color-primary: var(--primary);
- --color-primary-foreground: var(--primary-foreground);
- --color-secondary: var(--secondary);
- --color-secondary-foreground: var(--secondary-foreground);
- --color-muted: var(--muted);
- --color-muted-foreground: var(--muted-foreground);
- --color-accent: var(--accent);
- --color-accent-foreground: var(--accent-foreground);
- --color-destructive: var(--destructive);
- --color-destructive-foreground: var(--destructive-foreground);
- --color-border: var(--border);
- --color-input: var(--input);
- --color-ring: var(--ring);
- --color-chart-1: var(--chart-1);
- --color-chart-2: var(--chart-2);
- --color-chart-3: var(--chart-3);
- --color-chart-4: var(--chart-4);
- --color-chart-5: var(--chart-5);
- --color-sidebar: var(--sidebar);
- --color-sidebar-foreground: var(--sidebar-foreground);
- --color-sidebar-primary: var(--sidebar-primary);
- --color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
- --color-sidebar-accent: var(--sidebar-accent);
- --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
- --color-sidebar-border: var(--sidebar-border);
- --color-sidebar-ring: var(--sidebar-ring);
-
- --font-sans: var(--font-sans);
- --font-mono: var(--font-mono);
- --font-serif: var(--font-serif);
-
- --radius-sm: calc(var(--radius) - 4px);
- --radius-md: calc(var(--radius) - 2px);
- --radius-lg: var(--radius);
- --radius-xl: calc(var(--radius) + 4px);
-
- --shadow-2xs: var(--shadow-2xs);
- --shadow-xs: var(--shadow-xs);
- --shadow-sm: var(--shadow-sm);
- --shadow: var(--shadow);
- --shadow-md: var(--shadow-md);
- --shadow-lg: var(--shadow-lg);
- --shadow-xl: var(--shadow-xl);
- --shadow-2xl: var(--shadow-2xl);
-
- --tracking-normal: var(--tracking-normal);
- --spacing: var(--spacing);
+@font-face {
+ font-family: "Cal Sans Heading";
+ src: url("./assets/fonts/CalSans-SemiBold.woff2") format("woff2");
+ font-display: swap;
+ font-style: normal;
+ font-weight: 600;
}
-@layer utilities {
- .bg-card-gradient {
- background: var(--card-gradient);
- }
+@font-face {
+ font-family: "Paper Mono";
+ src: url("./assets/fonts/PaperMono-Regular.woff2") format("woff2");
+ font-display: swap;
+ font-style: normal;
+ font-weight: 400;
}
-/* View Transitions for Theme Switching */
-@supports (view-transition-name: none) {
- ::view-transition-old(root),
- ::view-transition-new(root) {
- animation: none;
- mix-blend-mode: normal;
- }
+@custom-variant dark (&:is(.dark *));
- ::view-transition-old(root) {
- /* Ensure the outgoing view (old theme) is beneath */
- z-index: 0;
- }
+@theme inline {
+ --animate-skeleton: skeleton 2s -1s infinite linear;
+ --font-sans: var(--font-sans);
+ --font-heading: var(--font-heading);
+ --font-mono: var(--font-mono);
+ --color-chart-1: var(--chart-1);
+ --color-chart-2: var(--chart-2);
+ --color-chart-3: var(--chart-3);
+ --color-chart-4: var(--chart-4);
+ --color-chart-5: var(--chart-5);
+ --color-warning-foreground: var(--warning-foreground);
+ --color-warning: var(--warning);
+ --color-success-foreground: var(--success-foreground);
+ --color-success: var(--success);
+ --color-secondary-foreground: var(--secondary-foreground);
+ --color-secondary: var(--secondary);
+ --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
+ --color-sidebar-accent: var(--sidebar-accent);
+ --color-sidebar-border: var(--sidebar-border);
+ --color-sidebar-foreground: var(--sidebar-foreground);
+ --color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
+ --color-sidebar-primary: var(--sidebar-primary);
+ --color-sidebar-ring: var(--sidebar-ring);
+ --color-sidebar: var(--sidebar);
+ --color-ring: var(--ring);
+ --color-primary-foreground: var(--primary-foreground);
+ --color-primary: var(--primary);
+ --color-popover-foreground: var(--popover-foreground);
+ --color-popover: var(--popover);
+ --color-muted-foreground: var(--muted-foreground);
+ --color-muted: var(--muted);
+ --color-input: var(--input);
+ --color-info-foreground: var(--info-foreground);
+ --color-info: var(--info);
+ --color-foreground: var(--foreground);
+ --color-destructive-foreground: var(--destructive-foreground);
+ --color-destructive: var(--destructive);
+ --color-card-foreground: var(--card-foreground);
+ --color-card: var(--card);
+ --color-code-foreground: var(--code-foreground);
+ --color-code-highlight: var(--code-highlight);
+ --color-code: var(--code);
+ --color-border: var(--border);
+ --color-background: var(--background);
+ --color-accent-foreground: var(--accent-foreground);
+ --color-accent: var(--accent);
+ --radius-sm: calc(var(--radius) - 4px);
+ --radius-md: calc(var(--radius) - 2px);
+ --radius-lg: var(--radius);
+ --radius-xl: calc(var(--radius) + 4px);
+ @keyframes skeleton {
+ to {
+ background-position: -200% 0;
+ }
+ }
+}
- ::view-transition-new(root) {
- /* Ensure the incoming view (new theme) is always on top */
- z-index: 1;
- /* Apply the reveal animation */
- animation: reveal 0.4s ease-in-out forwards;
- }
+:root {
+ --font-sans:
+ "Cal Sans UI",
+ ui-sans-serif,
+ system-ui,
+ sans-serif;
+ --font-heading: "Cal Sans Heading", var(--font-sans);
+ --font-mono:
+ "Paper Mono",
+ ui-monospace,
+ SFMono-Regular,
+ Menlo,
+ Monaco,
+ Consolas,
+ "Liberation Mono",
+ "Courier New",
+ monospace;
+ --radius: 0.625rem;
+ --accent: --alpha(var(--color-black) / 4%);
+ --accent-foreground: var(--color-neutral-800);
+ --background: var(--color-white);
+ --border: --alpha(var(--color-black) / 8%);
+ --card: var(--color-white);
+ --card-foreground: var(--color-neutral-800);
+ --destructive: var(--color-red-500);
+ --destructive-foreground: var(--color-red-700);
+ --foreground: var(--color-neutral-800);
+ --info: var(--color-blue-500);
+ --info-foreground: var(--color-blue-700);
+ --input: --alpha(var(--color-black) / 10%);
+ --muted: --alpha(var(--color-black) / 4%);
+ --muted-foreground: color-mix(in srgb, var(--color-neutral-500) 90%, var(--color-black));
+ --popover: var(--color-white);
+ --popover-foreground: var(--color-neutral-800);
+ --primary: var(--color-neutral-800);
+ --primary-foreground: var(--color-neutral-50);
+ --ring: var(--color-neutral-400);
+ --secondary: --alpha(var(--color-black) / 4%);
+ --secondary-foreground: var(--color-neutral-800);
+ --success: var(--color-emerald-500);
+ --success-foreground: var(--color-emerald-700);
+ --warning: var(--color-amber-500);
+ --warning-foreground: var(--color-amber-700);
+ --chart-1: var(--color-orange-600);
+ --chart-2: var(--color-teal-600);
+ --chart-3: var(--color-cyan-900);
+ --chart-4: var(--color-amber-400);
+ --chart-5: var(--color-amber-500);
+ --sidebar: var(--color-neutral-50);
+ --sidebar-foreground: color-mix(
+ in srgb,
+ var(--color-neutral-800) 64%,
+ var(--sidebar)
+ );
+ --sidebar-primary: var(--color-neutral-800);
+ --sidebar-primary-foreground: var(--color-neutral-50);
+ --sidebar-accent: --alpha(var(--color-black) / 4%);
+ --sidebar-accent-foreground: var(--color-neutral-800);
+ --sidebar-border: --alpha(var(--color-black) / 6%);
+ --sidebar-ring: var(--color-neutral-400);
+ --code: var(--color-white);
+ --code-foreground: var(--foreground);
+ --code-highlight: --alpha(var(--color-black) / 4%);
+}
- @keyframes reveal {
- from {
- /* Use CSS variables for the origin, defaulting to center if not set */
- clip-path: circle(0% at var(--x, 50%) var(--y, 50%));
- opacity: 0.7;
- }
- to {
- /* Use CSS variables for the origin, defaulting to center if not set */
- clip-path: circle(150% at var(--x, 50%) var(--y, 50%));
- opacity: 1;
- }
- }
+.dark {
+ --accent: --alpha(var(--color-white) / 4%);
+ --accent-foreground: var(--color-neutral-100);
+ --background: color-mix(
+ in srgb,
+ var(--color-neutral-950) 96%,
+ var(--color-white)
+ );
+ --border: --alpha(var(--color-white) / 6%);
+ --card: color-mix(in srgb, var(--background) 98%, var(--color-white));
+ --card-foreground: var(--color-neutral-100);
+ --destructive: color-mix(in srgb, var(--color-red-500) 90%, var(--color-white));
+ --destructive-foreground: var(--color-red-400);
+ --foreground: var(--color-neutral-100);
+ --info: var(--color-blue-500);
+ --info-foreground: var(--color-blue-400);
+ --input: --alpha(var(--color-white) / 8%);
+ --muted: --alpha(var(--color-white) / 4%);
+ --muted-foreground: color-mix(in srgb, var(--color-neutral-500) 90%, var(--color-white));
+ --popover: color-mix(in srgb, var(--background) 98%, var(--color-white));
+ --popover-foreground: var(--color-neutral-100);
+ --primary: var(--color-neutral-100);
+ --primary-foreground: var(--color-neutral-800);
+ --ring: var(--color-neutral-500);
+ --secondary: --alpha(var(--color-white) / 4%);
+ --secondary-foreground: var(--color-neutral-100);
+ --success: var(--color-emerald-500);
+ --success-foreground: var(--color-emerald-400);
+ --warning: var(--color-amber-500);
+ --warning-foreground: var(--color-amber-400);
+ --chart-1: var(--color-blue-700);
+ --chart-2: var(--color-emerald-500);
+ --chart-3: var(--color-amber-500);
+ --chart-4: var(--color-purple-500);
+ --chart-5: var(--color-rose-500);
+ --sidebar: color-mix(
+ in srgb,
+ var(--color-neutral-950) 97%,
+ var(--color-white)
+ );
+ --sidebar-foreground: color-mix(
+ in srgb,
+ var(--color-neutral-100) 64%,
+ var(--sidebar)
+ );
+ --sidebar-primary: var(--color-neutral-100);
+ --sidebar-primary-foreground: var(--color-neutral-800);
+ --sidebar-accent: --alpha(var(--color-white) / 4%);
+ --sidebar-accent-foreground: var(--color-neutral-100);
+ --sidebar-border: --alpha(var(--color-white) / 5%);
+ --sidebar-ring: var(--color-neutral-400);
+ --code: color-mix(in srgb, var(--background) 98%, var(--color-white));
+ --code-foreground: var(--foreground);
+ --code-highlight: --alpha(var(--color-white) / 4%);
}
-/* Reduced motion preference */
-@media (prefers-reduced-motion: reduce) {
- ::view-transition-new(root) {
- animation-duration: 0.1s !important;
- }
+@layer base {
+ * {
+ @apply border-border outline-ring/50;
+ }
+ body {
+ @apply bg-background font-sans text-foreground antialiased;
+ }
+ h1,
+ h2,
+ h3,
+ h4,
+ h5,
+ h6 {
+ @apply font-heading font-semibold tracking-tight;
+ }
}
-/* User Preferences CSS */
+@layer components {
+ .blocknote-transparent .bn-container {
+ --bn-font-family: var(--font-sans);
+ --bn-border-radius: var(--radius);
+ --bn-colors-menu-background: var(--popover);
+ --bn-colors-menu-text: var(--popover-foreground);
+ --bn-colors-hovered-background: var(--accent);
+ --bn-colors-hovered-text: var(--accent-foreground);
+ --bn-colors-selected-background: var(--accent);
+ --bn-colors-selected-text: var(--accent-foreground);
+ --bn-colors-border: var(--border);
+ --bn-colors-shadow: --alpha(var(--color-black) / 12%);
+ }
-/* Compact Mode - Reduce padding and spacing throughout the app */
-.compact-mode {
- --spacing-factor: 0.75;
-}
+ .blocknote-transparent .bn-suggestion-menu {
+ min-width: 18rem;
+ max-width: 28rem;
+ max-height: min(24rem, 60vh);
+ overflow-y: auto;
+ border: 1px solid var(--border);
+ border-radius: var(--radius);
+ background: var(--popover);
+ color: var(--popover-foreground);
+ box-shadow:
+ 0 8px 24px --alpha(var(--color-black) / 10%),
+ 0 1px 2px --alpha(var(--color-black) / 8%);
+ padding: 0.25rem;
+ }
-.compact-mode [data-sidebar="sidebar"] {
- --sidebar-width: calc(var(--spacing) * 52);
-}
+ .blocknote-transparent .bn-suggestion-menu-loader {
+ color: var(--muted-foreground);
+ font-size: 0.8125rem;
+ padding: 0.5rem;
+ }
-.compact-mode .p-1 { padding: calc(0.25rem * var(--spacing-factor, 1)); }
-.compact-mode .p-2 { padding: calc(0.5rem * var(--spacing-factor, 1)); }
-.compact-mode .p-3 { padding: calc(0.75rem * var(--spacing-factor, 1)); }
-.compact-mode .p-4 { padding: calc(1rem * var(--spacing-factor, 1)); }
-.compact-mode .p-6 { padding: calc(1.5rem * var(--spacing-factor, 1)); }
+ .kaneo-slash-menu {
+ min-width: 17rem;
+ max-width: 22rem;
+ max-height: min(20rem, 56vh);
+ overflow-y: auto;
+ border: 1px solid var(--border);
+ border-radius: var(--radius);
+ background: var(--popover);
+ color: var(--popover-foreground);
+ box-shadow:
+ 0 8px 24px --alpha(var(--color-black) / 10%),
+ 0 1px 2px --alpha(var(--color-black) / 8%);
+ padding: 0.25rem;
+ }
-.compact-mode .gap-1 { gap: calc(0.25rem * var(--spacing-factor, 1)); }
-.compact-mode .gap-2 { gap: calc(0.5rem * var(--spacing-factor, 1)); }
-.compact-mode .gap-3 { gap: calc(0.75rem * var(--spacing-factor, 1)); }
-.compact-mode .gap-4 { gap: calc(1rem * var(--spacing-factor, 1)); }
+ .kaneo-slash-menu-label {
+ color: var(--muted-foreground);
+ font-size: 0.6875rem;
+ font-weight: 500;
+ letter-spacing: 0.04em;
+ text-transform: uppercase;
+ padding: 0.375rem 0.5rem 0.25rem;
+ }
-.compact-mode .space-y-1 > * + * { margin-top: calc(0.25rem * var(--spacing-factor, 1)); }
-.compact-mode .space-y-2 > * + * { margin-top: calc(0.5rem * var(--spacing-factor, 1)); }
-.compact-mode .space-y-3 > * + * { margin-top: calc(0.75rem * var(--spacing-factor, 1)); }
-.compact-mode .space-y-4 > * + * { margin-top: calc(1rem * var(--spacing-factor, 1)); }
+ .kaneo-slash-menu-item {
+ appearance: none;
+ border: 0;
+ background: transparent;
+ width: 100%;
+ height: 2rem;
+ display: flex !important;
+ align-items: center;
+ justify-content: flex-start;
+ flex-wrap: nowrap;
+ gap: 0.5rem;
+ padding: 0 0.5rem;
+ border-radius: calc(var(--radius) - 4px);
+ color: var(--popover-foreground);
+ text-align: left;
+ transition: background-color 0.12s ease;
+ cursor: pointer;
+ line-height: 1;
+ }
-/* Theme-specific overrides */
-.theme-light {
- --primary-accent: oklch(0.5820 0.2289 272.7771);
-}
+ .kaneo-slash-menu-item:hover,
+ .kaneo-slash-menu-item.is-selected {
+ background: var(--accent);
+ color: var(--accent-foreground);
+ }
-.theme-dark {
- --primary-accent: oklch(0.6820 0.1989 272.7771);
-}
+ .kaneo-slash-menu-icon {
+ width: 1.125rem;
+ min-width: 1.125rem;
+ height: 1.125rem;
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ opacity: 0.85;
+ color: var(--muted-foreground);
+ }
-.theme-system {
- --primary-accent: oklch(0.5820 0.2289 272.7771);
-}
+ .kaneo-slash-menu-title {
+ flex: 1;
+ min-width: 0;
+ font-size: 0.875rem;
+ font-weight: 500;
+ line-height: 1;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
-@media (prefers-color-scheme: dark) {
- .theme-system {
- --primary-accent: oklch(0.6820 0.1989 272.7771);
+ .kaneo-slash-menu-shortcut {
+ margin-left: auto;
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ height: 1.25rem;
+ padding: 0 0.375rem;
+ border-radius: 0.375rem;
+ border: 1px solid var(--input);
+ background: var(--muted);
+ color: var(--muted-foreground);
+ font-size: 0.6875rem;
+ font-weight: 500;
+ line-height: 1;
+ white-space: nowrap;
}
-}
-* {
- font-family: var(--font-geist);
-}
+ .kaneo-slash-menu-item.is-selected .kaneo-slash-menu-shortcut {
+ color: color-mix(in srgb, var(--accent-foreground) 72%, transparent);
+ }
-/* BlockNote - Hide empty trailing paragraph blocks (only when there are multiple blocks) */
-.bn-block-group:has(.bn-block-outer:nth-child(2)) > .bn-block-outer:last-child .bn-block-content[data-content-type="paragraph"] {
- &:has(.bn-inline-content:only-child > .ProseMirror-trailingBreak:only-child) {
- display: none;
+ .dark .blocknote-transparent .bn-container {
+ --bn-colors-shadow: --alpha(var(--color-black) / 44%);
}
}
-
-/* Also hide the block outer container if it contains only an empty paragraph (only when there are multiple blocks) */
-.bn-block-group:has(.bn-block-outer:nth-child(2)) > .bn-block-outer:last-child:has(.bn-block-content[data-content-type="paragraph"] .bn-inline-content:only-child > .ProseMirror-trailingBreak:only-child) {
- display: none;
-}
\ No newline at end of file
diff --git a/apps/web/src/lib/due-date-status.ts b/apps/web/src/lib/due-date-status.ts
index ff162c9de..2c410e5eb 100644
--- a/apps/web/src/lib/due-date-status.ts
+++ b/apps/web/src/lib/due-date-status.ts
@@ -19,13 +19,10 @@ export function getDueDateStatus(dueDate: string | null): DueDateStatus {
}
export const dueDateStatusColors = {
- overdue: "text-red-500 dark:text-red-400 bg-red-50/50 dark:bg-red-950/20",
- "due-soon":
- "text-orange-500 dark:text-orange-400 bg-orange-50/50 dark:bg-orange-950/20",
- "far-future":
- "text-zinc-500 dark:text-zinc-400 bg-zinc-50/50 dark:bg-zinc-800/30",
- "no-due-date":
- "text-zinc-500 dark:text-zinc-400 bg-zinc-50/50 dark:bg-zinc-800/30",
+ overdue: "bg-destructive/10 text-destructive-foreground",
+ "due-soon": "bg-warning/10 text-warning-foreground",
+ "far-future": "bg-muted/50 text-muted-foreground",
+ "no-due-date": "bg-muted/50 text-muted-foreground",
} as const;
export const dueDateStatusIcons = {
diff --git a/apps/web/src/lib/priority.tsx b/apps/web/src/lib/priority.tsx
index 1d6d15e03..37703535b 100644
--- a/apps/web/src/lib/priority.tsx
+++ b/apps/web/src/lib/priority.tsx
@@ -9,13 +9,15 @@ import {
export function getPriorityIcon(priority: string) {
switch (priority) {
case "urgent":
- return <CircleAlert className="h-[12px] w-[12px] text-red-400/70" />;
+ return (
+ <CircleAlert className="h-[12px] w-[12px] text-destructive-foreground" />
+ );
case "high":
- return <ChevronsUp className="h-[12px] w-[12px] text-orange-400/70" />;
+ return <ChevronsUp className="h-[12px] w-[12px] text-warning-foreground" />;
case "medium":
- return <ChevronUp className="h-[12px] w-[12px] text-amber-400/60" />;
+ return <ChevronUp className="h-[12px] w-[12px] text-warning-foreground/80" />;
case "low":
- return <ChevronDown className="h-[12px] w-[12px] text-blue-400/60" />;
+ return <ChevronDown className="h-[12px] w-[12px] text-info-foreground/85" />;
case "no-priority":
return <Minus className="h-[12px] w-[12px] text-muted-foreground" />;
default:
diff --git a/apps/web/src/lib/status.tsx b/apps/web/src/lib/status.tsx
index daa0e73c6..1b176852d 100644
--- a/apps/web/src/lib/status.tsx
+++ b/apps/web/src/lib/status.tsx
@@ -4,10 +4,10 @@ export function getStatusIcon(status: "active" | "pending") {
switch (status) {
case "active":
return (
- <CheckCircle2 className="w-4 h-4 text-green-500 dark:text-green-400" />
+ <CheckCircle2 className="h-4 w-4 text-success-foreground" />
);
case "pending":
- return <Clock className="w-4 h-4 text-yellow-500 dark:text-yellow-400" />;
+ return <Clock className="h-4 w-4 text-warning-foreground" />;
}
}
diff --git a/apps/web/src/lib/toast.ts b/apps/web/src/lib/toast.ts
new file mode 100644
index 000000000..efb9ba0e2
--- /dev/null
+++ b/apps/web/src/lib/toast.ts
@@ -0,0 +1,60 @@
+import { toastManager } from "@/components/ui/toast";
+
+type ToastVariant = "success" | "error" | "info" | "warning";
+
+type ToastAction = {
+ label: string;
+ onClick?: () => void;
+};
+
+type ToastOptions = {
+ description?: string;
+ action?: ToastAction;
+ cancel?: ToastAction;
+};
+
+function addToast(
+ title: string,
+ variant?: ToastVariant,
+ options?: ToastOptions,
+) {
+ let id = "";
+
+ const action = options?.action ?? options?.cancel;
+
+ id = toastManager.add({
+ title,
+ description: options?.description,
+ type: variant,
+ actionProps: action
+ ? {
+ children: action.label,
+ onClick: () => {
+ action.onClick?.();
+ toastManager.close(id);
+ },
+ }
+ : undefined,
+ });
+
+ return id;
+}
+
+type ToastFn = (title: string, options?: ToastOptions) => string;
+
+const success: ToastFn = (title, options) => addToast(title, "success", options);
+const error: ToastFn = (title, options) => addToast(title, "error", options);
+const info: ToastFn = (title, options) => addToast(title, "info", options);
+const warning: ToastFn = (title, options) => addToast(title, "warning", options);
+const message: ToastFn = (title, options) => addToast(title, undefined, options);
+
+const toast = Object.assign(message, {
+ success,
+ error,
+ info,
+ warning,
+ message,
+});
+
+export { toast };
+export type { ToastOptions };
diff --git a/apps/web/src/lib/utils.ts b/apps/web/src/lib/utils.ts
new file mode 100644
index 000000000..365058ceb
--- /dev/null
+++ b/apps/web/src/lib/utils.ts
@@ -0,0 +1,6 @@
+import { type ClassValue, clsx } from "clsx";
+import { twMerge } from "tailwind-merge";
+
+export function cn(...inputs: ClassValue[]) {
+ return twMerge(clsx(inputs));
+}
diff --git a/apps/web/src/routes/__root.tsx b/apps/web/src/routes/__root.tsx
index edec80989..949bb786f 100644
--- a/apps/web/src/routes/__root.tsx
+++ b/apps/web/src/routes/__root.tsx
@@ -1,7 +1,6 @@
import type { QueryClient } from "@tanstack/react-query";
import { createRootRouteWithContext, Outlet } from "@tanstack/react-router";
-import { Toaster } from "sonner";
-import { useUserPreferencesStore } from "@/store/user-preferences";
+import { ToastProvider } from "@/components/ui/toast";
import type { User } from "@/types/user";
export const Route = createRootRouteWithContext<{
@@ -12,38 +11,12 @@ export const Route = createRootRouteWithContext<{
});
function RootComponent() {
- const { theme } = useUserPreferencesStore();
-
return (
- <>
- <div className="flex w-full h-svh overflow-x-hidden overflow-y-hidden flex-row scrollbar-thin scrollbar-thumb-zinc-700 scrollbar-track-zinc-900 bg-sidebar">
+ <ToastProvider position="bottom-right">
+ <div className="flex h-svh w-full flex-row overflow-x-hidden overflow-y-hidden bg-background scrollbar-thin scrollbar-thumb-border scrollbar-track-muted">
<Outlet />
</div>
- <Toaster
- position="bottom-right"
- closeButton
- richColors
- theme={theme}
- toastOptions={{
- classNames: {
- toast:
- "bg-white dark:bg-zinc-900 border border-zinc-200 dark:border-zinc-800 text-zinc-900 dark:text-zinc-100",
- title: "text-zinc-900 dark:text-zinc-100 text-sm font-medium",
- description: "text-zinc-600 dark:text-zinc-400 text-sm",
- actionButton:
- "bg-zinc-100 dark:bg-zinc-800 text-zinc-900 dark:text-zinc-100",
- cancelButton:
- "bg-zinc-100 dark:bg-zinc-800 text-zinc-900 dark:text-zinc-100",
- success:
- "!bg-white dark:!bg-zinc-900 border-zinc-200 dark:border-zinc-800",
- error:
- "!bg-white dark:!bg-zinc-900 border-zinc-200 dark:border-zinc-800",
- info: "!bg-white dark:!bg-zinc-900 border-zinc-200 dark:border-zinc-800",
- },
- duration: 2000,
- }}
- />
- </>
+ </ToastProvider>
);
}
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/invitations.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/invitations.tsx
index d5ba9c3e7..c5f20d2a0 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/invitations.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/invitations.tsx
@@ -2,7 +2,7 @@ import { useQueryClient } from "@tanstack/react-query";
import { createFileRoute, useNavigate } from "@tanstack/react-router";
import { CheckCircle, Loader2, Mail, X } from "lucide-react";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import Layout from "@/components/common/layout";
import PageTitle from "@/components/page-title";
import { Badge } from "@/components/ui/badge";
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/settings.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/settings.tsx
index 61667b2d0..dcdacd173 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/settings.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/settings.tsx
@@ -61,7 +61,7 @@ function SettingsLayout() {
Back to Workspace
</Button>
- <h1 className="text-2xl font-bold pl-2 mt-2">Settings</h1>
+ <h1 className="text-2xl font-semibold pl-2 mt-2">Settings</h1>
<Tabs value={activeTab} className="w-[400px] pt-2">
<TabsList className="bg-sidebar gap-2">
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account/information.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account/information.tsx
index 5191e190a..36882aedb 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account/information.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account/information.tsx
@@ -3,7 +3,7 @@ import { useQueryClient } from "@tanstack/react-query";
import { createFileRoute } from "@tanstack/react-router";
import { useCallback, useEffect, useRef } from "react";
import { useForm } from "react-hook-form";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { z } from "zod";
import PageTitle from "@/components/page-title";
import useAuth from "@/components/providers/auth-provider/hooks/use-auth";
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account/preferences.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account/preferences.tsx
index 4855035cf..c54667bc9 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account/preferences.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account/preferences.tsx
@@ -74,18 +74,18 @@ function RouteComponent() {
<SelectContent>
<SelectItem value="light">
<div className="flex items-center gap-3">
- <div className="flex items-center gap-1 bg-[#F4F4F5] rounded-md p-1 border border-border">
+ <div className="flex items-center gap-1 rounded-md border border-border bg-muted p-1">
<span className="rounded-full size-2 bg-primary" />
- <span className="text-xs font-normal text-black">Aa</span>
+ <span className="text-xs font-normal text-foreground">Aa</span>
</div>
<span className="text-xs font-normal">Light</span>
</div>
</SelectItem>
<SelectItem value="dark">
<div className="flex items-center gap-3">
- <div className="flex items-center gap-1 bg-[#18181B] rounded-md p-1 border border-border">
+ <div className="flex items-center gap-1 rounded-md border border-border bg-card p-1">
<span className="rounded-full size-2 bg-primary" />
- <span className="text-xs font-normal text-white">Aa</span>
+ <span className="text-xs font-normal text-foreground">Aa</span>
</div>
<span className="text-xs font-normal">Dark</span>
</div>
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects.tsx
index f03aef190..0172a7a17 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects.tsx
@@ -77,7 +77,7 @@ function RouteComponent() {
src={workspace?.logo ?? ""}
alt={workspace?.name || ""}
/>
- <AvatarFallback className="text-md text-white bg-primary font-medium border border-border/30">
+ <AvatarFallback className="text-md bg-primary font-medium border border-border/30">
{workspace?.name?.charAt(0).toUpperCase()}
</AvatarFallback>
</Avatar>
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects/$projectId/general.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects/$projectId/general.tsx
index 988ebb1af..b353cd9f2 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects/$projectId/general.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects/$projectId/general.tsx
@@ -7,13 +7,13 @@ import {
} from "@tanstack/react-router";
import { useCallback, useEffect, useRef, useState } from "react";
import { useForm } from "react-hook-form";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { z } from "zod";
import PageTitle from "@/components/page-title";
import {
AlertDialog,
- AlertDialogAction,
- AlertDialogCancel,
+ AlertDialogClose,
+
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
@@ -241,7 +241,7 @@ function RouteComponent() {
<PopoverTrigger asChild>
<button
type="button"
- className="flex items-center justify-center p-2 rounded border border-border hover:border-zinc-400 dark:hover:border-zinc-600 transition-colors"
+ className="flex items-center justify-center p-2 rounded border border-border hover:bg-accent transition-colors"
title="Pick icon"
>
{(() => {
@@ -250,7 +250,7 @@ function RouteComponent() {
"Layout";
const Icon = icons[key] || icons.Layout;
return (
- <Icon className="w-4 h-4 text-zinc-600 dark:text-zinc-400" />
+ <Icon className="w-4 h-4 text-muted-foreground" />
);
})()}
</button>
@@ -278,8 +278,8 @@ function RouteComponent() {
className={cn(
"p-2 rounded-lg transition-all duration-200 flex items-center justify-center group hover:scale-105",
projectForm.getValues("icon") === iconName
- ? "bg-indigo-50 text-indigo-600 dark:bg-indigo-500/10 dark:text-indigo-400"
- : "text-zinc-600 dark:text-zinc-400 hover:bg-zinc-100 dark:hover:bg-zinc-700",
+ ? "bg-accent text-foreground"
+ : "text-muted-foreground hover:bg-accent",
)}
title={iconName}
>
@@ -430,14 +430,14 @@ function RouteComponent() {
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
- <AlertDialogCancel>Cancel</AlertDialogCancel>
- <AlertDialogAction
+ <AlertDialogClose>Cancel</AlertDialogClose>
+ <AlertDialogClose
onClick={handleDeleteProject}
disabled={isDeleting}
className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
>
{isDeleting ? "Deleting..." : "Delete Project"}
- </AlertDialogAction>
+ </AlertDialogClose>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects/$projectId/visibility.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects/$projectId/visibility.tsx
index dc149a7e6..b9d9df248 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects/$projectId/visibility.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/projects/$projectId/visibility.tsx
@@ -1,7 +1,7 @@
import { useQueryClient } from "@tanstack/react-query";
import { createFileRoute, useParams } from "@tanstack/react-router";
import { useCallback, useRef } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import PageTitle from "@/components/page-title";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/workspace.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/workspace.tsx
index 292f63f27..15e566131 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/workspace.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/workspace.tsx
@@ -37,7 +37,7 @@ function RouteComponent() {
src={workspace?.logo ?? ""}
alt={workspace?.name || ""}
/>
- <AvatarFallback className="text-md text-white bg-primary font-medium border border-border/30">
+ <AvatarFallback className="text-md bg-primary font-medium border border-border/30">
{workspace?.name?.charAt(0).toUpperCase()}
</AvatarFallback>
</Avatar>
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/workspace/general.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/workspace/general.tsx
index 8cfd55665..37baaf754 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/workspace/general.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/workspace/general.tsx
@@ -3,13 +3,13 @@ import { useQueryClient } from "@tanstack/react-query";
import { createFileRoute, useNavigate } from "@tanstack/react-router";
import { useCallback, useEffect, useRef, useState } from "react";
import { useForm } from "react-hook-form";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { z } from "zod";
import PageTitle from "@/components/page-title";
import {
AlertDialog,
- AlertDialogAction,
- AlertDialogCancel,
+ AlertDialogClose,
+
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
@@ -280,14 +280,14 @@ function RouteComponent() {
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
- <AlertDialogCancel>Cancel</AlertDialogCancel>
- <AlertDialogAction
+ <AlertDialogClose>Cancel</AlertDialogClose>
+ <AlertDialogClose
onClick={handleDeleteWorkspace}
disabled={isDeleting}
className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
>
{isDeleting ? "Deleting..." : "Delete Workspace"}
- </AlertDialogAction>
+ </AlertDialogClose>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/index.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/index.tsx
index d730cfaa4..ee4319ef2 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/index.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/index.tsx
@@ -147,7 +147,7 @@ function RouteComponent() {
</div>
<Button
onClick={handleCreateProject}
- className="gap-2 text-white"
+ className="gap-2 "
>
<Plus className="w-4 h-4" />
Create project
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/backlog.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/backlog.tsx
index 61d83973a..9ab3f06a9 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/backlog.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/backlog.tsx
@@ -3,7 +3,7 @@ import { createFileRoute, useNavigate } from "@tanstack/react-router";
import { produce } from "immer";
import { ArrowRight, Calendar, Filter, Plus, User, X } from "lucide-react";
import { useCallback, useEffect, useMemo, useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import BacklogListView from "@/components/backlog-list-view";
import ProjectLayout from "@/components/common/project-layout";
import PageTitle from "@/components/page-title";
@@ -15,13 +15,12 @@ import {
DropdownMenu,
DropdownMenuCheckboxItem,
DropdownMenuContent,
+ DropdownMenuGroup,
DropdownMenuItem,
+ DropdownMenuLabel,
DropdownMenuSeparator,
- DropdownMenuSub,
- DropdownMenuSubContent,
- DropdownMenuSubTrigger,
DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
+} from "@/components/ui/menu";
import labelColors from "@/constants/label-colors";
import { shortcuts } from "@/constants/shortcuts";
import { useUpdateTask } from "@/hooks/mutations/task/use-update-task";
@@ -322,7 +321,7 @@ function RouteComponent() {
<ProjectLayout projectId={projectId} workspaceId={workspaceId}>
<PageTitle title={`${project?.name}'s backlog`} />
<div className="relative flex flex-col h-full min-h-0 overflow-hidden">
- <div className="bg-card border-b border-border">
+ <div className="bg-card border-b border-border/80">
<div className="h-10 flex items-center px-4">
<div className="flex items-center justify-between w-full">
<div className="flex items-center gap-2">
@@ -330,7 +329,7 @@ function RouteComponent() {
variant="ghost"
size="xs"
onClick={() => setIsTaskModalOpen(true)}
- className="h-6 px-2 text-xs text-zinc-600 dark:text-zinc-400"
+ className="h-6 px-2 text-xs text-sidebar-foreground hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
>
<Plus className="h-3 w-3 mr-1" />
Plan
@@ -340,7 +339,7 @@ function RouteComponent() {
variant="ghost"
size="xs"
onClick={handleMoveAllPlannedToTodo}
- className="h-6 px-2 text-xs text-zinc-600 dark:text-zinc-400"
+ className="h-6 px-2 text-xs text-sidebar-foreground hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
title="Move All Planned to To Do"
>
<ArrowRight className="h-3 w-3 mr-1" />
@@ -350,17 +349,17 @@ function RouteComponent() {
{filters.priority && (
<Button
variant="secondary"
- size="sm"
- className="h-6 px-2 text-xs gap-1.5"
+ size="xs"
+ className="h-7 rounded-md px-2 text-xs font-medium gap-1.5"
>
{getPriorityIcon(filters.priority)}
<span>
- Priority is {getPriorityDisplayName(filters.priority)}
+ Priority: {getPriorityDisplayName(filters.priority)}
</span>
<Button
variant="ghost"
size="icon"
- className="h-3 w-3 p-0 ml-1 hover:bg-destructive hover:text-destructive-foreground"
+ className="h-4 w-4 p-0 ml-1 hover:bg-destructive hover:text-destructive-foreground"
onClick={(e) => {
e.stopPropagation();
updateFilter("priority", null);
@@ -374,17 +373,17 @@ function RouteComponent() {
{filters.assignee && (
<Button
variant="secondary"
- size="sm"
- className="h-6 px-2 text-xs gap-1.5"
+ size="xs"
+ className="h-7 rounded-md px-2 text-xs font-medium gap-1.5"
>
<User className="h-3 w-3" />
<span>
- Assignee is {getAssigneeDisplayName(filters.assignee)}
+ Assignee: {getAssigneeDisplayName(filters.assignee)}
</span>
<Button
variant="ghost"
size="icon"
- className="h-3 w-3 p-0 ml-1 hover:bg-destructive hover:text-destructive-foreground"
+ className="h-4 w-4 p-0 ml-1 hover:bg-destructive hover:text-destructive-foreground"
onClick={(e) => {
e.stopPropagation();
updateFilter("assignee", null);
@@ -398,15 +397,15 @@ function RouteComponent() {
{filters.dueDate && (
<Button
variant="secondary"
- size="sm"
- className="h-6 px-2 text-xs gap-1.5"
+ size="xs"
+ className="h-7 rounded-md px-2 text-xs font-medium gap-1.5"
>
<Calendar className="h-3 w-3" />
- <span>Due date is {filters.dueDate}</span>
+ <span>Due: {filters.dueDate}</span>
<Button
variant="ghost"
size="icon"
- className="h-3 w-3 p-0 ml-1 hover:bg-destructive hover:text-destructive-foreground"
+ className="h-4 w-4 p-0 ml-1 hover:bg-destructive hover:text-destructive-foreground"
onClick={(e) => {
e.stopPropagation();
updateFilter("dueDate", null);
@@ -435,22 +434,22 @@ function RouteComponent() {
<Button
key={`${label.name}-${label.color}`}
variant="secondary"
- size="sm"
- className="h-6 px-2 text-xs gap-1.5"
+ size="xs"
+ className="h-7 rounded-md px-2 text-xs font-medium gap-1.5"
>
<span
className="w-2.5 h-2.5 rounded-full flex-shrink-0"
style={{
backgroundColor:
labelColors.find((c) => c.value === label.color)
- ?.color || "#94a3b8",
+ ?.color || "var(--color-neutral-400)",
}}
/>
- <span>Label is {label.name}</span>
+ <span>Label: {label.name}</span>
<Button
variant="ghost"
size="icon"
- className="h-3 w-3 p-0 ml-1 hover:bg-destructive hover:text-destructive-foreground"
+ className="h-4 w-4 p-0 ml-1 hover:bg-destructive hover:text-destructive-foreground"
onClick={(e) => {
e.stopPropagation();
toggleLabelGroup(label);
@@ -462,127 +461,147 @@ function RouteComponent() {
))}
<DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button
- variant="ghost"
- size="sm"
- className="h-6 px-2 text-xs text-muted-foreground"
- >
- <Filter className="h-3 w-3 mr-1" />
- Filter
- </Button>
+ <DropdownMenuTrigger
+ render={
+ <Button
+ variant="outline"
+ size="sm"
+ className="h-8 gap-2 px-3 font-medium text-foreground"
+ />
+ }
+ >
+ <Filter className="h-3.5 w-3.5" />
+ Filter
</DropdownMenuTrigger>
- <DropdownMenuContent className="w-46" align="start">
+ <DropdownMenuContent
+ className="w-80"
+ align="start"
+ >
+ <DropdownMenuItem
+ disabled
+ className="h-8 rounded-md border border-border/80 bg-card text-sm text-muted-foreground"
+ >
+ Add filter...
+ </DropdownMenuItem>
+ <DropdownMenuSeparator />
{hasActiveFilters && (
<>
- <DropdownMenuItem onClick={clearFilters}>
+ <DropdownMenuItem
+ onClick={clearFilters}
+ className="h-8 text-sm text-muted-foreground"
+ >
<span>Clear all filters</span>
</DropdownMenuItem>
<DropdownMenuSeparator />
</>
)}
+ <DropdownMenuGroup>
+ <DropdownMenuLabel className="text-[11px] uppercase tracking-wide">
+ Priority
+ </DropdownMenuLabel>
+ </DropdownMenuGroup>
+ {["urgent", "high", "medium", "low"].map((priority) => (
+ <DropdownMenuCheckboxItem
+ key={priority}
+ checked={filters.priority === priority}
+ onCheckedChange={(checked) =>
+ updateFilter("priority", checked ? priority : null)
+ }
+ className="h-8 rounded-md text-sm [&_svg]:text-sidebar-foreground"
+ >
+ {getPriorityIcon(priority)}
+ <span className="capitalize">{priority}</span>
+ </DropdownMenuCheckboxItem>
+ ))}
- <DropdownMenuSub>
- <DropdownMenuSubTrigger className="gap-2">
- <span>Priority</span>
- </DropdownMenuSubTrigger>
- <DropdownMenuSubContent className="w-48">
- {["urgent", "high", "medium", "low"].map((priority) => (
- <DropdownMenuCheckboxItem
- key={priority}
- checked={filters.priority === priority}
- onCheckedChange={() =>
- updateFilter("priority", priority)
- }
- className="[&_svg]:text-muted-foreground"
- >
- {getPriorityIcon(priority)}
- <span className="capitalize">{priority}</span>
- </DropdownMenuCheckboxItem>
- ))}
- </DropdownMenuSubContent>
- </DropdownMenuSub>
-
- <DropdownMenuSub>
- <DropdownMenuSubTrigger className="gap-2">
- <span>Assignee</span>
- </DropdownMenuSubTrigger>
- <DropdownMenuSubContent className="w-48">
- {users?.members?.map((member) => (
+ <DropdownMenuSeparator />
+ <DropdownMenuGroup>
+ <DropdownMenuLabel className="text-[11px] uppercase tracking-wide">
+ Assignee
+ </DropdownMenuLabel>
+ </DropdownMenuGroup>
+ {users?.members?.map((member) => (
+ <DropdownMenuCheckboxItem
+ key={member.userId}
+ checked={filters.assignee === member.userId}
+ onCheckedChange={(checked) =>
+ updateFilter("assignee", checked ? member.userId : null)
+ }
+ className="h-8 rounded-md text-sm"
+ >
+ <Avatar className="h-6 w-6">
+ <AvatarImage
+ src={member.user?.image ?? ""}
+ alt={member.user?.name || ""}
+ />
+ <AvatarFallback className="text-xs font-medium border border-border/30">
+ {member.user?.name?.charAt(0).toUpperCase()}
+ </AvatarFallback>
+ </Avatar>
+ <span>{member.user?.name}</span>
+ </DropdownMenuCheckboxItem>
+ ))}
+
+ <DropdownMenuSeparator />
+ <DropdownMenuGroup>
+ <DropdownMenuLabel className="text-[11px] uppercase tracking-wide">
+ Due date
+ </DropdownMenuLabel>
+ </DropdownMenuGroup>
+ {["Due this week", "Due next week", "No due date"].map(
+ (dueDate) => (
+ <DropdownMenuCheckboxItem
+ key={dueDate}
+ checked={filters.dueDate === dueDate}
+ onCheckedChange={(checked) =>
+ updateFilter("dueDate", checked ? dueDate : null)
+ }
+ className="h-8 rounded-md text-sm"
+ >
+ <span>{dueDate}</span>
+ </DropdownMenuCheckboxItem>
+ ),
+ )}
+
+ <DropdownMenuSeparator />
+ <DropdownMenuGroup>
+ <DropdownMenuLabel className="text-[11px] uppercase tracking-wide">
+ Labels
+ </DropdownMenuLabel>
+ </DropdownMenuGroup>
+ {uniqueLabels.length > 0 ? (
+ uniqueLabels.map(
+ (label: {
+ id: string;
+ name: string;
+ color: string;
+ }) => (
<DropdownMenuCheckboxItem
- key={member.userId}
- checked={filters.assignee === member.userId}
- onCheckedChange={() =>
- updateFilter("assignee", member.userId)
- }
+ key={label.id}
+ checked={isLabelGroupSelected(label)}
+ onCheckedChange={() => toggleLabelGroup(label)}
+ className="h-8 rounded-md text-sm"
>
- <Avatar className="h-6 w-6">
- <AvatarImage
- src={member.user?.image ?? ""}
- alt={member.user?.name || ""}
- />
- <AvatarFallback className="text-xs font-medium border border-border/30">
- {member.user?.name?.charAt(0).toUpperCase()}
- </AvatarFallback>
- </Avatar>
- <span>{member.user?.name}</span>
+ <span
+ className="w-3 h-3 rounded-full flex-shrink-0"
+ style={{
+ backgroundColor:
+ labelColors.find((c) => c.value === label.color)
+ ?.color || "var(--color-neutral-400)",
+ }}
+ />
+ <span>{label.name}</span>
</DropdownMenuCheckboxItem>
- ))}
- </DropdownMenuSubContent>
- </DropdownMenuSub>
-
- <DropdownMenuSub>
- <DropdownMenuSubTrigger className="gap-2">
- <span>Due Date</span>
- </DropdownMenuSubTrigger>
- <DropdownMenuSubContent className="w-48">
- {["Due this week", "Due next week", "No due date"].map(
- (dueDate) => (
- <DropdownMenuCheckboxItem
- key={dueDate}
- checked={filters.dueDate === dueDate}
- onCheckedChange={() =>
- updateFilter("dueDate", dueDate)
- }
- >
- <span>{dueDate}</span>
- </DropdownMenuCheckboxItem>
- ),
- )}
- </DropdownMenuSubContent>
- </DropdownMenuSub>
-
- <DropdownMenuSub>
- <DropdownMenuSubTrigger className="gap-2">
- <span>Labels</span>
- </DropdownMenuSubTrigger>
- <DropdownMenuSubContent className="w-48">
- {uniqueLabels.map(
- (label: {
- id: string;
- name: string;
- color: string;
- }) => (
- <DropdownMenuCheckboxItem
- key={label.id}
- checked={isLabelGroupSelected(label)}
- onCheckedChange={() => toggleLabelGroup(label)}
- >
- <span
- className="w-3 h-3 rounded-full flex-shrink-0"
- style={{
- backgroundColor:
- labelColors.find(
- (c) => c.value === label.color,
- )?.color || "#94a3b8",
- }}
- />
- <span>{label.name}</span>
- </DropdownMenuCheckboxItem>
- ),
- )}
- </DropdownMenuSubContent>
- </DropdownMenuSub>
+ ),
+ )
+ ) : (
+ <DropdownMenuItem
+ disabled
+ className="h-8 rounded-md text-sm text-muted-foreground"
+ >
+ <span>No labels available</span>
+ </DropdownMenuItem>
+ )}
</DropdownMenuContent>
</DropdownMenu>
</div>
@@ -596,10 +615,10 @@ function RouteComponent() {
) : (
<div className="flex h-full items-center justify-center">
<div className="text-center space-y-4">
- <div className="w-16 h-16 bg-zinc-200 dark:bg-zinc-800 rounded-lg animate-pulse mx-auto" />
+ <div className="w-16 h-16 bg-muted rounded-lg animate-pulse mx-auto" />
<div className="space-y-2">
- <div className="w-48 h-4 bg-zinc-200 dark:bg-zinc-800 rounded animate-pulse mx-auto" />
- <div className="w-64 h-3 bg-zinc-200 dark:bg-zinc-800 rounded animate-pulse mx-auto" />
+ <div className="w-48 h-4 bg-muted rounded animate-pulse mx-auto" />
+ <div className="w-64 h-3 bg-muted rounded animate-pulse mx-auto" />
</div>
</div>
</div>
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/board.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/board.tsx
index e483699dd..5372f2958 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/board.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/board.tsx
@@ -4,7 +4,6 @@ import {
Filter,
Layout,
List,
- Settings2,
User,
X,
} from "lucide-react";
@@ -21,13 +20,12 @@ import {
DropdownMenu,
DropdownMenuCheckboxItem,
DropdownMenuContent,
+ DropdownMenuGroup,
DropdownMenuItem,
+ DropdownMenuLabel,
DropdownMenuSeparator,
- DropdownMenuSub,
- DropdownMenuSubContent,
- DropdownMenuSubTrigger,
DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
+} from "@/components/ui/menu";
import labelColors from "@/constants/label-colors";
import { shortcuts } from "@/constants/shortcuts";
import useGetLabelsByWorkspace from "@/hooks/queries/label/use-get-labels-by-workspace";
@@ -175,7 +173,7 @@ function RouteComponent() {
hideAppName
/>
<div className="relative flex flex-col h-full min-h-0 overflow-hidden">
- <div className="bg-card border-b border-border">
+ <div className="bg-card border-b border-border/80">
<div className="h-10 flex items-center px-4">
<div className="flex items-center justify-between w-full">
<div className="flex items-center gap-2">
@@ -183,21 +181,14 @@ function RouteComponent() {
{filters.status && (
<Button
variant="secondary"
- size="sm"
- className="h-6 px-2 text-xs gap-1.5"
+ size="xs"
+ className="h-7 rounded-md px-2 text-xs font-medium"
>
- {getColumnIcon(
- filters.status,
- project?.columns?.find((c) => c.id === filters.status)
- ?.isFinal,
- )}
- <span>
- Status is {getStatusDisplayName(filters.status)}
- </span>
+ <span>Status: {getStatusDisplayName(filters.status)}</span>
<Button
variant="ghost"
size="icon"
- className="h-3 w-3 p-0 ml-1 hover:bg-destructive hover:text-destructive-foreground"
+ className="h-4 w-4 p-0 ml-1 hover:bg-destructive hover:text-destructive-foreground"
onClick={(e) => {
e.stopPropagation();
updateFilter("status", null);
@@ -211,17 +202,17 @@ function RouteComponent() {
{filters.priority && (
<Button
variant="secondary"
- size="sm"
- className="h-6 px-2 text-xs gap-1.5"
+ size="xs"
+ className="h-7 rounded-md px-2 text-xs font-medium gap-1.5"
>
{getPriorityIcon(filters.priority)}
<span>
- Priority is {getPriorityDisplayName(filters.priority)}
+ Priority: {getPriorityDisplayName(filters.priority)}
</span>
<Button
variant="ghost"
size="icon"
- className="h-3 w-3 p-0 ml-1 hover:bg-destructive hover:text-destructive-foreground"
+ className="h-4 w-4 p-0 ml-1 hover:bg-destructive hover:text-destructive-foreground"
onClick={(e) => {
e.stopPropagation();
updateFilter("priority", null);
@@ -235,17 +226,17 @@ function RouteComponent() {
{filters.assignee && (
<Button
variant="secondary"
- size="sm"
- className="h-6 px-2 text-xs gap-1.5"
+ size="xs"
+ className="h-7 rounded-md px-2 text-xs font-medium gap-1.5"
>
<User className="h-3 w-3" />
<span>
- Assignee is {getAssigneeDisplayName(filters.assignee)}
+ Assignee: {getAssigneeDisplayName(filters.assignee)}
</span>
<Button
variant="ghost"
size="icon"
- className="h-3 w-3 p-0 ml-1 hover:bg-destructive hover:text-destructive-foreground"
+ className="h-4 w-4 p-0 ml-1 hover:bg-destructive hover:text-destructive-foreground"
onClick={(e) => {
e.stopPropagation();
updateFilter("assignee", null);
@@ -259,15 +250,15 @@ function RouteComponent() {
{filters.dueDate && (
<Button
variant="secondary"
- size="sm"
- className="h-6 px-2 text-xs gap-1.5"
+ size="xs"
+ className="h-7 rounded-md px-2 text-xs font-medium gap-1.5"
>
<Calendar className="h-3 w-3" />
- <span>Due date is {filters.dueDate}</span>
+ <span>Due: {filters.dueDate}</span>
<Button
variant="ghost"
size="icon"
- className="h-3 w-3 p-0 ml-1 hover:bg-destructive hover:text-destructive-foreground"
+ className="h-4 w-4 p-0 ml-1 hover:bg-destructive hover:text-destructive-foreground"
onClick={(e) => {
e.stopPropagation();
updateFilter("dueDate", null);
@@ -297,22 +288,22 @@ function RouteComponent() {
<Button
key={`${label.name}-${label.color}`}
variant="secondary"
- size="sm"
- className="h-6 px-2 text-xs gap-1.5"
+ size="xs"
+ className="h-7 rounded-md px-2 text-xs font-medium gap-1.5"
>
<span
className="w-2.5 h-2.5 rounded-full flex-shrink-0"
style={{
backgroundColor:
labelColors.find((c) => c.value === label.color)
- ?.color || "#94a3b8",
+ ?.color || "var(--color-neutral-400)",
}}
/>
- <span>Label is {label.name}</span>
+ <span>Label: {label.name}</span>
<Button
variant="ghost"
size="icon"
- className="h-3 w-3 p-0 ml-1 hover:bg-destructive hover:text-destructive-foreground"
+ className="h-4 w-4 p-0 ml-1 hover:bg-destructive hover:text-destructive-foreground"
onClick={(e) => {
e.stopPropagation();
toggleLabelGroup(label);
@@ -324,184 +315,190 @@ function RouteComponent() {
))}
<DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button
- variant="ghost"
- size="sm"
- className="h-6 px-2 text-xs text-muted-foreground"
- >
- <Filter className="h-3 w-3 mr-1" />
- Filter
- </Button>
+ <DropdownMenuTrigger
+ render={
+ <Button
+ variant="outline"
+ size="sm"
+ className="h-8 gap-2 px-3 font-medium text-foreground"
+ />
+ }
+ >
+ <Filter className="h-3.5 w-3.5" />
+ Filter
</DropdownMenuTrigger>
- <DropdownMenuContent className="w-46" align="start">
+ <DropdownMenuContent
+ className="w-80"
+ align="start"
+ >
+ <DropdownMenuItem
+ disabled
+ className="h-8 rounded-md border border-border/80 bg-card text-sm text-muted-foreground"
+ >
+ Add filter...
+ </DropdownMenuItem>
+ <DropdownMenuSeparator />
{hasActiveFilters && (
<>
- <DropdownMenuItem onClick={clearFilters}>
+ <DropdownMenuItem
+ onClick={clearFilters}
+ className="h-8 text-sm text-muted-foreground"
+ >
<span>Clear all filters</span>
</DropdownMenuItem>
<DropdownMenuSeparator />
</>
)}
+ <DropdownMenuGroup>
+ <DropdownMenuLabel className="text-[11px] uppercase tracking-wide">
+ Status
+ </DropdownMenuLabel>
+ </DropdownMenuGroup>
+ {project?.columns?.map((column) => (
+ <DropdownMenuCheckboxItem
+ key={column.id}
+ checked={filters.status === column.id}
+ onCheckedChange={(checked) =>
+ updateFilter("status", checked ? column.id : null)
+ }
+ className="h-8 rounded-md text-sm"
+ >
+ {getColumnIcon(column.id, column.isFinal)}
+ <span>{column.name}</span>
+ </DropdownMenuCheckboxItem>
+ ))}
- <DropdownMenuSub>
- <DropdownMenuSubTrigger className="gap-2">
- <span>Status</span>
- </DropdownMenuSubTrigger>
- <DropdownMenuSubContent className="w-48">
- {project?.columns?.map((column) => (
- <DropdownMenuCheckboxItem
- key={column.id}
- checked={filters.status === column.id}
- onCheckedChange={() =>
- updateFilter("status", column.id)
- }
- >
- {getColumnIcon(column.id, column.isFinal)}
- <span>{column.name}</span>
- </DropdownMenuCheckboxItem>
- ))}
- </DropdownMenuSubContent>
- </DropdownMenuSub>
+ <DropdownMenuSeparator />
+ <DropdownMenuGroup>
+ <DropdownMenuLabel className="text-[11px] uppercase tracking-wide">
+ Priority
+ </DropdownMenuLabel>
+ </DropdownMenuGroup>
+ {["urgent", "high", "medium", "low"].map((priority) => (
+ <DropdownMenuCheckboxItem
+ key={priority}
+ checked={filters.priority === priority}
+ onCheckedChange={(checked) =>
+ updateFilter("priority", checked ? priority : null)
+ }
+ className="h-8 rounded-md text-sm [&_svg]:text-sidebar-foreground"
+ >
+ {getPriorityIcon(priority)}
+ <span className="capitalize">{priority}</span>
+ </DropdownMenuCheckboxItem>
+ ))}
- <DropdownMenuSub>
- <DropdownMenuSubTrigger className="gap-2">
- <span>Priority</span>
- </DropdownMenuSubTrigger>
- <DropdownMenuSubContent className="w-48">
- {["urgent", "high", "medium", "low"].map((priority) => (
- <DropdownMenuCheckboxItem
- key={priority}
- checked={filters.priority === priority}
- onCheckedChange={() =>
- updateFilter("priority", priority)
- }
- className="[&_svg]:text-muted-foreground"
- >
- {getPriorityIcon(priority)}
- <span className="capitalize">{priority}</span>
- </DropdownMenuCheckboxItem>
- ))}
- </DropdownMenuSubContent>
- </DropdownMenuSub>
+ <DropdownMenuSeparator />
+ <DropdownMenuGroup>
+ <DropdownMenuLabel className="text-[11px] uppercase tracking-wide">
+ Assignee
+ </DropdownMenuLabel>
+ </DropdownMenuGroup>
+ {users?.members?.map((member) => (
+ <DropdownMenuCheckboxItem
+ key={member.userId}
+ checked={filters.assignee === member.userId}
+ onCheckedChange={(checked) =>
+ updateFilter("assignee", checked ? member.userId : null)
+ }
+ className="h-8 rounded-md text-sm"
+ >
+ <Avatar className="h-6 w-6">
+ <AvatarImage
+ src={member.user?.image ?? ""}
+ alt={member.user?.name || ""}
+ />
+ <AvatarFallback className="text-xs font-medium border border-border/30">
+ {member.user?.name?.charAt(0).toUpperCase()}
+ </AvatarFallback>
+ </Avatar>
+ <span>{member.user?.name}</span>
+ </DropdownMenuCheckboxItem>
+ ))}
+
+ <DropdownMenuSeparator />
+ <DropdownMenuGroup>
+ <DropdownMenuLabel className="text-[11px] uppercase tracking-wide">
+ Due date
+ </DropdownMenuLabel>
+ </DropdownMenuGroup>
+ {["Due this week", "Due next week", "No due date"].map(
+ (dueDate) => (
+ <DropdownMenuCheckboxItem
+ key={dueDate}
+ checked={filters.dueDate === dueDate}
+ onCheckedChange={(checked) =>
+ updateFilter("dueDate", checked ? dueDate : null)
+ }
+ className="h-8 rounded-md text-sm"
+ >
+ <span>{dueDate}</span>
+ </DropdownMenuCheckboxItem>
+ ),
+ )}
- <DropdownMenuSub>
- <DropdownMenuSubTrigger className="gap-2">
- <span>Assignee</span>
- </DropdownMenuSubTrigger>
- <DropdownMenuSubContent className="w-48">
- {users?.members?.map((member) => (
+ <DropdownMenuSeparator />
+ <DropdownMenuGroup>
+ <DropdownMenuLabel className="text-[11px] uppercase tracking-wide">
+ Labels
+ </DropdownMenuLabel>
+ </DropdownMenuGroup>
+ {uniqueLabels.length > 0 ? (
+ uniqueLabels.map(
+ (label: {
+ id: string;
+ name: string;
+ color: string;
+ }) => (
<DropdownMenuCheckboxItem
- key={member.userId}
- checked={filters.assignee === member.userId}
- onCheckedChange={() =>
- updateFilter("assignee", member.userId)
- }
+ key={label.id}
+ checked={isLabelGroupSelected(label)}
+ onCheckedChange={() => toggleLabelGroup(label)}
+ className="h-8 rounded-md text-sm"
>
- <Avatar className="h-6 w-6">
- <AvatarImage
- src={member.user?.image ?? ""}
- alt={member.user?.name || ""}
- />
- <AvatarFallback className="text-xs font-medium border border-border/30">
- {member.user?.name?.charAt(0).toUpperCase()}
- </AvatarFallback>
- </Avatar>
- <span>{member.user?.name}</span>
+ <span
+ className="w-3 h-3 rounded-full flex-shrink-0"
+ style={{
+ backgroundColor:
+ labelColors.find((c) => c.value === label.color)
+ ?.color || "var(--color-neutral-400)",
+ }}
+ />
+ <span>{label.name}</span>
</DropdownMenuCheckboxItem>
- ))}
- </DropdownMenuSubContent>
- </DropdownMenuSub>
-
- <DropdownMenuSub>
- <DropdownMenuSubTrigger className="gap-2">
- <span>Due Date</span>
- </DropdownMenuSubTrigger>
- <DropdownMenuSubContent className="w-48">
- {["Due this week", "Due next week", "No due date"].map(
- (dueDate) => (
- <DropdownMenuCheckboxItem
- key={dueDate}
- checked={filters.dueDate === dueDate}
- onCheckedChange={() =>
- updateFilter("dueDate", dueDate)
- }
- >
- <span>{dueDate}</span>
- </DropdownMenuCheckboxItem>
- ),
- )}
- </DropdownMenuSubContent>
- </DropdownMenuSub>
-
- <DropdownMenuSub>
- <DropdownMenuSubTrigger className="gap-2">
- <span>Labels</span>
- </DropdownMenuSubTrigger>
- <DropdownMenuSubContent className="w-48">
- {uniqueLabels.map(
- (label: {
- id: string;
- name: string;
- color: string;
- }) => (
- <DropdownMenuCheckboxItem
- key={label.id}
- checked={isLabelGroupSelected(label)}
- onCheckedChange={() => toggleLabelGroup(label)}
- >
- <span
- className="w-3 h-3 rounded-full flex-shrink-0"
- style={{
- backgroundColor:
- labelColors.find(
- (c) => c.value === label.color,
- )?.color || "#94a3b8",
- }}
- />
- <span>{label.name}</span>
- </DropdownMenuCheckboxItem>
- ),
- )}
- </DropdownMenuSubContent>
- </DropdownMenuSub>
+ ),
+ )
+ ) : (
+ <DropdownMenuItem
+ disabled
+ className="h-8 rounded-md text-sm text-muted-foreground"
+ >
+ <span>No labels available</span>
+ </DropdownMenuItem>
+ )}
</DropdownMenuContent>
</DropdownMenu>
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button
- variant="ghost"
- size="sm"
- className="h-6 px-2 text-xs text-muted-foreground"
- >
- <Settings2 className="h-3 w-3 mr-1" />
- Display
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent className="w-40" align="start">
- <DropdownMenuItem
- onClick={() => setViewMode("board")}
- className={`gap-2 ${viewMode === "board" ? "bg-accent" : ""}`}
- >
- <Layout className="h-3 w-3" />
- <span>Board</span>
- {viewMode === "board" && (
- <div className="ml-auto w-1.5 h-1.5 rounded-full bg-primary" />
- )}
- </DropdownMenuItem>
- <DropdownMenuItem
- onClick={() => setViewMode("list")}
- className={`gap-2 ${viewMode === "list" ? "bg-accent" : ""}`}
- >
- <List className="h-3 w-3" />
- <span>List</span>
- {viewMode === "list" && (
- <div className="ml-auto w-1.5 h-1.5 rounded-full bg-primary" />
- )}
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ <div className="inline-flex h-8 items-center gap-0.5 rounded-lg border border-border/80 bg-background p-0.5">
+ <Button
+ variant={viewMode === "board" ? "secondary" : "ghost"}
+ size="sm"
+ className="h-7 gap-1.5 rounded-md px-3 text-sm font-medium"
+ onClick={() => setViewMode("board")}
+ >
+ <Layout className="h-3.5 w-3.5" />
+ Board
+ </Button>
+ <Button
+ variant={viewMode === "list" ? "secondary" : "ghost"}
+ size="sm"
+ className="h-7 gap-1.5 rounded-md px-3 text-sm font-medium"
+ onClick={() => setViewMode("list")}
+ >
+ <List className="h-3.5 w-3.5" />
+ List
+ </Button>
+ </div>
</div>
</div>
</div>
@@ -516,7 +513,7 @@ function RouteComponent() {
)
) : (
<div className="flex h-full items-center justify-center">
- <div className="h-8 w-8 animate-spin rounded-full border-2 border-zinc-300 border-t-zinc-600 dark:border-zinc-700 dark:border-t-zinc-300" />
+ <div className="h-8 w-8 animate-spin rounded-full border-2 border-border border-t-foreground" />
</div>
)}
</div>
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/search.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/search.tsx
index a9c6588eb..ae24a8728 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/search.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/search.tsx
@@ -79,10 +79,10 @@ function SearchComponent() {
{isSearching ? (
<div className="flex items-center justify-center py-12">
<div className="text-center space-y-4">
- <div className="w-16 h-16 bg-zinc-200 dark:bg-zinc-800 rounded-lg animate-pulse mx-auto" />
+ <div className="w-16 h-16 bg-muted rounded-lg animate-pulse mx-auto" />
<div className="space-y-2">
- <div className="w-48 h-4 bg-zinc-200 dark:bg-zinc-800 rounded animate-pulse mx-auto" />
- <div className="w-64 h-3 bg-zinc-200 dark:bg-zinc-800 rounded animate-pulse mx-auto" />
+ <div className="w-48 h-4 bg-muted rounded animate-pulse mx-auto" />
+ <div className="w-64 h-3 bg-muted rounded animate-pulse mx-auto" />
</div>
</div>
</div>
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/create.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/create.tsx
index 2a558dbd6..382de7c4d 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/create.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/create.tsx
@@ -2,7 +2,7 @@ import { useQueryClient } from "@tanstack/react-query";
import { createFileRoute, useNavigate } from "@tanstack/react-router";
import { Building2 } from "lucide-react";
import { useEffect, useRef, useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import PageTitle from "@/components/page-title";
import { Button } from "@/components/ui/button";
@@ -63,21 +63,21 @@ function RouteComponent() {
return (
<>
<PageTitle title="Create Workspace" />
- <div className="min-h-screen w-full bg-zinc-50 dark:bg-zinc-900 flex items-center justify-center p-4 overflow-y-auto">
+ <div className="min-h-screen w-full bg-background flex items-center justify-center p-4 overflow-y-auto">
<div className="w-full max-w-md">
- <Card className="border-zinc-200 dark:border-zinc-700 bg-white dark:bg-zinc-800 shadow-sm">
+ <Card className="shadow-sm">
<CardContent className="p-8">
<div className="text-center mb-8">
<div className="flex justify-center mb-4">
- <div className="w-12 h-12 bg-zinc-100 dark:bg-zinc-700 rounded-lg flex items-center justify-center">
- <Building2 className="h-6 w-6 text-zinc-600 dark:text-zinc-400" />
+ <div className="w-12 h-12 bg-muted rounded-lg flex items-center justify-center">
+ <Building2 className="h-6 w-6 text-muted-foreground" />
</div>
</div>
- <h1 className="text-2xl font-semibold text-zinc-900 dark:text-white mb-2">
+ <h1 className="text-2xl font-semibold text-foreground mb-2">
Create a new workspace
</h1>
- <p className="text-zinc-600 dark:text-zinc-400 text-sm">
+ <p className="text-muted-foreground text-sm">
Workspaces are shared environments where teams can work on
projects, cycles and issues.
</p>
@@ -88,7 +88,7 @@ function RouteComponent() {
<div>
<label
htmlFor="workspace-name"
- className="block text-sm font-medium text-zinc-700 dark:text-zinc-300 mb-2"
+ className="block text-sm font-medium text-foreground mb-2"
>
Workspace Name
</label>
@@ -98,18 +98,20 @@ function RouteComponent() {
value={name}
onChange={(e) => setName(e.target.value)}
placeholder="Enter workspace name"
- className="h-12 text-lg font-medium border-zinc-300 dark:border-zinc-600 focus:border-indigo-500 dark:focus:border-indigo-400 focus:ring-indigo-500 dark:focus:ring-indigo-400"
+ className="h-12 text-lg font-medium"
required
/>
{!name.trim() && (
- <p className="text-red-500 text-sm mt-1">Required</p>
+ <p className="mt-1 text-destructive-foreground text-sm">
+ Required
+ </p>
)}
</div>
<div>
<label
htmlFor="workspace-description"
- className="block text-sm font-medium text-zinc-700 dark:text-zinc-300 mb-2"
+ className="block text-sm font-medium text-foreground mb-2"
>
Description (optional)
</label>
@@ -118,7 +120,7 @@ function RouteComponent() {
value={description}
onChange={(e) => setDescription(e.target.value)}
placeholder="Add a description for your workspace"
- className="h-10 border-zinc-300 dark:border-zinc-600 focus:border-indigo-500 dark:focus:border-indigo-400 focus:ring-indigo-500 dark:focus:ring-indigo-400"
+ className="h-10"
/>
</div>
</div>
@@ -127,7 +129,7 @@ function RouteComponent() {
<Button
type="submit"
disabled={!name.trim() || isPending}
- className="w-full h-12 bg-indigo-600 hover:bg-indigo-500 text-white font-medium disabled:opacity-50 disabled:cursor-not-allowed"
+ className="w-full h-12 font-medium disabled:opacity-50 disabled:cursor-not-allowed"
>
{isPending ? "Creating..." : "Create workspace"}
</Button>
diff --git a/apps/web/src/routes/_layout/_authenticated/invitations.tsx b/apps/web/src/routes/_layout/_authenticated/invitations.tsx
index 1cc4ad631..5c2c10a91 100644
--- a/apps/web/src/routes/_layout/_authenticated/invitations.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/invitations.tsx
@@ -2,7 +2,7 @@ import { useQueryClient } from "@tanstack/react-query";
import { createFileRoute, useNavigate } from "@tanstack/react-router";
import { CheckCircle, Loader2, Mail, X } from "lucide-react";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import PageTitle from "@/components/page-title";
import useAuth from "@/components/providers/auth-provider/hooks/use-auth";
import { Badge } from "@/components/ui/badge";
diff --git a/apps/web/src/routes/auth/sign-in.tsx b/apps/web/src/routes/auth/sign-in.tsx
index 3f5ecefac..db07c29f5 100644
--- a/apps/web/src/routes/auth/sign-in.tsx
+++ b/apps/web/src/routes/auth/sign-in.tsx
@@ -5,7 +5,7 @@ import {
} from "@tanstack/react-router";
import { Github, KeyRound, UserCheck } from "lucide-react";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { z } from "zod/v4";
import PageTitle from "@/components/page-title";
import { Alert, AlertDescription } from "@/components/ui/alert";
diff --git a/apps/web/src/routes/auth/sign-up.tsx b/apps/web/src/routes/auth/sign-up.tsx
index 93fbca0c1..9c1e7a861 100644
--- a/apps/web/src/routes/auth/sign-up.tsx
+++ b/apps/web/src/routes/auth/sign-up.tsx
@@ -5,7 +5,7 @@ import {
} from "@tanstack/react-router";
import { UserCheck } from "lucide-react";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { z } from "zod/v4";
import { AuthLayout } from "@/components/auth/layout";
import { SignUpForm } from "@/components/auth/sign-up-form";
@@ -98,11 +98,9 @@ function SignUp() {
{isGuestLoading ? "Signing in..." : "Continue as guest"}
</Button>
<div className="flex items-center gap-4 my-4">
- <div className="flex-1 h-px bg-zinc-200 dark:bg-zinc-800" />
- <span className="text-sm text-zinc-500 dark:text-zinc-400">
- or
- </span>
- <div className="flex-1 h-px bg-zinc-200 dark:bg-zinc-800" />
+ <div className="flex-1 h-px bg-border" />
+ <span className="text-sm text-muted-foreground">or</span>
+ <div className="flex-1 h-px bg-border" />
</div>
</>
)}
diff --git a/apps/web/src/routes/auth/verify-otp.tsx b/apps/web/src/routes/auth/verify-otp.tsx
index ecb6fe72a..0bc80deed 100644
--- a/apps/web/src/routes/auth/verify-otp.tsx
+++ b/apps/web/src/routes/auth/verify-otp.tsx
@@ -3,7 +3,7 @@ import { createFileRoute, useRouter, useSearch } from "@tanstack/react-router";
import { REGEXP_ONLY_DIGITS } from "input-otp";
import { useCallback, useEffect, useState } from "react";
import { useForm } from "react-hook-form";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import { z } from "zod/v4";
import PageTitle from "@/components/page-title";
import { Button } from "@/components/ui/button";
@@ -159,7 +159,7 @@ function VerifyOtp() {
<Button
type="submit"
disabled={isPending}
- className="w-full text-white"
+ className="w-full"
>
{isPending ? "Verifying..." : "Verify & Sign In"}
</Button>
diff --git a/apps/web/src/routes/invitation/accept.$inviteId.tsx b/apps/web/src/routes/invitation/accept.$inviteId.tsx
index a0aa88b54..3195a7c92 100644
--- a/apps/web/src/routes/invitation/accept.$inviteId.tsx
+++ b/apps/web/src/routes/invitation/accept.$inviteId.tsx
@@ -14,7 +14,7 @@ import {
XCircle,
} from "lucide-react";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/lib/toast";
import PageTitle from "@/components/page-title";
import { Alert, AlertDescription } from "@/components/ui/alert";
import { Button } from "@/components/ui/button";
diff --git a/apps/web/src/routes/test-error.tsx b/apps/web/src/routes/test-error.tsx
index 9d13c3107..cf8ea5c5c 100644
--- a/apps/web/src/routes/test-error.tsx
+++ b/apps/web/src/routes/test-error.tsx
@@ -7,7 +7,7 @@ export const Route = createFileRoute("/test-error")({
function TestErrorComponent() {
return (
- <div className="min-h-screen bg-zinc-50 dark:bg-zinc-900">
+ <div className="min-h-screen bg-background">
<ErrorTest />
</div>
);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b04e522ca..c5a4dbb98 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -71,7 +71,7 @@ importers:
version: 6.0.0
better-auth:
specifier: ^1.4.17
croner:
specifier: ^10.0.1
version: 10.0.1
@@ -206,6 +206,9 @@ importers:
apps/web:
dependencies:
+ '@base-ui/react':
+ specifier: ^1.2.0
'@blocknote/core':
specifier: ^0.46.1
version: 0.46.1(@types/[email protected])
@@ -313,7 +316,7 @@ importers:
version: 19.0.0-beta-ebf51a3-20250411
better-auth:
specifier: ^1.4.18
class-variance-authority:
specifier: ^0.7.1
version: 0.7.1
@@ -567,6 +570,10 @@ packages:
peerDependencies:
'@babel/core': ^7.0.0-0
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==}
+ engines: {node: '>=6.9.0'}
+
resolution: {integrity: sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==}
engines: {node: '>=6.9.0'}
@@ -579,6 +586,27 @@ packages:
resolution: {integrity: sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==}
engines: {node: '>=6.9.0'}
+ '@base-ui/[email protected]':
+ resolution: {integrity: sha512-O6aEQHcm+QyGTFY28xuwRD3SEJGZOBDpyjN2WvpfWYFVhg+3zfXPysAILqtM0C1kWC82MccOE/v1j+GHXE4qIw==}
+ engines: {node: '>=14.0.0'}
+ peerDependencies:
+ '@types/react': ^17 || ^18 || ^19
+ react: ^17 || ^18 || ^19
+ react-dom: ^17 || ^18 || ^19
+ peerDependenciesMeta:
+ '@types/react':
+ optional: true
+
+ '@base-ui/[email protected]':
+ resolution: {integrity: sha512-oYC7w0gp76RI5MxprlGLV0wze0SErZaRl3AAkeP3OnNB/UBMb6RqNf6ZSIlxOc9Qp68Ab3C2VOcJQyRs7Xc7Vw==}
+ peerDependencies:
+ '@types/react': ^17 || ^18 || ^19
+ react: ^17 || ^18 || ^19
+ react-dom: ^17 || ^18 || ^19
+ peerDependenciesMeta:
+ '@types/react':
+ optional: true
+
'@better-auth/[email protected]':
resolution: {integrity: sha512-q+awYgC7nkLEBdx2sW0iJjkzgSHlIxGnOpsN1r/O1+a4m7osJNHtfK2mKJSL1I+GfNyIlxJF8WvD/NLuYMpmcg==}
peerDependencies:
@@ -5596,6 +5624,9 @@ packages:
resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
engines: {node: '>=0.10.0'}
+ resolution: {integrity: sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==}
+
resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
engines: {node: '>=4'}
@@ -5809,6 +5840,9 @@ packages:
resolution: {integrity: sha512-EIHvdY5bPLuWForiR/AN2Bxngzpuwn1is4asboytXtpTgsArc+WmSJKVLlhdh71u7jFcryDqB2A8lQvj78MkyQ==}
+ resolution: {integrity: sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==}
+
resolution: {integrity: sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==}
engines: {node: '>=20'}
@@ -6334,6 +6368,8 @@ snapshots:
'@babel/core': 7.28.5
'@babel/helper-plugin-utils': 7.27.1
+ '@babel/[email protected]': {}
+
dependencies:
'@babel/code-frame': 7.27.1
@@ -6357,7 +6393,31 @@ snapshots:
'@babel/helper-string-parser': 7.27.1
'@babel/helper-validator-identifier': 7.28.5
+ dependencies:
+ '@babel/runtime': 7.28.6
+ '@floating-ui/react-dom': 2.1.6([email protected]([email protected]))([email protected])
+ '@floating-ui/utils': 0.2.10
+ react: 19.2.4
+ react-dom: 19.2.4([email protected])
+ tabbable: 6.4.0
+ use-sync-external-store: 1.6.0([email protected])
+ optionalDependencies:
+ '@types/react': 19.2.13
+
+ dependencies:
+ '@babel/runtime': 7.28.6
+ '@floating-ui/utils': 0.2.10
+ react: 19.2.4
+ react-dom: 19.2.4([email protected])
+ reselect: 5.1.1
+ use-sync-external-store: 1.6.0([email protected])
+ optionalDependencies:
+ '@types/react': 19.2.13
+
dependencies:
'@better-auth/utils': 0.3.0
'@better-fetch/fetch': 1.1.21
@@ -6368,9 +6428,9 @@ snapshots:
nanostores: 1.1.0
zod: 4.3.6
dependencies:
'@better-auth/utils': 0.3.0
'@better-fetch/fetch': 1.1.21
@@ -9110,10 +9170,10 @@ snapshots:
dependencies:
'@better-auth/utils': 0.3.0
'@better-fetch/fetch': 1.1.21
'@noble/ciphers': 2.1.1
@@ -11508,6 +11568,8 @@ snapshots:
+
@@ -11782,6 +11844,8 @@ snapshots:
+