Skip to content

Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.

refactor: improved mode-toogle component for better experience

ashrafchowduryd0a4d2340465
diff --git a/components/Sidebar.tsx b/components/Sidebar.tsx
index f6ad7920..925c9553 100644
--- a/components/Sidebar.tsx
+++ b/components/Sidebar.tsx
@@ -30,7 +30,10 @@ export default function Sidebar() {
<MenuIcon className="h-6 w-6" aria-hidden="true" />
</button>
</SheetTrigger>
- <SheetContent side="left" className="w-[280px] sm:w-[300px] lg:hidden p-0 m-0">
+ <SheetContent
+ side="left"
+ className="w-[280px] sm:w-[300px] lg:hidden p-0 m-0"
+ >
<SidebarComponent className="flex" />
</SheetContent>
</Sheet>
diff --git a/components/profile-menu.tsx b/components/profile-menu.tsx
index fe2341fa..9890782e 100644
--- a/components/profile-menu.tsx
+++ b/components/profile-menu.tsx
@@ -3,6 +3,7 @@ import ChevronUp from "@/components/shared/icons/chevron-up";
import Link from "next/link";
import Image from "next/image";
import UserRound from "./shared/icons/user-round";
+import { ModeToggle } from "./theme-toggle";
import { Skeleton } from "@/components/ui/skeleton";
import {
DropdownMenu,
@@ -69,10 +70,11 @@ const ProfileMenu = ({ className, size }: ProfileMenuProps) => {
{session?.user?.email}
</DropdownMenuLabel>
<DropdownMenuSeparator className="!my-2" />
+ <ModeToggle />
<a
href="mailto:[email protected]"
- className="flex items-center px-3 py-2 mb-1 text-sm hover:bg-muted duration-200"
+ className="flex items-center px-3 py-2 my-1 text-sm hover:bg-muted duration-200"
>
<HelpCircle className="w-4 h-4 mr-2" />
Need Help?
diff --git a/components/theme-toggle.tsx b/components/theme-toggle.tsx
index 5a298416..eb62ae58 100644
--- a/components/theme-toggle.tsx
+++ b/components/theme-toggle.tsx
@@ -3,39 +3,47 @@
import * as React from "react";
import Sun from "@/components/shared/icons/sun";
import Moon from "@/components/shared/icons/moon";
+import { Monitor, Palette } from "lucide-react";
import { useTheme } from "next-themes";
-
-import { Button } from "@/components/ui/button";
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
+ DropdownMenuRadioGroup,
+ DropdownMenuRadioItem,
+ DropdownMenuSub,
+ DropdownMenuSubTrigger,
+ DropdownMenuSubContent,
+ DropdownMenuPortal,
} from "@/components/ui/dropdown-menu";
export function ModeToggle() {
- const { setTheme } = useTheme();
+ const { setTheme, theme } = useTheme();
return (
- <DropdownMenu>
- <DropdownMenuTrigger asChild className="shrink-0">
- <Button variant="outline" size="icon">
- <Sun className="h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
- <Moon className="absolute h-[1.2rem] w-[1.2rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
- <span className="sr-only">Toggle theme</span>
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="end">
- <DropdownMenuItem onClick={() => setTheme("light")}>
- Light
- </DropdownMenuItem>
- <DropdownMenuItem onClick={() => setTheme("dark")}>
- Dark
- </DropdownMenuItem>
- <DropdownMenuItem onClick={() => setTheme("system")}>
- System
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ <DropdownMenuSub>
+ <DropdownMenuSubTrigger className="w-full flex items-center px-3 !py-2 text-sm hover:bg-muted duration-200 rounded-none pr-2">
+ <Palette className="w-4 h-4 mr-2" /> Themes
+ </DropdownMenuSubTrigger>
+ <DropdownMenuPortal>
+ <DropdownMenuSubContent className="w-[180px]">
+ <DropdownMenuRadioGroup
+ value={theme}
+ onValueChange={setTheme}
+ className="*:flex *:items-center space-y-1"
+ >
+ <DropdownMenuRadioItem value="light">
+ <Sun className="h-4 w-4 mr-2" />
+ Light
+ </DropdownMenuRadioItem>
+ <DropdownMenuRadioItem value="dark">
+ <Moon className="h-4 w-4 mr-2" />
+ Dark
+ </DropdownMenuRadioItem>
+ <DropdownMenuRadioItem value="system">
+ <Monitor className="h-4 w-4 mr-2" />
+ System
+ </DropdownMenuRadioItem>
+ </DropdownMenuRadioGroup>
+ </DropdownMenuSubContent>
+ </DropdownMenuPortal>
+ </DropdownMenuSub>
);
}