Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Use Combobox for FolderDropdown #2060

Merged
merged 2 commits into from
Feb 20, 2025
Merged

Use Combobox for FolderDropdown #2060

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
356cb83
Use `Combobox` for `FolderDropdown`
TWilson023 Feb 20, 2025
f04d206
Match trigger width for `input` variant
TWilson023 Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
248 changes: 124 additions & 124 deletions apps/web/ui/folders/folder-dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@ import { getPlanCapabilities } from "@/lib/plan-capabilities";
import useFolders from "@/lib/swr/use-folders";
import useWorkspace from "@/lib/swr/use-workspace";
import { FolderSummary } from "@/lib/types";
import { Button, Popover, Tick, TooltipContent } from "@dub/ui";
import { Button, Combobox, TooltipContent } from "@dub/ui";
import { cn } from "@dub/utils";
import { ChevronsUpDown } from "lucide-react";
import Link from "next/link";
import { useRouter, useSearchParams } from "next/navigation";
import { useEffect, useState } from "react";
import { useEffect, useMemo, useState } from "react";
import { useAddFolderModal } from "../modals/add-folder-modal";
import { FolderIcon } from "./folder-icon";

interface FolderDropdownProps {
variant?: "inline" | "input";
onFolderSelect?: (folder: FolderSummary) => void;
hideViewAll?: boolean;
hideFolderIcon?: boolean;
Expand All @@ -23,6 +24,7 @@ interface FolderDropdownProps {
}

export const FolderDropdown = ({
variant = "inline",
onFolderSelect,
hideViewAll = false,
hideFolderIcon = false,
Expand Down Expand Up @@ -66,151 +68,149 @@ export const FolderDropdown = ({
}
}, [folderId, folders]);

const { canAddFolder } = getPlanCapabilities(plan);

const folderOptions = useMemo(() => {
const allFolders = [unsortedLinks, ...(folders || [])];
return [
...allFolders.map((folder) => ({
value: folder.id,
label: folder.name,
icon: <FolderIcon className="mr-1" folder={folder} shape="square" />,
meta: folder,
})),
{
value: "create",
label: "Create new folder",
icon: (
<FolderIcon
className="mr-1"
folder={{ id: "new", accessLevel: null }}
shape="square"
/>
),
disabledTooltip: !canAddFolder ? (
<TooltipContent
title="You can only use Link Folders on a Pro plan and above. Upgrade to Pro to continue."
cta="Upgrade to Pro"
href={`/${slug}/upgrade`}
/>
) : undefined,
},
];
}, [folders, canAddFolder, slug]);

const selectedOption = useMemo(() => {
if (!selectedFolder) return null;
return {
value: selectedFolder.id,
label: selectedFolder.name,
icon: (
<FolderIcon className="mr-1" folder={selectedFolder} shape="square" />
),
meta: selectedFolder,
};
}, [selectedFolder]);

if (folderId && loading) {
return <FolderSwitcherPlaceholder />;
}

const { canAddFolder } = getPlanCapabilities(plan);

const As = onFolderSelect ? "button" : Link;

return (
<>
<AddFolderModal />
<Popover
content={
<div className="relative mt-1 max-h-80 w-full space-y-0.5 overflow-auto rounded-md bg-white p-2 text-base sm:w-60 sm:text-sm sm:shadow-lg md:w-80">
{!hideViewAll && (
<div className="flex items-center justify-between px-2 pb-1">
<p className="text-xs font-medium text-neutral-500">Folders</p>
<Link
href={`/${slug}/settings/library/folders`}
onClick={() => setOpenPopover(false)}
className="rounded-md border border-neutral-200 px-2 py-1 text-xs transition-colors hover:bg-neutral-100"
>
View All
</Link>
</div>
)}

{[unsortedLinks, ...(folders || [])].map((folder) => {
return (
<As
key={folder.id}
href={
onFolderSelect
? "#"
: `/${slug}${folder.id === "unsorted" ? "" : `?folderId=${folder.id}`}`
}
className={cn(
"relative flex w-full items-center gap-x-2 rounded-md px-2 py-1.5 transition-all duration-75 hover:bg-neutral-100 active:bg-neutral-200",
{
"font-medium": selectedFolder?.id === folder.id,
},
)}
onClick={() => {
setOpenPopover(false);
setSelectedFolder(folder);
onFolderSelect?.(folder);
}}
>
<FolderIcon folder={folder} shape="square" />
<span
className={`flex items-center justify-start gap-1.5 text-sm sm:max-w-36 md:max-w-52 ${
selectedFolder?.id === folder.id
? "font-medium"
: "font-normal"
}`}
>
<span className="truncate">{folder.name}</span>

{folder.id === "unsorted" && (
<div className="rounded bg-neutral-100 p-1">
<div className="text-xs font-normal text-black">
Unsorted
</div>
</div>
)}
</span>

{selectedFolder?.id === folder.id && (
<span className="absolute inset-y-0 right-0 flex items-center pr-3 text-black">
<Tick className="size-5" aria-hidden="true" />
</span>
)}
</As>
);
})}

{loading &&
Array.from({ length: 3 }).map((_, index) => (
<FolderItemPlaceholder key={index} />
))}

<Combobox
selected={selectedOption}
setSelected={(option) => {
if (option?.value === "create") {
setShowAddFolderModal(true);
return;
}

const folder = option?.meta;
if (folder) {
setSelectedFolder(folder);
onFolderSelect
? onFolderSelect(folder)
: router.push(
`/${slug}${folder.id === "unsorted" ? "" : `?folderId=${folder.id}`}`,
);
}
}}
inputRight={
hideViewAll ? undefined : (
<Link
href={`/${slug}/settings/library/folders`}
onClick={() => setOpenPopover(false)}
className="rounded-md border border-neutral-200 px-2 py-1 text-xs transition-colors hover:bg-neutral-100"
>
View All
</Link>
)
}
options={loading ? undefined : folderOptions}
icon={
!(selectedFolder?.id === "unsorted" && hideFolderIcon) &&
selectedFolder ? (
<FolderIcon
folder={selectedFolder}
shape="square"
className="hidden md:block"
/>
) : undefined
}
optionRight={(option) =>
option.value === "unsorted" ? (
<div className="rounded bg-neutral-100 p-1">
<div className="text-xs font-normal text-black">Unsorted</div>
</div>
) : undefined
}
caret={
<ChevronsUpDown className="ml-2 size-4 shrink-0 text-neutral-400" />
}
buttonProps={{
className: cn(
"group flex items-center gap-2 rounded-lg px-2 py-1 w-fit",
variant === "inline" && "border-none !ring-0",
"transition-colors hover:bg-neutral-100 active:bg-neutral-200 data-[state=open]:bg-neutral-100",
buttonClassName,
),
textWrapperClassName: cn(
"min-w-0 truncate text-left text-xl font-semibold leading-7 text-neutral-900 md:text-2xl",
buttonTextClassName,
),
}}
optionClassName="md:min-w-[250px]"
searchPlaceholder="Search folders..."
emptyState={
<div className="flex w-full flex-col items-center gap-2 py-4">
No folders found
<Button
key="add-folder"
variant="outline"
icon={
<FolderIcon
folder={{ id: "new", accessLevel: null }}
shape="square"
/>
}
text="Create new folder"
className="justify-start px-2"
onClick={() => {
setOpenPopover(false);
setShowAddFolderModal(true);
}}
variant="primary"
className="h-7 w-fit px-2"
disabledTooltip={
!canAddFolder && (
!canAddFolder ? (
<TooltipContent
title="You can only use Link Folders on a Pro plan and above. Upgrade to Pro to continue."
cta="Upgrade to Pro"
href={`/${slug}/upgrade`}
/>
)
) : undefined
}
text="Create folder"
/>
</div>
}
openPopover={openPopover}
setOpenPopover={setOpenPopover}
align="start"
popoverContentClassName="-ml-1"
onWheel={(e) => {
// Allows scrolling to work when the popover's in a modal
e.stopPropagation();
}}
open={openPopover}
onOpenChange={setOpenPopover}
>
<button
className={cn(
"group flex max-w-40 items-center gap-2 rounded-lg px-2 py-1 md:max-w-fit",
"transition-colors hover:bg-neutral-100 active:bg-neutral-200 data-[state=open]:bg-neutral-100",
buttonClassName,
)}
>
{!(selectedFolder?.id === "unsorted" && hideFolderIcon) &&
selectedFolder && (
<FolderIcon
folder={selectedFolder}
shape="square"
className="hidden md:block"
/>
)}

<h1
className={cn(
"min-w-0 truncate text-left text-xl font-semibold leading-7 text-neutral-900 md:text-2xl",
buttonTextClassName,
)}
>
{selectedFolder ? selectedFolder.name : "Links"}
</h1>

<ChevronsUpDown className="ml-auto size-4 shrink-0 text-neutral-400" />
</button>
</Popover>
{selectedFolder ? selectedFolder.name : "Links"}
</Combobox>
</>
);
};
Expand Down
1 change: 1 addition & 0 deletions apps/web/ui/folders/move-link-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ export const MoveLinkForm = ({
</label>
<div className="mt-1">
<FolderDropdown
variant="input"
hideViewAll={true}
disableAutoRedirect={true}
onFolderSelect={(folder) => {
Expand Down
Loading
Loading