Skip to content

Commit

Permalink
Merge branch 'master' of github.com:nodetec/comet
Browse files Browse the repository at this point in the history
  • Loading branch information
ChristianChiarulli committed Jan 3, 2025
2 parents 1083364 + 99e5a00 commit f9f8299
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion frontend/src/features/sidebar/components/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
import { Button } from "~/components/ui/button";
import { ScrollArea } from "~/components/ui/scroll-area";
import { Settings } from "~/features/settings";
import { useTags } from "~/hooks/useTags";
import { cn } from "~/lib/utils";
import { useAppState } from "~/store";
import { Settings2Icon, UserCircleIcon } from "lucide-react";
Expand All @@ -20,6 +21,8 @@ import { TrashBtn } from "./TrashBtn";
export function Sidebar() {
const setSettingsTab = useAppState((state) => state.setSettingsTab);
const lastTagVisible = useAppState((state) => state.lastTagVisible);
const tags = useTags();
const tagsCount = tags.data?.length ?? 0;

return (
<div className="flex h-full flex-col justify-between bg-secondary pt-2">
Expand All @@ -46,7 +49,7 @@ export function Sidebar() {
<ScrollArea
className={cn(
"flex h-full flex-col gap-y-2",
!lastTagVisible && "border-b",
!lastTagVisible && tagsCount > 0 && "border-b",
)}
>
<div className="flex flex-col gap-y-1 px-3">
Expand Down

0 comments on commit f9f8299

Please sign in to comment.