Skip to content

⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.

improved dropdown UI

daniel31x13b9be960c7eb4
diff --git a/apps/web/components/CollectionCard.tsx b/apps/web/components/CollectionCard.tsx
index 4ecfe28a..d9dace99 100644
--- a/apps/web/components/CollectionCard.tsx
+++ b/apps/web/components/CollectionCard.tsx
@@ -11,9 +11,15 @@ import getPublicUserData from "@/lib/client/getPublicUserData";
import EditCollectionModal from "./ModalContent/EditCollectionModal";
import EditCollectionSharingModal from "./ModalContent/EditCollectionSharingModal";
import DeleteCollectionModal from "./ModalContent/DeleteCollectionModal";
-import { dropdownTriggerer } from "@/lib/client/utils";
import { useTranslation } from "next-i18next";
import { useUser } from "@linkwarden/router/user";
+import {
+ DropdownMenu,
+ DropdownMenuTrigger,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuSeparator,
+} from "@/components/ui/dropdown-menu";
export default function CollectionCard({
collection,
@@ -67,63 +73,53 @@ export default function CollectionCard({
return (
<div className="relative">
- <div className="dropdown dropdown-bottom dropdown-end absolute top-3 right-3 z-20">
- <div
- tabIndex={0}
- role="button"
- onMouseDown={dropdownTriggerer}
- className="btn btn-ghost btn-sm btn-square text-neutral"
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <button className="absolute top-3 right-3 z-20 btn btn-ghost btn-sm btn-square text-neutral">
+ <i title="More" className="bi-three-dots text-xl" />
+ </button>
+ </DropdownMenuTrigger>
+
+ <DropdownMenuContent
+ sideOffset={4}
+ side="bottom"
+ align="end"
+ className="mt-1 z-[30]"
>
- <i className="bi-three-dots text-xl" title={t("more")}></i>
- </div>
- <ul className="dropdown-content z-[30] menu shadow bg-base-200 border border-neutral-content rounded-box mt-1">
{permissions === true && (
- <li>
- <div
- role="button"
- tabIndex={0}
- onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setEditCollectionModal(true);
- }}
- className="whitespace-nowrap"
- >
- {t("edit_collection_info")}
- </div>
- </li>
+ <DropdownMenuItem onSelect={() => setEditCollectionModal(true)}>
+ <i className="bi-pencil-square" />
+ {t("edit_collection_info")}
+ </DropdownMenuItem>
)}
- <li>
- <div
- role="button"
- tabIndex={0}
- onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setEditCollectionSharingModal(true);
- }}
- className="whitespace-nowrap"
- >
- {permissions === true
- ? t("share_and_collaborate")
- : t("view_team")}
- </div>
- </li>
- <li>
- <div
- role="button"
- tabIndex={0}
- onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setDeleteCollectionModal(true);
- }}
- className="whitespace-nowrap"
- >
- {permissions === true
- ? t("delete_collection")
- : t("leave_collection")}
- </div>
- </li>
- </ul>
- </div>
+
+ <DropdownMenuItem
+ onSelect={() => setEditCollectionSharingModal(true)}
+ >
+ <i className="bi-globe" />
+ {permissions === true ? t("share_and_collaborate") : t("view_team")}
+ </DropdownMenuItem>
+
+ <DropdownMenuSeparator />
+
+ <DropdownMenuItem
+ onSelect={() => setDeleteCollectionModal(true)}
+ className="text-error"
+ >
+ {permissions === true ? (
+ <>
+ <i className="bi-trash" />
+ {t("delete_collection")}
+ </>
+ ) : (
+ <>
+ <i className="bi-box-arrow-left" />
+ {t("leave_collection")}
+ </>
+ )}
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
<div
className="flex items-center absolute bottom-3 left-3 z-10 btn px-2 btn-ghost rounded-full"
onClick={() => setEditCollectionSharingModal(true)}
diff --git a/apps/web/components/ImportDropdown.tsx b/apps/web/components/ImportDropdown.tsx
index 8a7c884f..f9d4acc9 100644
--- a/apps/web/components/ImportDropdown.tsx
+++ b/apps/web/components/ImportDropdown.tsx
@@ -2,102 +2,75 @@ import React from "react";
import importBookmarks from "@/lib/client/importBookmarks";
import { MigrationFormat } from "@linkwarden/types";
import { useTranslation } from "next-i18next";
-import { dropdownTriggerer } from "@/lib/client/utils";
+import {
+ DropdownMenu,
+ DropdownMenuTrigger,
+ DropdownMenuContent,
+ DropdownMenuItem,
+} from "@/components/ui/dropdown-menu";
+import { Button } from "./ui/button";
type Props = {};
+
const ImportDropdown = ({}: Props) => {
const { t } = useTranslation();
return (
- <div className="dropdown dropdown-bottom">
- <div
- tabIndex={0}
- role="button"
- onMouseDown={dropdownTriggerer}
- className="inline-flex items-center gap-2 text-sm btn bg-neutral-content text-base-content hover:bg-neutral-content/80 border border-neutral/30 hover:border hover:border-neutral/30"
- id="import-dropdown"
- >
- <i className="bi-cloud-upload text-xl duration-100"></i>
- <p>{t("import_links")}</p>
- </div>
- <ul className="shadow menu dropdown-content z-[1] bg-base-200 border border-neutral-content rounded-box mt-1">
- <li>
- <label
- tabIndex={0}
- role="button"
- htmlFor="import-linkwarden-file"
- title={t("from_linkwarden")}
- className="whitespace-nowrap"
- >
- {t("from_linkwarden")}
- <input
- type="file"
- name="photo"
- id="import-linkwarden-file"
- accept=".json"
- className="hidden"
- onChange={(e) => importBookmarks(e, MigrationFormat.linkwarden)}
- />
- </label>
- </li>
- <li>
- <label
- tabIndex={0}
- role="button"
- htmlFor="import-html-file"
- title={t("from_html")}
- className="whitespace-nowrap"
- >
- {t("from_html")}
- <input
- type="file"
- name="photo"
- id="import-html-file"
- accept=".html"
- className="hidden"
- onChange={(e) => importBookmarks(e, MigrationFormat.htmlFile)}
- />
- </label>
- </li>
- <li>
- <label
- tabIndex={0}
- role="button"
- htmlFor="import-wallabag-file"
- title={t("from_wallabag")}
- className="whitespace-nowrap"
- >
- {t("from_wallabag")}
- <input
- type="file"
- name="photo"
- id="import-wallabag-file"
- accept=".json"
- className="hidden"
- onChange={(e) => importBookmarks(e, MigrationFormat.wallabag)}
- />
- </label>
- </li>
- <li>
- <label
- tabIndex={0}
- role="button"
- htmlFor="import-omnivore-file"
- title={t("from_omnivore")}
- className="whitespace-nowrap"
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button variant="metal">
+ <i className="bi-cloud-upload text-xl"></i>
+ {t("import_links")}
+ </Button>
+ </DropdownMenuTrigger>
+
+ <DropdownMenuContent side="bottom" align="start">
+ {[
+ {
+ id: "import-linkwarden-file",
+ format: MigrationFormat.linkwarden,
+ label: t("from_linkwarden"),
+ },
+ {
+ id: "import-html-file",
+ format: MigrationFormat.htmlFile,
+ label: t("from_html"),
+ },
+ {
+ id: "import-wallabag-file",
+ format: MigrationFormat.wallabag,
+ label: t("from_wallabag"),
+ },
+ {
+ id: "import-omnivore-file",
+ format: MigrationFormat.omnivore,
+ label: t("from_omnivore"),
+ },
+ ].map((item) => (
+ <DropdownMenuItem
+ asChild
+ key={item.id}
+ onSelect={(e) => e.preventDefault()}
>
- {t("from_omnivore")}
- <input
- type="file"
- name="photo"
- id="import-omnivore-file"
- accept=".zip"
- className="hidden"
- onChange={(e) => importBookmarks(e, MigrationFormat.omnivore)}
- />
- </label>
- </li>
- </ul>
- </div>
+ <label htmlFor={item.id} className="whitespace-nowrap w-full">
+ {item.label}
+ <input
+ type="file"
+ id={item.id}
+ accept={
+ item.id === "import-html-file"
+ ? ".html"
+ : item.id === "import-omnivore-file"
+ ? ".zip"
+ : ".json"
+ }
+ className="hidden"
+ onChange={(e) => importBookmarks(e, item.format)}
+ />
+ </label>
+ </DropdownMenuItem>
+ ))}
+ </DropdownMenuContent>
+ </DropdownMenu>
);
};
diff --git a/apps/web/components/LinkListOptions.tsx b/apps/web/components/LinkListOptions.tsx
index bd2138f0..deef363e 100644
--- a/apps/web/components/LinkListOptions.tsx
+++ b/apps/web/components/LinkListOptions.tsx
@@ -154,7 +154,6 @@ const LinkListOptions = ({
</button>
<button
onClick={(e) => {
- (document?.activeElement as HTMLElement)?.blur();
e.shiftKey ? bulkDeleteLinks() : setBulkDeleteLinksModal(true);
}}
className="btn btn-sm bg-red-500 hover:bg-red-400 text-white w-fit ml-auto"
diff --git a/apps/web/components/LinkViews/LinkComponents/LinkActions.tsx b/apps/web/components/LinkViews/LinkComponents/LinkActions.tsx
index bbc28edc..0bf9c754 100644
--- a/apps/web/components/LinkViews/LinkComponents/LinkActions.tsx
+++ b/apps/web/components/LinkViews/LinkComponents/LinkActions.tsx
@@ -5,7 +5,6 @@ import {
} from "@linkwarden/types";
import usePermissions from "@/hooks/usePermissions";
import DeleteLinkModal from "@/components/ModalContent/DeleteLinkModal";
-import { dropdownTriggerer } from "@/lib/client/utils";
import { useTranslation } from "next-i18next";
import { useDeleteLink, useGetLink } from "@linkwarden/router/links";
import toast from "react-hot-toast";
@@ -13,6 +12,13 @@ import LinkModal from "@/components/ModalContent/LinkModal";
import { useRouter } from "next/router";
import clsx from "clsx";
import usePinLink from "@/lib/client/pinLink";
+import {
+ DropdownMenu,
+ DropdownMenuTrigger,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuSeparator,
+} from "@/components/ui/dropdown-menu";
type Props = {
link: LinkIncludingShortenedCollectionAndTags;
@@ -66,8 +72,7 @@ export default function LinkActions({
<>
{isPublicRoute ? (
<div
- className="absolute top-3 right-3 group-hover:opacity-100 group-focus-within:opacity-100 opacity-0 duration-100"
- onMouseDown={dropdownTriggerer}
+ className="absolute top-3 right-3 group-hover:opacity-100 group-focus-within:opacity-100 opacity-0 duration-100 text-neutral z-20 focus:outline-none"
onClick={() => setLinkModal(true)}
>
<div className={clsx("btn btn-sm btn-square text-neutral", btnStyle)}>
@@ -75,99 +80,70 @@ export default function LinkActions({
</div>
</div>
) : (
- <div
- className={`dropdown dropdown-end absolute top-3 right-3 group-hover:opacity-100 group-focus-within:opacity-100 opacity-0 duration-100 z-20`}
- >
- <div
- tabIndex={0}
- role="button"
- onMouseDown={dropdownTriggerer}
- className={clsx("btn btn-sm btn-square text-neutral", btnStyle)}
- >
- <i title="More" className="bi-three-dots text-xl" />
- </div>
- <ul
- className={
- "dropdown-content z-[20] menu shadow bg-base-200 border border-neutral-content rounded-box mt-1"
- }
- >
- <li>
- <div
- role="button"
- tabIndex={0}
- onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- pinLink(link);
- }}
- className="whitespace-nowrap"
- >
- {link?.pinnedBy && link.pinnedBy[0]
- ? t("unpin")
- : t("pin_to_dashboard")}
- </div>
- </li>
- <li>
- <div
- role="button"
- tabIndex={0}
- onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setLinkModal(true);
- }}
- className="whitespace-nowrap"
- >
- {t("show_link_details")}
- </div>
- </li>
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <button
+ onMouseDown={(e) => e.preventDefault()}
+ className={clsx(
+ "absolute top-3 right-3 group-hover:opacity-100 group-focus-within:opacity-100 opacity-0 duration-100 btn btn-sm btn-square text-neutral z-20 focus:outline-none",
+ btnStyle
+ )}
+ >
+ <i title="More" className="bi-three-dots text-xl" />
+ </button>
+ </DropdownMenuTrigger>
+
+ <DropdownMenuContent sideOffset={4} align="end" className="mt-1">
+ <DropdownMenuItem onSelect={() => pinLink(link)}>
+ <i className="bi-pin" />
+
+ {link.pinnedBy && link.pinnedBy.length > 0
+ ? t("unpin")
+ : t("pin_to_dashboard")}
+ </DropdownMenuItem>
+
+ <DropdownMenuItem onSelect={() => setLinkModal(true)}>
+ <i className="bi-info-circle" />
+
+ {t("show_link_details")}
+ </DropdownMenuItem>
+
{(permissions === true || permissions?.canUpdate) && (
- <li>
- <div
- role="button"
- tabIndex={0}
- onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setEditLinkModal(true);
- }}
- className="whitespace-nowrap"
- >
- {t("edit_link")}
- </div>
- </li>
+ <DropdownMenuItem onSelect={() => setEditLinkModal(true)}>
+ <i className="bi-pencil-square" />
+
+ {t("edit_link")}
+ </DropdownMenuItem>
)}
+
{(permissions === true || permissions?.canDelete) && (
- <li>
- <div
- role="button"
- tabIndex={0}
- onClick={async (e) => {
- (document?.activeElement as HTMLElement)?.blur();
- console.log(e.shiftKey);
- e.shiftKey
- ? (async () => {
- const load = toast.loading(t("deleting"));
-
- await deleteLink.mutateAsync(link.id as number, {
- onSettled: (data, error) => {
- toast.dismiss(load);
-
- if (error) {
- toast.error(error.message);
- } else {
- toast.success(t("deleted"));
- }
- },
- });
- })()
- : setDeleteLinkModal(true);
+ <>
+ <DropdownMenuSeparator />
+ <DropdownMenuItem
+ className="text-error"
+ onSelect={async (e) => {
+ if ((e as any).shiftKey) {
+ const load = toast.loading(t("deleting"));
+ await deleteLink.mutateAsync(link.id as number, {
+ onSettled: (data, error) => {
+ toast.dismiss(load);
+ if (error) toast.error(error.message);
+ else toast.success(t("deleted"));
+ },
+ });
+ } else {
+ setDeleteLinkModal(true);
+ }
}}
- className="whitespace-nowrap"
>
+ <i className="bi-trash" />
+
{t("delete")}
- </div>
- </li>
+ </DropdownMenuItem>
+ </>
)}
- </ul>
- </div>
+ </DropdownMenuContent>
+ </DropdownMenu>
)}
{editLinkModal && (
<LinkModal
diff --git a/apps/web/components/MobileNavigation.tsx b/apps/web/components/MobileNavigation.tsx
index 22f3321c..fcaeb81e 100644
--- a/apps/web/components/MobileNavigation.tsx
+++ b/apps/web/components/MobileNavigation.tsx
@@ -1,4 +1,4 @@
-import { dropdownTriggerer, isIphone, isPWA } from "@/lib/client/utils";
+import { isIphone, isPWA } from "@/lib/client/utils";
import React from "react";
import { useState } from "react";
import NewLinkModal from "./ModalContent/NewLinkModal";
@@ -6,6 +6,12 @@ import NewCollectionModal from "./ModalContent/NewCollectionModal";
import UploadFileModal from "./ModalContent/UploadFileModal";
import MobileNavigationButton from "./MobileNavigationButton";
import { useTranslation } from "next-i18next";
+import {
+ DropdownMenu,
+ DropdownMenuTrigger,
+ DropdownMenuContent,
+ DropdownMenuItem,
+} from "@/components/ui/dropdown-menu";
type Props = {};
@@ -30,59 +36,28 @@ export default function MobileNavigation({}: Props) {
href={`/links/pinned`}
icon={"bi-pin-angle"}
/>
- <div className="dropdown dropdown-top -mt-4">
- <div
- tabIndex={0}
- role="button"
- onMouseDown={dropdownTriggerer}
- className={`flex items-center btn btn-accent dark:border-violet-400 text-white btn-circle w-20 h-20 px-2 relative`}
- >
- <span>
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <div className="-mt-4 flex items-center btn btn-accent dark:border-violet-400 text-white btn-circle w-20 h-20 px-2 relative">
<i className="bi-plus text-5xl pointer-events-none"></i>
- </span>
- </div>
- <ul className="dropdown-content z-[1] menu shadow bg-base-200 border border-neutral-content rounded-box mb-1 -ml-12">
- <li>
- <div
- onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setNewLinkModal(true);
- }}
- tabIndex={0}
- role="button"
- className="whitespace-nowrap"
- >
- {t("new_link")}
- </div>
- </li>
- <li>
- <div
- onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setUploadFileModal(true);
- }}
- tabIndex={0}
- role="button"
- className="whitespace-nowrap"
- >
- {t("upload_file")}
- </div>
- </li>
- <li>
- <div
- onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setNewCollectionModal(true);
- }}
- tabIndex={0}
- role="button"
- className="whitespace-nowrap"
- >
- {t("new_collection")}
- </div>
- </li>
- </ul>
- </div>
+ </div>
+ </DropdownMenuTrigger>
+
+ <DropdownMenuContent>
+ <DropdownMenuItem onSelect={() => setNewLinkModal(true)}>
+ <i className="bi-link-45deg"></i>
+ {t("new_link")}
+ </DropdownMenuItem>
+ <DropdownMenuItem onSelect={() => setUploadFileModal(true)}>
+ <i className="bi-file-earmark-arrow-up"></i>
+ {t("upload_file")}
+ </DropdownMenuItem>
+ <DropdownMenuItem onSelect={() => setNewCollectionModal(true)}>
+ <i className="bi-folder"></i>
+ {t("new_collection")}
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
<MobileNavigationButton href={`/links`} icon={"bi-link-45deg"} />
<MobileNavigationButton href={`/collections`} icon={"bi-folder"} />
</div>
diff --git a/apps/web/components/ModalContent/EditCollectionSharingModal.tsx b/apps/web/components/ModalContent/EditCollectionSharingModal.tsx
index 0ceabf8d..6bdaddbc 100644
--- a/apps/web/components/ModalContent/EditCollectionSharingModal.tsx
+++ b/apps/web/components/ModalContent/EditCollectionSharingModal.tsx
@@ -11,12 +11,18 @@ import usePermissions from "@/hooks/usePermissions";
import ProfilePhoto from "../ProfilePhoto";
import addMemberToCollection from "@/lib/client/addMemberToCollection";
import Modal from "../Modal";
-import { dropdownTriggerer } from "@/lib/client/utils";
import { useTranslation } from "next-i18next";
import { useUpdateCollection } from "@linkwarden/router/collections";
import { useUser } from "@linkwarden/router/user";
import CopyButton from "../CopyButton";
import { useRouter } from "next/router";
+import {
+ DropdownMenu,
+ DropdownMenuTrigger,
+ DropdownMenuContent,
+ DropdownMenuRadioGroup,
+ DropdownMenuRadioItem,
+} from "@/components/ui/dropdown-menu";
type Props = {
onClose: Function;
@@ -230,14 +236,27 @@ export default function EditCollectionSharingModal({
{collection.members
.sort((a, b) => (a.userId as number) - (b.userId as number))
.map((e, i) => {
- const roleLabel =
- e.canCreate && e.canUpdate && e.canDelete
- ? t("admin")
+ const roleKey: "viewer" | "contributor" | "admin" =
+ !e.canCreate && !e.canUpdate && !e.canDelete
+ ? "viewer"
: e.canCreate && !e.canUpdate && !e.canDelete
- ? t("contributor")
- : !e.canCreate && !e.canUpdate && !e.canDelete
- ? t("viewer")
- : undefined;
+ ? "contributor"
+ : "admin";
+
+ const handleRoleChange = (newRole: string) => {
+ const updatedMember = {
+ ...e,
+ canCreate: newRole !== "viewer",
+ canUpdate: newRole === "admin",
+ canDelete: newRole === "admin",
+ };
+ setCollection({
+ ...collection,
+ members: collection.members.map((m) =>
+ m.userId === e.userId ? updatedMember : m
+ ),
+ });
+ };
return (
<React.Fragment key={i}>
@@ -264,54 +283,20 @@ export default function EditCollectionSharingModal({
<div className={"flex items-center gap-2"}>
{permissions === true && !isPublicRoute ? (
- <div className="dropdown dropdown-bottom dropdown-end">
- <div
- tabIndex={0}
- role="button"
- onMouseDown={dropdownTriggerer}
- className="btn btn-sm btn-primary font-normal"
- >
- {roleLabel}
- <i className="bi-chevron-down"></i>
- </div>
- <ul className="dropdown-content z-[30] menu shadow bg-base-200 border border-neutral-content rounded-xl mt-1">
- <li>
- <label
- className="label cursor-pointer flex justify-start"
- tabIndex={0}
- role="button"
- >
- <input
- type="radio"
- name={`role-radio-${e.userId}`}
- className="radio checked:bg-primary"
- checked={
- !e.canCreate &&
- !e.canUpdate &&
- !e.canDelete
- }
- onChange={() => {
- const updatedMember = {
- ...e,
- canCreate: false,
- canUpdate: false,
- canDelete: false,
- };
- const updatedMembers =
- collection.members.map((member) =>
- member.userId === e.userId
- ? updatedMember
- : member
- );
- setCollection({
- ...collection,
- members: updatedMembers,
- });
- (
- document?.activeElement as HTMLElement
- )?.blur();
- }}
- />
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <div className="btn btn-sm btn-primary font-normal">
+ {t(roleKey)}
+ <i className="bi-chevron-down"></i>
+ </div>
+ </DropdownMenuTrigger>
+
+ <DropdownMenuContent sideOffset={4} align="end">
+ <DropdownMenuRadioGroup
+ value={roleKey}
+ onValueChange={handleRoleChange}
+ >
+ <DropdownMenuRadioItem value="viewer">
<div>
<p className="font-bold whitespace-nowrap">
{t("viewer")}
@@ -320,45 +305,9 @@ export default function EditCollectionSharingModal({
{t("viewer_desc")}
</p>
</div>
- </label>
- </li>
- <li>
- <label
- className="label cursor-pointer flex justify-start"
- tabIndex={0}
- role="button"
- >
- <input
- type="radio"
- name={`role-radio-${e.userId}`}
- className="radio checked:bg-primary"
- checked={
- e.canCreate &&
- !e.canUpdate &&
- !e.canDelete
- }
- onChange={() => {
- const updatedMember = {
- ...e,
- canCreate: true,
- canUpdate: false,
- canDelete: false,
- };
- const updatedMembers =
- collection.members.map((member) =>
- member.userId === e.userId
- ? updatedMember
- : member
- );
- setCollection({
- ...collection,
- members: updatedMembers,
- });
- (
- document?.activeElement as HTMLElement
- )?.blur();
- }}
- />
+ </DropdownMenuRadioItem>
+
+ <DropdownMenuRadioItem value="contributor">
<div>
<p className="font-bold whitespace-nowrap">
{t("contributor")}
@@ -367,45 +316,9 @@ export default function EditCollectionSharingModal({
{t("contributor_desc")}
</p>
</div>
- </label>
- </li>
- <li>
- <label
- className="label cursor-pointer flex justify-start"
- tabIndex={0}
- role="button"
- >
- <input
- type="radio"
- name={`role-radio-${e.userId}`}
- className="radio checked:bg-primary"
- checked={
- e.canCreate &&
- e.canUpdate &&
- e.canDelete
- }
- onChange={() => {
- const updatedMember = {
- ...e,
- canCreate: true,
- canUpdate: true,
- canDelete: true,
- };
- const updatedMembers =
- collection.members.map((member) =>
- member.userId === e.userId
- ? updatedMember
- : member
- );
- setCollection({
- ...collection,
- members: updatedMembers,
- });
- (
- document?.activeElement as HTMLElement
- )?.blur();
- }}
- />
+ </DropdownMenuRadioItem>
+
+ <DropdownMenuRadioItem value="admin">
<div>
<p className="font-bold whitespace-nowrap">
{t("admin")}
@@ -414,13 +327,13 @@ export default function EditCollectionSharingModal({
{t("admin_desc")}
</p>
</div>
- </label>
- </li>
- </ul>
- </div>
+ </DropdownMenuRadioItem>
+ </DropdownMenuRadioGroup>
+ </DropdownMenuContent>
+ </DropdownMenu>
) : (
<p className="text-sm text-neutral">
- {roleLabel}
+ {t(roleKey)}
</p>
)}
diff --git a/apps/web/components/ModalContent/LinkModal.tsx b/apps/web/components/ModalContent/LinkModal.tsx
index 52b2cd86..31fa4093 100644
--- a/apps/web/components/ModalContent/LinkModal.tsx
+++ b/apps/web/components/ModalContent/LinkModal.tsx
@@ -7,9 +7,15 @@ import LinkDetails from "../LinkDetails";
import Link from "next/link";
import usePermissions from "@/hooks/usePermissions";
import { useRouter } from "next/router";
-import { dropdownTriggerer } from "@/lib/client/utils";
import toast from "react-hot-toast";
import Tab from "../Tab";
+import {
+ DropdownMenu,
+ DropdownMenuTrigger,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuSeparator,
+} from "@/components/ui/dropdown-menu";
type Props = {
onClose: Function;
@@ -40,6 +46,24 @@ export default function LinkModal({
const [mode, setMode] = useState<"view" | "edit">(activeMode || "view");
+ const handleDelete = async (e: React.MouseEvent) => {
+ setTimeout(() => (document.body.style.pointerEvents = ""), 0);
+
+ if (e.shiftKey && link.id) {
+ const loading = toast.loading(t("deleting"));
+ await deleteLink.mutateAsync(link.id, {
+ onSettled: (data, error) => {
+ toast.dismiss(loading);
+ error ? toast.error(error.message) : toast.success(t("deleted"));
+ },
+ });
+ onClose();
+ } else {
+ onDelete();
+ onClose();
+ }
+ };
+
return (
<Drawer
toggleDrawer={onClose}
@@ -71,87 +95,57 @@ export default function LinkModal({
<div className="flex gap-2">
{!isPublicRoute && (
- <div className={`dropdown dropdown-end z-20`}>
- <div
- tabIndex={0}
- role="button"
- onMouseDown={dropdownTriggerer}
- className="btn btn-sm btn-circle text-base-content opacity-50 hover:opacity-100 z-10"
- >
- <i title="More" className="bi-three-dots text-xl" />
- </div>
- <ul
- className={`dropdown-content z-[20] menu shadow bg-base-200 border border-neutral-content rounded-box`}
+ <DropdownMenu modal={true}>
+ <DropdownMenuTrigger asChild>
+ <button
+ className="btn btn-sm btn-circle text-base-content opacity-50 hover:opacity-100 z-10"
+ title={t("more")}
+ >
+ <i title="More" className="bi-three-dots text-xl" />
+ </button>
+ </DropdownMenuTrigger>
+
+ <DropdownMenuContent
+ align="end"
+ className="bg-base-200 border border-neutral-content rounded-box p-1"
>
- {
- <li>
- <div
- role="button"
- tabIndex={0}
+ <DropdownMenuItem
+ onClick={() => {
+ (document.activeElement as HTMLElement)?.blur();
+ onPin();
+ }}
+ >
+ <i className="bi-pin" />
+ {link.pinnedBy?.[0] ? t("unpin") : t("pin_to_dashboard")}
+ </DropdownMenuItem>
+
+ {link.type === "url" &&
+ (permissions === true || permissions?.canUpdate) && (
+ <DropdownMenuItem
onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- onPin();
+ (document.activeElement as HTMLElement)?.blur();
+ onUpdateArchive();
}}
- className="whitespace-nowrap"
>
- {link?.pinnedBy && link.pinnedBy[0]
- ? t("unpin")
- : t("pin_to_dashboard")}
- </div>
- </li>
- }
- {link.type === "url" &&
- (permissions === true || permissions?.canUpdate) && (
- <li>
- <div
- role="button"
- tabIndex={0}
- onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- onUpdateArchive();
- }}
- className="whitespace-nowrap"
- >
- {t("refresh_preserved_formats")}
- </div>
- </li>
+ <i className="bi-arrow-clockwise"></i>
+ {t("refresh_preserved_formats")}
+ </DropdownMenuItem>
)}
+
{(permissions === true || permissions?.canDelete) && (
- <li>
- <div
- role="button"
- tabIndex={0}
- onClick={async (e) => {
- (document?.activeElement as HTMLElement)?.blur();
- console.log(e.shiftKey);
- if (e.shiftKey) {
- const load = toast.loading(t("deleting"));
-
- await deleteLink.mutateAsync(link.id as number, {
- onSettled: (data, error) => {
- toast.dismiss(load);
-
- if (error) {
- toast.error(error.message);
- } else {
- toast.success(t("deleted"));
- }
- },
- });
- onClose();
- } else {
- onDelete();
- onClose();
- }
- }}
- className="whitespace-nowrap"
+ <>
+ <DropdownMenuSeparator />
+ <DropdownMenuItem
+ onClick={handleDelete}
+ className="text-error"
>
+ <i className="bi-trash"></i>
{t("delete")}
- </div>
- </li>
+ </DropdownMenuItem>
+ </>
)}
- </ul>
- </div>
+ </DropdownMenuContent>
+ </DropdownMenu>
)}
{link.url && (
<Link
diff --git a/apps/web/components/ModalContent/NewTokenModal.tsx b/apps/web/components/ModalContent/NewTokenModal.tsx
index 5006925f..ff785bb9 100644
--- a/apps/web/components/ModalContent/NewTokenModal.tsx
+++ b/apps/web/components/ModalContent/NewTokenModal.tsx
@@ -3,11 +3,17 @@ import TextInput from "@/components/TextInput";
import { TokenExpiry } from "@linkwarden/types";
import toast from "react-hot-toast";
import Modal from "../Modal";
-import { dropdownTriggerer } from "@/lib/client/utils";
import { Button } from "@/components/ui/button";
import { useTranslation } from "next-i18next";
import { useAddToken } from "@linkwarden/router/tokens";
import CopyButton from "../CopyButton";
+import {
+ DropdownMenu,
+ DropdownMenuTrigger,
+ DropdownMenuContent,
+ DropdownMenuRadioGroup,
+ DropdownMenuRadioItem,
+} from "@/components/ui/dropdown-menu";
type Props = {
onClose: Function;
@@ -98,133 +104,53 @@ export default function NewTokenModal({ onClose }: Props) {
<div className="w-full sm:w-fit">
<p className="mb-2">{t("expires_in")}</p>
- <div className="dropdown dropdown-bottom dropdown-end w-full">
- <Button
- tabIndex={0}
- role="button"
- variant="metal"
- onMouseDown={dropdownTriggerer}
- className="whitespace-nowrap w-32"
- >
- {getLabel(token.expires)}
- </Button>
- <ul className="dropdown-content z-[30] menu shadow bg-base-200 border border-neutral-content rounded-xl mt-1">
- <li>
- <label
- className="label cursor-pointer flex justify-start"
- tabIndex={0}
- role="button"
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button variant="metal" className="whitespace-nowrap w-32">
+ {getLabel(token.expires)}
+ </Button>
+ </DropdownMenuTrigger>
+
+ <DropdownMenuContent>
+ <DropdownMenuRadioGroup
+ value={token.expires.toString()}
+ onValueChange={(e) =>
+ setToken({
+ ...token,
+ expires: Number(e),
+ })
+ }
+ >
+ <DropdownMenuRadioItem
+ value={TokenExpiry.sevenDays.toString()}
>
- <input
- type="radio"
- name="sort-radio"
- className="radio checked:bg-primary"
- checked={token.expires === TokenExpiry.sevenDays}
- onChange={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setToken({
- ...token,
- expires: TokenExpiry.sevenDays,
- });
- }}
- />
- <span className="label-text whitespace-nowrap">
- {t("7_days")}
- </span>
- </label>
- </li>
- <li>
- <label
- className="label cursor-pointer flex justify-start"
- tabIndex={0}
- role="button"
- >
- <input
- type="radio"
- name="sort-radio"
- className="radio checked:bg-primary"
- checked={token.expires === TokenExpiry.oneMonth}
- onChange={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setToken({ ...token, expires: TokenExpiry.oneMonth });
- }}
- />
- <span className="label-text whitespace-nowrap">
- {t("30_days")}
- </span>
- </label>
- </li>
- <li>
- <label
- className="label cursor-pointer flex justify-start"
- tabIndex={0}
- role="button"
+ {t("7_days")}
+ </DropdownMenuRadioItem>
+
+ <DropdownMenuRadioItem
+ value={TokenExpiry.oneMonth.toString()}
>
- <input
- type="radio"
- name="sort-radio"
- className="radio checked:bg-primary"
- checked={token.expires === TokenExpiry.twoMonths}
- onChange={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setToken({
- ...token,
- expires: TokenExpiry.twoMonths,
- });
- }}
- />
- <span className="label-text whitespace-nowrap">
- {t("60_days")}
- </span>
- </label>
- </li>
- <li>
- <label
- className="label cursor-pointer flex justify-start"
- tabIndex={0}
- role="button"
+ {t("30_days")}
+ </DropdownMenuRadioItem>
+
+ <DropdownMenuRadioItem
+ value={TokenExpiry.twoMonths.toString()}
>
- <input
- type="radio"
- name="sort-radio"
- className="radio checked:bg-primary"
- checked={token.expires === TokenExpiry.threeMonths}
- onChange={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setToken({
- ...token,
- expires: TokenExpiry.threeMonths,
- });
- }}
- />
- <span className="label-text whitespace-nowrap">
- {t("90_days")}
- </span>
- </label>
- </li>
- <li>
- <label
- className="label cursor-pointer flex justify-start"
- tabIndex={0}
- role="button"
+ {t("60_days")}
+ </DropdownMenuRadioItem>
+
+ <DropdownMenuRadioItem
+ value={TokenExpiry.threeMonths.toString()}
>
- <input
- type="radio"
- name="sort-radio"
- className="radio checked:bg-primary"
- checked={token.expires === TokenExpiry.never}
- onChange={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setToken({ ...token, expires: TokenExpiry.never });
- }}
- />
- <span className="label-text whitespace-nowrap">
- {t("no_expiration")}
- </span>
- </label>
- </li>
- </ul>
- </div>
+ {t("90_days")}
+ </DropdownMenuRadioItem>
+
+ <DropdownMenuRadioItem value={TokenExpiry.never.toString()}>
+ {t("no_expiration")}
+ </DropdownMenuRadioItem>
+ </DropdownMenuRadioGroup>
+ </DropdownMenuContent>
+ </DropdownMenu>
</div>
</div>
diff --git a/apps/web/components/Navbar.tsx b/apps/web/components/Navbar.tsx
index ca41240d..0d030378 100644
--- a/apps/web/components/Navbar.tsx
+++ b/apps/web/components/Navbar.tsx
@@ -8,10 +8,15 @@ import ToggleDarkMode from "./ToggleDarkMode";
import NewLinkModal from "./ModalContent/NewLinkModal";
import NewCollectionModal from "./ModalContent/NewCollectionModal";
import UploadFileModal from "./ModalContent/UploadFileModal";
-import { dropdownTriggerer } from "@/lib/client/utils";
import MobileNavigation from "./MobileNavigation";
import ProfileDropdown from "./ProfileDropdown";
import { useTranslation } from "next-i18next";
+import {
+ DropdownMenu,
+ DropdownMenuTrigger,
+ DropdownMenuContent,
+ DropdownMenuItem,
+} from "@/components/ui/dropdown-menu";
export default function Navbar() {
const { t } = useTranslation();
@@ -53,64 +58,38 @@ export default function Navbar() {
<div className="flex items-center gap-2">
<ToggleDarkMode className="hidden sm:inline-grid" />
- <div className="dropdown dropdown-end sm:inline-block hidden">
- <div className="tooltip tooltip-bottom" data-tip={t("create_new")}>
- <div
- tabIndex={0}
- role="button"
- onMouseDown={dropdownTriggerer}
- className="flex min-w-[3.4rem] items-center btn btn-accent dark:border-violet-400 text-white btn-sm max-h-[2rem] px-2 relative"
- >
- <span>
- <i className="bi-plus text-4xl absolute -top-[0.3rem] left-0 pointer-events-none"></i>
- </span>
- <span>
- <i className="bi-caret-down-fill text-xs absolute top-2 right-[0.3rem] pointer-events-none"></i>
- </span>
- </div>
- </div>
- <ul className="dropdown-content z-[1] menu shadow bg-base-200 border border-neutral-content rounded-box mt-1">
- <li>
- <div
- onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setNewLinkModal(true);
- }}
- tabIndex={0}
- role="button"
- className="whitespace-nowrap flex gap-2"
- >
- {t("new_link")}
- </div>
- </li>
- <li>
- <div
- onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setUploadFileModal(true);
- }}
- tabIndex={0}
- role="button"
- className="whitespace-nowrap flex gap-2"
- >
- {t("upload_file")}
- </div>
- </li>
- <li>
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <div className="tooltip tooltip-bottom" data-tip={t("create_new")}>
<div
- onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setNewCollectionModal(true);
- }}
- tabIndex={0}
role="button"
- className="whitespace-nowrap flex gap-2"
+ className="flex min-w-[3.4rem] items-center btn btn-accent dark:border-violet-400 text-white btn-sm max-h-[2rem] px-2 relative"
>
- {t("new_collection")}
+ <span>
+ <i className="bi-plus text-4xl absolute -top-[0.3rem] left-0 pointer-events-none"></i>
+ </span>
+ <span>
+ <i className="bi-caret-down-fill text-xs absolute top-2 right-[0.3rem] pointer-events-none"></i>
+ </span>
</div>
- </li>
- </ul>
- </div>
+ </div>
+ </DropdownMenuTrigger>
+
+ <DropdownMenuContent>
+ <DropdownMenuItem onSelect={() => setNewLinkModal(true)}>
+ <i className="bi-link-45deg"></i>
+ {t("new_link")}
+ </DropdownMenuItem>
+ <DropdownMenuItem onSelect={() => setUploadFileModal(true)}>
+ <i className="bi-file-earmark-arrow-up"></i>
+ {t("upload_file")}
+ </DropdownMenuItem>
+ <DropdownMenuItem onSelect={() => setNewCollectionModal(true)}>
+ <i className="bi-folder"></i>
+ {t("new_collection")}
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
<ProfileDropdown />
</div>
diff --git a/apps/web/components/ProfileDropdown.tsx b/apps/web/components/ProfileDropdown.tsx
index 2551e470..fce6e67f 100644
--- a/apps/web/components/ProfileDropdown.tsx
+++ b/apps/web/components/ProfileDropdown.tsx
@@ -1,11 +1,16 @@
import useLocalSettingsStore from "@/store/localSettings";
-import { dropdownTriggerer } from "@/lib/client/utils";
import ProfilePhoto from "./ProfilePhoto";
import Link from "next/link";
import { signOut } from "next-auth/react";
import { useTranslation } from "next-i18next";
import { useUser } from "@linkwarden/router/user";
import { useConfig } from "@linkwarden/router/config";
+import {
+ DropdownMenu,
+ DropdownMenuTrigger,
+ DropdownMenuContent,
+ DropdownMenuItem,
+} from "@/components/ui/dropdown-menu";
export default function ProfileDropdown() {
const { t } = useTranslation();
@@ -22,74 +27,59 @@ export default function ProfileDropdown() {
};
return (
- <div className="dropdown dropdown-end">
- <div
- tabIndex={0}
- role="button"
- onMouseDown={dropdownTriggerer}
- className="btn btn-circle btn-ghost"
- >
- <ProfilePhoto
- src={user.image ? user.image : undefined}
- priority={true}
- />
- </div>
- <ul
- className={`dropdown-content z-[1] menu shadow bg-base-200 border border-neutral-content rounded-box mt-1`}
- >
- <li>
- <Link
- href="/settings/account"
- onClick={() => (document?.activeElement as HTMLElement)?.blur()}
- tabIndex={0}
- role="button"
- className="whitespace-nowrap"
- >
+ <DropdownMenu>
+ <DropdownMenuTrigger>
+ <div className="btn btn-circle btn-ghost">
+ <ProfilePhoto
+ src={user.image ? user.image : undefined}
+ priority={true}
+ />
+ </div>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end">
+ <DropdownMenuItem asChild>
+ <Link href="/settings/account" className="whitespace-nowrap">
+ <i className="bi-gear"></i>
{t("settings")}
</Link>
- </li>
- <li className="block sm:hidden">
+ </DropdownMenuItem>
+
+ <DropdownMenuItem asChild>
<div
- onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- handleToggle();
- }}
- tabIndex={0}
- role="button"
- className="whitespace-nowrap"
+ onClick={() => handleToggle()}
+ className="whitespace-nowrap block sm:hidden"
>
+ {settings.theme === "light" ? (
+ <i className="bi-moon-fill"></i>
+ ) : (
+ <i className="bi-sun-fill"></i>
+ )}
{t("switch_to", {
theme: settings.theme === "light" ? t("dark") : t("light"),
})}
</div>
- </li>
+ </DropdownMenuItem>
+
{isAdmin && (
- <li>
+ <DropdownMenuItem asChild>
<Link
href="/admin"
onClick={() => (document?.activeElement as HTMLElement)?.blur()}
- tabIndex={0}
- role="button"
className="whitespace-nowrap"
>
+ <i className="bi-hdd-stack"></i>
{t("server_administration")}
</Link>
- </li>
+ </DropdownMenuItem>
)}
- <li>
- <div
- onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- signOut();
- }}
- tabIndex={0}
- role="button"
- className="whitespace-nowrap"
- >
+
+ <DropdownMenuItem asChild>
+ <div onClick={() => signOut()} className="whitespace-nowrap">
+ <i className="bi-box-arrow-left" />
{t("logout")}
</div>
- </li>
- </ul>
- </div>
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
);
}
diff --git a/apps/web/components/SortDropdown.tsx b/apps/web/components/SortDropdown.tsx
index e9b3ef31..93cd5b9c 100644
--- a/apps/web/components/SortDropdown.tsx
+++ b/apps/web/components/SortDropdown.tsx
@@ -1,10 +1,16 @@
import React, { Dispatch, SetStateAction, useEffect } from "react";
import { Sort } from "@linkwarden/types";
-import { dropdownTriggerer } from "@/lib/client/utils";
import { TFunction } from "i18next";
import useLocalSettingsStore from "@/store/localSettings";
import { resetInfiniteQueryPagination } from "@linkwarden/router/links";
import { useQueryClient } from "@tanstack/react-query";
+import {
+ DropdownMenu,
+ DropdownMenuTrigger,
+ DropdownMenuContent,
+ DropdownMenuRadioGroup,
+ DropdownMenuRadioItem,
+} from "@/components/ui/dropdown-menu";
type Props = {
sortBy: Sort;
@@ -20,98 +26,41 @@ export default function SortDropdown({ sortBy, setSort, t }: Props) {
updateSettings({ sortBy });
}, [sortBy]);
+ const handleValueChange = (value: string) => {
+ resetInfiniteQueryPagination(queryClient, ["links"]);
+ setSort(value as unknown as Sort);
+ };
+
return (
- <div className="dropdown dropdown-bottom dropdown-end">
- <div
- tabIndex={0}
- role="button"
- onMouseDown={dropdownTriggerer}
- className="btn btn-sm btn-square btn-ghost border-none"
- >
- <i className="bi-chevron-expand text-neutral text-xl"></i>
- </div>
- <ul className="dropdown-content z-[30] menu shadow bg-base-200 border border-neutral-content rounded-xl mt-1">
- <li>
- <label
- className="label cursor-pointer flex justify-start"
- tabIndex={0}
- role="button"
- >
- <input
- type="radio"
- name="sort-radio"
- className="radio checked:bg-primary"
- checked={sortBy === Sort.DateNewestFirst}
- onChange={() => {
- resetInfiniteQueryPagination(queryClient, ["links"]);
- setSort(Sort.DateNewestFirst);
- }}
- />
- <span className="label-text whitespace-nowrap">
- {t("date_newest_first")}
- </span>
- </label>
- </li>
- <li>
- <label
- className="label cursor-pointer flex justify-start"
- tabIndex={0}
- role="button"
- >
- <input
- type="radio"
- name="sort-radio"
- className="radio checked:bg-primary"
- checked={sortBy === Sort.DateOldestFirst}
- onChange={() => {
- resetInfiniteQueryPagination(queryClient, ["links"]);
- setSort(Sort.DateOldestFirst);
- }}
- />
- <span className="label-text whitespace-nowrap">
- {t("date_oldest_first")}
- </span>
- </label>
- </li>
- <li>
- <label
- className="label cursor-pointer flex justify-start"
- tabIndex={0}
- role="button"
- >
- <input
- type="radio"
- name="sort-radio"
- className="radio checked:bg-primary"
- checked={sortBy === Sort.NameAZ}
- onChange={() => {
- resetInfiniteQueryPagination(queryClient, ["links"]);
- setSort(Sort.NameAZ);
- }}
- />
- <span className="label-text whitespace-nowrap">{t("name_az")}</span>
- </label>
- </li>
- <li>
- <label
- className="label cursor-pointer flex justify-start"
- tabIndex={0}
- role="button"
- >
- <input
- type="radio"
- name="sort-radio"
- className="radio checked:bg-primary"
- checked={sortBy === Sort.NameZA}
- onChange={() => {
- resetInfiniteQueryPagination(queryClient, ["links"]);
- setSort(Sort.NameZA);
- }}
- />
- <span className="label-text whitespace-nowrap">{t("name_za")}</span>
- </label>
- </li>
- </ul>
- </div>
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <button className="btn btn-sm btn-square btn-ghost border-none">
+ <i className="bi-chevron-expand text-neutral text-xl"></i>
+ </button>
+ </DropdownMenuTrigger>
+
+ <DropdownMenuContent sideOffset={4} align="end">
+ <DropdownMenuRadioGroup
+ value={sortBy.toString()}
+ onValueChange={handleValueChange}
+ >
+ <DropdownMenuRadioItem value={Sort.DateNewestFirst.toString()}>
+ {t("date_newest_first")}
+ </DropdownMenuRadioItem>
+
+ <DropdownMenuRadioItem value={Sort.DateOldestFirst.toString()}>
+ {t("date_oldest_first")}
+ </DropdownMenuRadioItem>
+
+ <DropdownMenuRadioItem value={Sort.NameAZ.toString()}>
+ {t("name_az")}
+ </DropdownMenuRadioItem>
+
+ <DropdownMenuRadioItem value={Sort.NameZA.toString()}>
+ {t("name_za")}
+ </DropdownMenuRadioItem>
+ </DropdownMenuRadioGroup>
+ </DropdownMenuContent>
+ </DropdownMenu>
);
}
diff --git a/apps/web/components/ViewDropdown.tsx b/apps/web/components/ViewDropdown.tsx
index 6c02b0d6..4f4f8481 100644
--- a/apps/web/components/ViewDropdown.tsx
+++ b/apps/web/components/ViewDropdown.tsx
@@ -1,149 +1,147 @@
-import React, { Dispatch, SetStateAction, useEffect } from "react";
+import * as React from "react";
+import {
+ DropdownMenu,
+ DropdownMenuTrigger,
+ DropdownMenuContent,
+ DropdownMenuCheckboxItem,
+ DropdownMenuSeparator,
+} from "@/components/ui/dropdown-menu";
import useLocalSettingsStore from "@/store/localSettings";
import { ViewMode } from "@linkwarden/types";
-import { dropdownTriggerer } from "@/lib/client/utils";
import { useTranslation } from "next-i18next";
type Props = {
viewMode: ViewMode;
- setViewMode: Dispatch<SetStateAction<ViewMode>>;
+ setViewMode: React.Dispatch<React.SetStateAction<ViewMode>>;
};
export default function ViewDropdown({ viewMode, setViewMode }: Props) {
- const { settings, updateSettings } = useLocalSettingsStore((state) => state);
+ const { settings, updateSettings } = useLocalSettingsStore((s) => s);
const { t } = useTranslation();
- useEffect(() => {
+ React.useEffect(() => {
updateSettings({ viewMode });
}, [viewMode, updateSettings]);
const onChangeViewMode = (mode: ViewMode) => {
setViewMode(mode);
- updateSettings({ viewMode });
+ updateSettings({ viewMode: mode });
};
- const toggleShowSetting = (setting: keyof typeof settings.show) => {
- const newShowSettings = {
- ...settings.show,
- [setting]: !settings.show[setting],
- };
- updateSettings({ show: newShowSettings });
+ const toggleShow = (key: keyof typeof settings.show) => {
+ updateSettings({
+ show: { ...settings.show, [key]: !settings.show[key] },
+ });
};
const onColumnsChange = (e: React.ChangeEvent<HTMLInputElement>) => {
updateSettings({ columns: Number(e.target.value) });
};
+ // helper to filter which show-settings to display
+ const visibleShows = (
+ Object.keys(settings.show) as (keyof typeof settings.show)[]
+ ).filter((key) => {
+ if (settings.viewMode === ViewMode.List)
+ return key !== "tags" && key !== "image" && key !== "description";
+ if (settings.viewMode === ViewMode.Card)
+ return key !== "tags" && key !== "description";
+ return true;
+ });
+
return (
- <div className="dropdown dropdown-bottom dropdown-end">
- <div
- tabIndex={0}
- role="button"
- onMouseDown={dropdownTriggerer}
- className="btn btn-sm btn-square btn-ghost border-none"
- >
- {viewMode === ViewMode.Card ? (
- <i className="bi-grid w-4 h-4 text-neutral"></i>
- ) : viewMode === ViewMode.Masonry ? (
- <i className="bi-columns-gap w-4 h-4 text-neutral"></i>
- ) : (
- <i className="bi-view-stacked w-4 h-4 text-neutral"></i>
- )}
- </div>
- <ul
- tabIndex={0}
- className="dropdown-content z-[30] menu shadow bg-base-200 min-w-52 border border-neutral-content rounded-xl mt-1"
- >
- <div className="px-2">
- <p className="mb-1 text-sm text-neutral">{t("view")}</p>
- <div className="p-1 flex w-full justify-between gap-1 border border-neutral-content rounded-[0.625rem]">
- <button
- onClick={(e) => onChangeViewMode(ViewMode.Card)}
- className={`btn w-[31%] btn-sm btn-ghost ${
- viewMode === ViewMode.Card
- ? "bg-primary/20 hover:bg-primary/20"
- : "hover:bg-neutral/20"
- }`}
- >
- <i className="bi-grid text-lg text-neutral"></i>
- </button>
- <button
- onClick={(e) => onChangeViewMode(ViewMode.Masonry)}
- className={`btn w-[31%] btn-sm btn-ghost ${
- viewMode === ViewMode.Masonry
- ? "bg-primary/20 hover:bg-primary/20"
- : "hover:bg-neutral/20"
- }`}
- >
- <i className="bi-columns-gap text-lg text-neutral"></i>
- </button>
- <button
- onClick={(e) => onChangeViewMode(ViewMode.List)}
- className={`btn w-[31%] btn-sm btn-ghost ${
- viewMode === ViewMode.List
- ? "bg-primary/20 hover:bg-primary/20"
- : "hover:bg-neutral/20"
- }`}
- >
- <i className="bi-view-stacked text-lg text-neutral"></i>
- </button>
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <div className="btn btn-sm btn-square btn-ghost border-none">
+ {viewMode === ViewMode.Card ? (
+ <i className="bi-grid w-4 h-4 text-neutral"></i>
+ ) : viewMode === ViewMode.Masonry ? (
+ <i className="bi-columns-gap w-4 h-4 text-neutral"></i>
+ ) : (
+ <i className="bi-view-stacked w-4 h-4 text-neutral"></i>
+ )}
+ </div>
+ </DropdownMenuTrigger>
+
+ <DropdownMenuContent sideOffset={4} align="end">
+ {/* View Mode Buttons */}
+ <div className="px-1">
+ <p className="text-sm text-neutral">{t("view")}</p>
+ <div className="flex gap-1 border-border">
+ {[ViewMode.Card, ViewMode.Masonry, ViewMode.List].map((mode) => {
+ const Icon =
+ mode === ViewMode.Card
+ ? () => <i className="bi-grid w-4 h-4 text-neutral" />
+ : mode === ViewMode.Masonry
+ ? () => (
+ <i className="bi-columns-gap w-4 h-4 text-neutral" />
+ )
+ : () => (
+ <i className="bi-view-stacked w-4 h-4 text-neutral" />
+ );
+
+ return (
+ <button
+ key={mode}
+ onClick={() => onChangeViewMode(mode)}
+ className={`flex-1 btn btn-sm btn-ghost ${
+ viewMode === mode
+ ? "bg-primary/20 hover:bg-primary/20"
+ : "hover:bg-neutral/20"
+ }`}
+ >
+ <Icon />
+ </button>
+ );
+ })}
</div>
</div>
- <p className="mb-1 mt-2 text-sm text-neutral px-2">{t("show")}</p>
- {Object.entries(settings.show)
- .filter((e) =>
- settings.viewMode === ViewMode.List // Hide tags, image, and description checkboxes in list view
- ? e[0] !== "tags" && e[0] !== "image" && e[0] !== "description"
- : settings.viewMode === ViewMode.Card // Hide tags and description checkboxes in card view
- ? e[0] !== "tags" && e[0] !== "description"
- : true
- )
- .map(([key, value]) => (
- <li key={key}>
- <label className="label cursor-pointer flex justify-start">
- <input
- type="checkbox"
- className="checkbox checkbox-primary"
- checked={value}
- onChange={() =>
- toggleShowSetting(key as keyof typeof settings.show)
- }
- />
- <span className="label-text whitespace-nowrap">{t(key)}</span>
- </label>
- </li>
- ))}
+
+ <DropdownMenuSeparator />
+
+ {/* Show Toggles */}
+ <p className="text-sm text-neutral px-1">{t("show")}</p>
+ {visibleShows.map((key) => (
+ <DropdownMenuCheckboxItem
+ key={key}
+ checked={settings.show[key]}
+ onSelect={(e) => {
+ e.preventDefault();
+ toggleShow(key);
+ }}
+ >
+ {t(key)}
+ </DropdownMenuCheckboxItem>
+ ))}
+
+ {/* Columns Slider */}
{settings.viewMode !== ViewMode.List && (
- <div className="px-2">
- <p className="mb-1 mt-2 text-sm text-neutral">
- {t("columns")}:{" "}
- {settings.columns === 0 ? t("default") : settings.columns}
- </p>
- <div>
+ <>
+ <DropdownMenuSeparator />
+
+ <div className="px-1">
+ <p className="text-sm text-neutral">
+ {t("columns")}:{" "}
+ {settings.columns === 0 ? t("default") : settings.columns}
+ </p>
<input
type="range"
min={0}
- max="8"
+ max={8}
+ step={1}
value={settings.columns}
- onChange={(e) => onColumnsChange(e)}
- className="range range-xs range-primary"
- step="1"
+ onChange={onColumnsChange}
+ className="range range-xs range-primary w-full"
/>
- <div className="flex w-full justify-between px-2 text-xs text-neutral select-none">
- <span>|</span>
- <span>|</span>
- <span>|</span>
- <span>|</span>
- <span>|</span>
- <span>|</span>
- <span>|</span>
- <span>|</span>
- <span>|</span>
+ <div className="flex justify-between text-xs text-neutral select-none px-1">
+ {Array.from({ length: 9 }).map((_, i) => (
+ <span key={i}>|</span>
+ ))}
</div>
</div>
- </div>
+ </>
)}
- </ul>
- </div>
+ </DropdownMenuContent>
+ </DropdownMenu>
);
}
diff --git a/apps/web/components/ui/Button.tsx b/apps/web/components/ui/Button.tsx
index 292cdc99..30b7f84a 100644
--- a/apps/web/components/ui/Button.tsx
+++ b/apps/web/components/ui/Button.tsx
@@ -5,7 +5,7 @@ import { cva, type VariantProps } from "class-variance-authority";
import { cn } from "@/lib/utils";
const buttonVariants = cva(
- "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
+ "inline-flex items-center focus:outline-none outline-none justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
{
variants: {
variant: {
diff --git a/apps/web/components/ui/dropdown-menu.tsx b/apps/web/components/ui/dropdown-menu.tsx
new file mode 100644
index 00000000..38b8d200
--- /dev/null
+++ b/apps/web/components/ui/dropdown-menu.tsx
@@ -0,0 +1,210 @@
+import * as React from "react";
+import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
+import { Check, ChevronRight, Circle } from "lucide-react";
+
+import { cn } from "@/lib/utils";
+
+const DropdownMenu = (
+ props: React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Root>
+) => <DropdownMenuPrimitive.Root modal={false} {...props} />;
+
+const DropdownMenuTrigger = React.forwardRef<
+ React.ElementRef<typeof DropdownMenuPrimitive.Trigger>,
+ React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Trigger>
+>(({ className, ...props }, ref) => (
+ <DropdownMenuPrimitive.Trigger
+ ref={ref}
+ className={cn("focus:outline-none", className)}
+ {...props}
+ />
+));
+DropdownMenuTrigger.displayName = DropdownMenuPrimitive.Trigger.displayName;
+
+const DropdownMenuGroup = DropdownMenuPrimitive.Group;
+
+const DropdownMenuPortal = DropdownMenuPrimitive.Portal;
+
+const DropdownMenuSub = DropdownMenuPrimitive.Sub;
+
+const DropdownMenuRadioGroup = DropdownMenuPrimitive.RadioGroup;
+
+const DropdownMenuSubTrigger = React.forwardRef<
+ React.ElementRef<typeof DropdownMenuPrimitive.SubTrigger>,
+ React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubTrigger> & {
+ inset?: boolean;
+ }
+>(({ className, inset, children, ...props }, ref) => (
+ <DropdownMenuPrimitive.SubTrigger
+ ref={ref}
+ className={cn(
+ "flex cursor-pointer select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-neutral-content data-[state=open]:bg-neutral-content [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
+ inset && "pl-8",
+ className
+ )}
+ {...props}
+ >
+ {children}
+ <ChevronRight className="ml-auto" />
+ </DropdownMenuPrimitive.SubTrigger>
+));
+DropdownMenuSubTrigger.displayName =
+ DropdownMenuPrimitive.SubTrigger.displayName;
+
+const DropdownMenuSubContent = React.forwardRef<
+ React.ElementRef<typeof DropdownMenuPrimitive.SubContent>,
+ React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubContent>
+>(({ className, ...props }, ref) => (
+ <DropdownMenuPrimitive.SubContent
+ ref={ref}
+ className={cn(
+ "z-50 min-w-[8rem] overflow-hidden rounded-md border border-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-dropdown-menu-content-transform-origin]",
+ className
+ )}
+ {...props}
+ />
+));
+DropdownMenuSubContent.displayName =
+ DropdownMenuPrimitive.SubContent.displayName;
+
+const DropdownMenuContent = React.forwardRef<
+ React.ElementRef<typeof DropdownMenuPrimitive.Content>,
+ React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Content>
+>(({ className, sideOffset = 4, ...props }, ref) => (
+ <DropdownMenuPrimitive.Portal>
+ <DropdownMenuPrimitive.Content
+ ref={ref}
+ sideOffset={sideOffset}
+ className={cn(
+ "z-50 max-h-[var(--radix-dropdown-menu-content-available-height)] min-w-[8rem] overflow-y-auto overflow-x-hidden rounded-md border border-border bg-popover p-1 text-popover-foreground shadow-md 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-dropdown-menu-content-transform-origin]",
+ className
+ )}
+ {...props}
+ />
+ </DropdownMenuPrimitive.Portal>
+));
+DropdownMenuContent.displayName = DropdownMenuPrimitive.Content.displayName;
+
+const DropdownMenuItem = React.forwardRef<
+ React.ElementRef<typeof DropdownMenuPrimitive.Item>,
+ React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Item> & {
+ inset?: boolean;
+ }
+>(({ className, inset, ...props }, ref) => (
+ <DropdownMenuPrimitive.Item
+ ref={ref}
+ className={cn(
+ "relative flex cursor-pointer select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-neutral-content focus:text-neutral-content-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0 hover:bg-neutral-content hover:text-neutral-content-foreground",
+ inset && "pl-8",
+ className
+ )}
+ {...props}
+ />
+));
+DropdownMenuItem.displayName = DropdownMenuPrimitive.Item.displayName;
+
+const DropdownMenuCheckboxItem = React.forwardRef<
+ React.ElementRef<typeof DropdownMenuPrimitive.CheckboxItem>,
+ React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.CheckboxItem>
+>(({ className, children, checked, ...props }, ref) => (
+ <DropdownMenuPrimitive.CheckboxItem
+ ref={ref}
+ className={cn(
+ "relative flex cursor-pointer select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors focus:bg-neutral-content focus:text-neutral-content-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">
+ <DropdownMenuPrimitive.ItemIndicator>
+ <Check className="h-4 w-4" />
+ </DropdownMenuPrimitive.ItemIndicator>
+ </span>
+ {children}
+ </DropdownMenuPrimitive.CheckboxItem>
+));
+DropdownMenuCheckboxItem.displayName =
+ DropdownMenuPrimitive.CheckboxItem.displayName;
+
+const DropdownMenuRadioItem = React.forwardRef<
+ React.ElementRef<typeof DropdownMenuPrimitive.RadioItem>,
+ React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.RadioItem>
+>(({ className, children, ...props }, ref) => (
+ <DropdownMenuPrimitive.RadioItem
+ ref={ref}
+ className={cn(
+ "relative flex cursor-pointer select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors focus:bg-neutral-content focus:text-neutral-content-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">
+ <DropdownMenuPrimitive.ItemIndicator>
+ <Circle className="h-2 w-2 fill-current" />
+ </DropdownMenuPrimitive.ItemIndicator>
+ </span>
+ {children}
+ </DropdownMenuPrimitive.RadioItem>
+));
+DropdownMenuRadioItem.displayName = DropdownMenuPrimitive.RadioItem.displayName;
+
+const DropdownMenuLabel = React.forwardRef<
+ React.ElementRef<typeof DropdownMenuPrimitive.Label>,
+ React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Label> & {
+ inset?: boolean;
+ }
+>(({ className, inset, ...props }, ref) => (
+ <DropdownMenuPrimitive.Label
+ ref={ref}
+ className={cn(
+ "px-2 py-1.5 text-sm font-semibold",
+ inset && "pl-8",
+ className
+ )}
+ {...props}
+ />
+));
+DropdownMenuLabel.displayName = DropdownMenuPrimitive.Label.displayName;
+
+const DropdownMenuSeparator = React.forwardRef<
+ React.ElementRef<typeof DropdownMenuPrimitive.Separator>,
+ React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Separator>
+>(({ className, ...props }, ref) => (
+ <DropdownMenuPrimitive.Separator
+ ref={ref}
+ className={cn("-mx-1 my-1 h-px bg-border", className)}
+ {...props}
+ />
+));
+DropdownMenuSeparator.displayName = DropdownMenuPrimitive.Separator.displayName;
+
+const DropdownMenuShortcut = ({
+ className,
+ ...props
+}: React.HTMLAttributes<HTMLSpanElement>) => {
+ return (
+ <span
+ className={cn("ml-auto text-xs tracking-widest opacity-60", className)}
+ {...props}
+ />
+ );
+};
+DropdownMenuShortcut.displayName = "DropdownMenuShortcut";
+
+export {
+ DropdownMenu,
+ DropdownMenuTrigger,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuCheckboxItem,
+ DropdownMenuRadioItem,
+ DropdownMenuLabel,
+ DropdownMenuSeparator,
+ DropdownMenuShortcut,
+ DropdownMenuGroup,
+ DropdownMenuPortal,
+ DropdownMenuSub,
+ DropdownMenuSubContent,
+ DropdownMenuSubTrigger,
+ DropdownMenuRadioGroup,
+};
diff --git a/apps/web/lib/client/utils.ts b/apps/web/lib/client/utils.ts
index c1aa219a..d105f9a6 100644
--- a/apps/web/lib/client/utils.ts
+++ b/apps/web/lib/client/utils.ts
@@ -13,17 +13,6 @@ export function isIphone() {
);
}
-export function dropdownTriggerer(
- e: React.FocusEvent<HTMLElement> | React.MouseEvent<HTMLElement>
-) {
- let targetEl = e.currentTarget;
- if (targetEl && targetEl.matches(":focus")) {
- setTimeout(function () {
- targetEl.blur();
- }, 0);
- }
-}
-
import clsx, { ClassValue } from "clsx";
import { twMerge } from "tailwind-merge";
export const cn = (...classes: ClassValue[]) => twMerge(clsx(...classes));
diff --git a/apps/web/package.json b/apps/web/package.json
index 33ed3682..7a409e13 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -26,6 +26,7 @@
"@linkwarden/types": "*",
"@phosphor-icons/core": "^2.1.1",
"@phosphor-icons/react": "^2.1.7",
+ "@radix-ui/react-dropdown-menu": "^2.1.15",
"@radix-ui/react-slot": "^1.2.3",
"@stripe/stripe-js": "^1.54.1",
"@tanstack/react-query": "^5.51.15",
diff --git a/apps/web/pages/collections/[id].tsx b/apps/web/pages/collections/[id].tsx
index a881632e..61983468 100644
--- a/apps/web/pages/collections/[id].tsx
+++ b/apps/web/pages/collections/[id].tsx
@@ -15,7 +15,6 @@ import getPublicUserData from "@/lib/client/getPublicUserData";
import EditCollectionModal from "@/components/ModalContent/EditCollectionModal";
import EditCollectionSharingModal from "@/components/ModalContent/EditCollectionSharingModal";
import DeleteCollectionModal from "@/components/ModalContent/DeleteCollectionModal";
-import { dropdownTriggerer } from "@/lib/client/utils";
import NewCollectionModal from "@/components/ModalContent/NewCollectionModal";
import getServerSideProps from "@/lib/client/getServerSideProps";
import { useTranslation } from "next-i18next";
@@ -28,6 +27,13 @@ import Icon from "@/components/Icon";
import CollectionCard from "@/components/CollectionCard";
import { IconWeight } from "@phosphor-icons/react";
import PageHeader from "@/components/PageHeader";
+import {
+ DropdownMenu,
+ DropdownMenuTrigger,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuSeparator,
+} from "@/components/ui/dropdown-menu";
export default function Index() {
const { t } = useTranslation();
@@ -135,93 +141,88 @@ export default function Index() {
</p>
</div>
- <div className="dropdown dropdown-bottom dropdown-end mt-2">
- <div
- tabIndex={0}
- role="button"
- onMouseDown={dropdownTriggerer}
- className="btn btn-ghost btn-sm btn-square text-neutral"
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <button
+ className="btn btn-ghost btn-sm btn-square text-neutral mt-2"
+ onMouseDown={(e) => e.preventDefault()}
+ title={t("more")}
+ >
+ <i className="bi-three-dots text-xl"></i>
+ </button>
+ </DropdownMenuTrigger>
+
+ <DropdownMenuContent
+ sideOffset={4}
+ align="end"
+ className="bg-base-200 border border-neutral-content rounded-box p-1"
>
- <i className="bi-three-dots text-xl" title="More"></i>
- </div>
- <ul className="dropdown-content z-[30] menu shadow bg-base-200 border border-neutral-content rounded-box mt-1">
- <li>
- <div
- role="button"
- tabIndex={0}
- onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- for (const link of links) {
- if (link.url) window.open(link.url, "_blank");
- }
- }}
- className="whitespace-nowrap"
- >
- {t("open_all_links")}
- </div>
- </li>
+ <DropdownMenuItem
+ onClick={() => {
+ for (const link of links) {
+ if (link.url) window.open(link.url, "_blank");
+ }
+ }}
+ >
+ <i className="bi-box-arrow-up-right"></i>
+ {t("open_all_links")}
+ </DropdownMenuItem>
+
{permissions === true && (
- <li>
- <div
- role="button"
- tabIndex={0}
- onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setEditCollectionModal(true);
- }}
- className="whitespace-nowrap"
- >
- {t("edit_collection_info")}
- </div>
- </li>
- )}
- <li>
- <div
- role="button"
- tabIndex={0}
+ <DropdownMenuItem
onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setEditCollectionSharingModal(true);
+ setEditCollectionModal(true);
}}
- className="whitespace-nowrap"
>
- {permissions === true
- ? t("share_and_collaborate")
- : t("view_team")}
- </div>
- </li>
- {permissions === true && (
- <li>
- <div
- role="button"
- tabIndex={0}
- onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setNewCollectionModal(true);
- }}
- className="whitespace-nowrap"
- >
- {t("create_subcollection")}
- </div>
- </li>
+ <i className="bi-pencil-square"></i>
+ {t("edit_collection_info")}
+ </DropdownMenuItem>
)}
- <li>
- <div
- role="button"
- tabIndex={0}
+
+ <DropdownMenuItem
+ onClick={() => {
+ setEditCollectionSharingModal(true);
+ }}
+ >
+ <i className="bi-globe" />
+ {permissions === true
+ ? t("share_and_collaborate")
+ : t("view_team")}
+ </DropdownMenuItem>
+
+ {permissions === true && (
+ <DropdownMenuItem
onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setDeleteCollectionModal(true);
+ setNewCollectionModal(true);
}}
- className="whitespace-nowrap"
>
- {permissions === true
- ? t("delete_collection")
- : t("leave_collection")}
- </div>
- </li>
- </ul>
- </div>
+ <i className="bi-folder-plus" />
+ {t("create_subcollection")}
+ </DropdownMenuItem>
+ )}
+
+ <DropdownMenuSeparator />
+
+ <DropdownMenuItem
+ onClick={() => {
+ setDeleteCollectionModal(true);
+ }}
+ className="text-error"
+ >
+ {permissions === true ? (
+ <>
+ <i className="bi-trash" />
+ {t("delete_collection")}
+ </>
+ ) : (
+ <>
+ <i className="bi-box-arrow-left" />
+ {t("leave_collection")}
+ </>
+ )}
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
</div>
)}
diff --git a/apps/web/pages/collections/index.tsx b/apps/web/pages/collections/index.tsx
index 88515999..4741ce18 100644
--- a/apps/web/pages/collections/index.tsx
+++ b/apps/web/pages/collections/index.tsx
@@ -10,7 +10,12 @@ import PageHeader from "@/components/PageHeader";
import getServerSideProps from "@/lib/client/getServerSideProps";
import { useTranslation } from "next-i18next";
import { useCollections } from "@linkwarden/router/collections";
-import { dropdownTriggerer } from "@/lib/client/utils";
+import {
+ DropdownMenu,
+ DropdownMenuTrigger,
+ DropdownMenuContent,
+ DropdownMenuItem,
+} from "@/components/ui/dropdown-menu";
export default function Collections() {
const { t } = useTranslation();
@@ -37,28 +42,21 @@ export default function Collections() {
description={t("collections_you_own")}
/>
<div className="relative">
- <div className={"dropdown dropdown-bottom font-normal"}>
- <div
- tabIndex={0}
- role="button"
- onMouseDown={dropdownTriggerer}
- className="btn btn-ghost btn-sm btn-square text-neutral"
- >
- <i className={"bi-three-dots text-neutral text-xl"}></i>
- </div>
- <ul className="dropdown-content z-[30] menu shadow bg-base-200 border border-neutral-content rounded-box mt-1">
- <li>
- <div
- role="button"
- tabIndex={0}
- onClick={() => setNewCollectionModal(true)}
- className="whitespace-nowrap"
- >
- {t("new_collection")}
- </div>
- </li>
- </ul>
- </div>
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <div className="btn btn-ghost btn-sm btn-square text-neutral">
+ <i className={"bi-three-dots text-neutral text-xl"}></i>
+ </div>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent side="bottom" align="start">
+ <DropdownMenuItem
+ onSelect={() => setNewCollectionModal(true)}
+ >
+ <i className="bi-folder"></i>
+ {t("new_collection")}
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
</div>
</div>
<div className="flex gap-3 justify-end">
diff --git a/apps/web/pages/settings/account.tsx b/apps/web/pages/settings/account.tsx
index d682a3d9..590e7aa2 100644
--- a/apps/web/pages/settings/account.tsx
+++ b/apps/web/pages/settings/account.tsx
@@ -9,7 +9,6 @@ import SubmitButton from "@/components/SubmitButton";
import React from "react";
import Link from "next/link";
import Checkbox from "@/components/Checkbox";
-import { dropdownTriggerer } from "@/lib/client/utils";
import EmailChangeVerificationModal from "@/components/ModalContent/EmailChangeVerificationModal";
import { Button } from "@/components/ui/button";
import { i18n } from "next-i18next.config";
@@ -19,6 +18,13 @@ import { useUpdateUser, useUser } from "@linkwarden/router/user";
import { z } from "zod";
import ImportDropdown from "@/components/ImportDropdown";
import { useConfig } from "@linkwarden/router/config";
+import {
+ DropdownMenu,
+ DropdownMenuTrigger,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuSeparator,
+} from "@/components/ui/dropdown-menu";
export default function Account() {
const [emailChangeVerificationModal, setEmailChangeVerificationModal] =
@@ -206,25 +212,21 @@ export default function Account() {
large={true}
/>
- <div className="dropdown dropdown-bottom">
- <Button
- tabIndex={0}
- role="button"
- size="sm"
- variant="metal"
- onMouseDown={dropdownTriggerer}
- className="text-sm"
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button variant="metal" size="sm" className="text-sm">
+ <i className="bi-pencil-square text-md"></i>
+ {t("edit")}
+ </Button>
+ </DropdownMenuTrigger>
+
+ <DropdownMenuContent
+ align="start"
+ className="bg-base-200 border border-neutral-content rounded-box p-1"
>
- <i className="bi-pencil-square text-md duration-100"></i>
- {t("edit")}
- </Button>
- <ul className="shadow menu dropdown-content z-[1] bg-base-200 border border-neutral-content rounded-box mt-1">
- <li>
- <label
- tabIndex={0}
- role="button"
- className="whitespace-nowrap"
- >
+ <DropdownMenuItem onSelect={(e) => e.preventDefault()}>
+ <i className="bi-upload text-md"></i>
+ <label className="w-full flex items-center justify-between cursor-pointer whitespace-nowrap">
{t("upload_new_photo")}
<input
type="file"
@@ -235,26 +237,27 @@ export default function Account() {
onChange={handleImageUpload}
/>
</label>
- </li>
+ </DropdownMenuItem>
+
{user.image && (
- <li>
- <div
- tabIndex={0}
- role="button"
- onClick={() =>
+ <>
+ <DropdownMenuSeparator />
+ <DropdownMenuItem
+ onClick={() => {
setUser({
...user,
image: "",
- })
- }
- className="whitespace-nowrap"
+ });
+ }}
+ className="text-error"
>
+ <i className="bi-trash text-md"></i>
{t("remove_photo")}
- </div>
- </li>
+ </DropdownMenuItem>
+ </>
)}
- </ul>
- </div>
+ </DropdownMenuContent>
+ </DropdownMenu>
</div>
</div>
</div>
diff --git a/apps/web/pages/settings/billing.tsx b/apps/web/pages/settings/billing.tsx
index 4dcf6cb6..d4923b32 100644
--- a/apps/web/pages/settings/billing.tsx
+++ b/apps/web/pages/settings/billing.tsx
@@ -8,10 +8,16 @@ import getServerSideProps from "@/lib/client/getServerSideProps";
import { useUsers } from "@linkwarden/router/users";
import DeleteUserModal from "@/components/ModalContent/DeleteUserModal";
import { useUser } from "@linkwarden/router/user";
-import { dropdownTriggerer } from "@/lib/client/utils";
import clsx from "clsx";
import { signIn } from "next-auth/react";
import toast from "react-hot-toast";
+import {
+ DropdownMenu,
+ DropdownMenuTrigger,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuSeparator,
+} from "@/components/ui/dropdown-menu";
interface User extends U {
subscriptions: {
@@ -192,29 +198,28 @@ export default function Billing() {
</td>
{user.id !== account.id && (
<td className="relative">
- <div
- className={`dropdown dropdown-bottom font-normal dropdown-end absolute right-[0.35rem] top-[0.35rem]`}
- >
- <div
- tabIndex={0}
- role="button"
- onMouseDown={dropdownTriggerer}
- className="btn btn-ghost btn-sm btn-square duration-100"
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <button
+ onMouseDown={(e) => e.preventDefault()}
+ className="btn btn-ghost btn-sm btn-square duration-100"
+ title={t("more")}
+ >
+ <i
+ className={"bi bi-three-dots text-lg text-neutral"}
+ ></i>
+ </button>
+ </DropdownMenuTrigger>
+
+ <DropdownMenuContent
+ sideOffset={4}
+ align="end"
+ className="bg-base-200 border border-neutral-content rounded-box p-1"
>
- <i
- className={"bi bi-three-dots text-lg text-neutral"}
- ></i>
- </div>
- <ul className="dropdown-content z-[30] menu shadow bg-base-200 border border-neutral-content rounded-box mt-1">
- {!user.emailVerified ? (
- <li>
- <div
- role="button"
- tabIndex={0}
+ {!user.emailVerified && (
+ <>
+ <DropdownMenuItem
onClick={() => {
- (
- document?.activeElement as HTMLElement
- )?.blur();
signIn("invite", {
email: user.email,
callbackUrl: "/member-onboarding",
@@ -223,30 +228,28 @@ export default function Billing() {
toast.success(t("resend_invite_success"))
);
}}
- className="whitespace-nowrap"
>
+ <i className="bi-envelope"></i>
{t("resend_invite")}
- </div>
- </li>
- ) : undefined}
- <li>
- <div
- role="button"
- tabIndex={0}
- onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setDeleteUserModal({
- isOpen: true,
- userId: user.id,
- });
- }}
- className="whitespace-nowrap"
- >
- {t("remove_user")}
- </div>
- </li>
- </ul>
- </div>
+ </DropdownMenuItem>
+ <DropdownMenuSeparator />
+ </>
+ )}
+
+ <DropdownMenuItem
+ onClick={() => {
+ setDeleteUserModal({
+ isOpen: true,
+ userId: user.id,
+ });
+ }}
+ className="text-error"
+ >
+ <i className="bi-trash"></i>
+ {t("remove_user")}
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
</td>
)}
</tr>
diff --git a/apps/web/pages/tags/[id].tsx b/apps/web/pages/tags/[id].tsx
index d22e7123..6f658cd8 100644
--- a/apps/web/pages/tags/[id].tsx
+++ b/apps/web/pages/tags/[id].tsx
@@ -3,7 +3,6 @@ import { FormEvent, useEffect, useState } from "react";
import MainLayout from "@/layouts/MainLayout";
import { Sort, TagIncludingLinkCount, ViewMode } from "@linkwarden/types";
import { useLinks } from "@linkwarden/router/links";
-import { dropdownTriggerer } from "@/lib/client/utils";
import BulkDeleteLinksModal from "@/components/ModalContent/BulkDeleteLinksModal";
import BulkEditLinksModal from "@/components/ModalContent/BulkEditLinksModal";
import { useTranslation } from "next-i18next";
@@ -12,6 +11,13 @@ import LinkListOptions from "@/components/LinkListOptions";
import { useRemoveTag, useTags, useUpdateTag } from "@linkwarden/router/tags";
import Links from "@/components/LinkViews/Links";
import toast from "react-hot-toast";
+import {
+ DropdownMenu,
+ DropdownMenuTrigger,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuSeparator,
+} from "@/components/ui/dropdown-menu";
export default function Index() {
const { t } = useTranslation();
@@ -173,50 +179,47 @@ export default function Index() {
<>
<p className="sm:text-3xl text-xl">{activeTag?.name}</p>
<div className="relative">
- <div
- className={`dropdown dropdown-bottom font-normal ${
- activeTag?.name.length && activeTag?.name.length > 8
- ? "dropdown-end"
- : ""
- }`}
- >
- <div
- tabIndex={0}
- role="button"
- onMouseDown={dropdownTriggerer}
- className="btn btn-ghost btn-sm btn-square text-neutral"
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <button
+ className="btn btn-ghost btn-sm btn-square text-neutral"
+ title={t("more")}
+ >
+ <i className="bi-three-dots text-xl"></i>
+ </button>
+ </DropdownMenuTrigger>
+
+ <DropdownMenuContent
+ sideOffset={4}
+ align={
+ activeTag?.name.length && activeTag?.name.length > 8
+ ? "end"
+ : "start"
+ }
+ className="bg-base-200 border border-neutral-content rounded-box p-1"
>
- <i className={"bi-three-dots text-neutral text-xl"}></i>
- </div>
- <ul className="dropdown-content z-[30] menu shadow bg-base-200 border border-neutral-content rounded-box mt-1">
- <li>
- <div
- role="button"
- tabIndex={0}
- onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setRenameTag(true);
- }}
- className="whitespace-nowrap"
- >
- {t("rename_tag")}
- </div>
- </li>
- <li>
- <div
- role="button"
- tabIndex={0}
- onClick={() => {
- (document?.activeElement as HTMLElement)?.blur();
- remove();
- }}
- className="whitespace-nowrap"
- >
- {t("delete_tag")}
- </div>
- </li>
- </ul>
- </div>
+ <DropdownMenuItem
+ onClick={() => {
+ setRenameTag(true);
+ }}
+ >
+ <i className="bi-pencil-square"></i>
+ {t("rename_tag")}
+ </DropdownMenuItem>
+
+ <DropdownMenuSeparator />
+
+ <DropdownMenuItem
+ onClick={() => {
+ remove();
+ }}
+ className="text-error"
+ >
+ <i className="bi-trash "></i>
+ {t("delete_tag")}
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
</div>
</>
)}
diff --git a/apps/web/tailwind.config.js b/apps/web/tailwind.config.js
index 89ea9ae8..ebdbdd1e 100644
--- a/apps/web/tailwind.config.js
+++ b/apps/web/tailwind.config.js
@@ -84,7 +84,7 @@ module.exports = {
foreground: daisyuiColorObj["accent-content"],
},
popover: {
- DEFAULT: daisyuiColorObj["base-100"],
+ DEFAULT: daisyuiColorObj["base-200"],
foreground: daisyuiColorObj["base-content"],
},
card: {
diff --git a/yarn.lock b/yarn.lock
index fabd6d54..d6e4c426 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3155,6 +3155,13 @@
dependencies:
"@radix-ui/react-primitive" "2.1.0"
+"@radix-ui/[email protected]":
+ version "1.1.7"
+ resolved "https://registry.yarnpkg.com/@radix-ui/react-arrow/-/react-arrow-1.1.7.tgz#e14a2657c81d961598c5e72b73dd6098acc04f09"
+ integrity sha512-F+M1tLhO+mlQaOWspE8Wstg+z6PwxwRd8oQ8IXceWz92kfAmalTRf0EjrouQeo7QssEPfCn05B4Ihs1K9WQ/7w==
+ dependencies:
+ "@radix-ui/react-primitive" "2.1.3"
+
"@radix-ui/[email protected]":
version "1.1.4"
resolved "https://registry.yarnpkg.com/@radix-ui/react-collection/-/react-collection-1.1.4.tgz#45fb4215ca26a84bd61b9b1337105e4d4e01b686"
@@ -3165,6 +3172,16 @@
"@radix-ui/react-primitive" "2.1.0"
"@radix-ui/react-slot" "1.2.0"
+"@radix-ui/[email protected]":
+ version "1.1.7"
+ resolved "https://registry.yarnpkg.com/@radix-ui/react-collection/-/react-collection-1.1.7.tgz#d05c25ca9ac4695cc19ba91f42f686e3ea2d9aec"
+ integrity sha512-Fh9rGN0MoI4ZFUNyfFVNU4y9LUz93u9/0K+yLgA2bwRojxM8JU1DyvvMBabnZPBgMWREAJvU2jjVzq+LrFUglw==
+ dependencies:
+ "@radix-ui/react-compose-refs" "1.1.2"
+ "@radix-ui/react-context" "1.1.2"
+ "@radix-ui/react-primitive" "2.1.3"
+ "@radix-ui/react-slot" "1.2.3"
+
"@radix-ui/[email protected]":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.0.tgz#37595b1f16ec7f228d698590e78eeed18ff218ae"
@@ -3240,6 +3257,17 @@
"@radix-ui/react-use-callback-ref" "1.1.0"
"@radix-ui/react-use-escape-keydown" "1.1.0"
+"@radix-ui/[email protected]":
+ version "1.1.10"
+ resolved "https://registry.yarnpkg.com/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.10.tgz#429b9bada3672c6895a5d6a642aca6ecaf4f18c3"
+ integrity sha512-IM1zzRV4W3HtVgftdQiiOmA0AdJlCtMLe00FXaHwgt3rAnNsIyDqshvkIW3hj/iu5hu8ERP7KIYki6NkqDxAwQ==
+ dependencies:
+ "@radix-ui/primitive" "1.1.2"
+ "@radix-ui/react-compose-refs" "1.1.2"
+ "@radix-ui/react-primitive" "2.1.3"
+ "@radix-ui/react-use-callback-ref" "1.1.1"
+ "@radix-ui/react-use-escape-keydown" "1.1.1"
+
"@radix-ui/[email protected]":
version "1.1.7"
resolved "https://registry.yarnpkg.com/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.7.tgz#80b5c23a0d29cfe56850399210c603376c27091f"
@@ -3264,6 +3292,19 @@
"@radix-ui/react-primitive" "2.1.0"
"@radix-ui/react-use-controllable-state" "1.2.2"
+"@radix-ui/react-dropdown-menu@^2.1.15":
+ version "2.1.15"
+ resolved "https://registry.yarnpkg.com/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.15.tgz#f507320de8e11bc1e671a6ec0c27a7a89e725131"
+ integrity sha512-mIBnOjgwo9AH3FyKaSWoSu/dYj6VdhJ7frEPiGTeXCdUFHjl9h3mFh2wwhEtINOmYXWhdpf1rY2minFsmaNgVQ==
+ dependencies:
+ "@radix-ui/primitive" "1.1.2"
+ "@radix-ui/react-compose-refs" "1.1.2"
+ "@radix-ui/react-context" "1.1.2"
+ "@radix-ui/react-id" "1.1.1"
+ "@radix-ui/react-menu" "2.1.15"
+ "@radix-ui/react-primitive" "2.1.3"
+ "@radix-ui/react-use-controllable-state" "1.2.2"
+
"@radix-ui/[email protected]":
version "1.1.1"
resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.1.tgz#8635edd346304f8b42cae86b05912b61aef27afe"
@@ -3292,6 +3333,15 @@
"@radix-ui/react-primitive" "2.1.0"
"@radix-ui/react-use-callback-ref" "1.1.1"
+"@radix-ui/[email protected]":
+ version "1.1.7"
+ resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.7.tgz#dfe76fc103537d80bf42723a183773fd07bfb58d"
+ integrity sha512-t2ODlkXBQyn7jkl6TNaw/MtVEVvIGelJDCG41Okq/KwUsJBwQ4XVZsHAVUkK4mBv3ewiAS3PGuUWuY2BoK4ZUw==
+ dependencies:
+ "@radix-ui/react-compose-refs" "1.1.2"
+ "@radix-ui/react-primitive" "2.1.3"
+ "@radix-ui/react-use-callback-ref" "1.1.1"
+
"@radix-ui/[email protected]":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@radix-ui/react-id/-/react-id-1.1.0.tgz#de47339656594ad722eb87f94a6b25f9cffae0ed"
@@ -3330,6 +3380,30 @@
aria-hidden "^1.2.4"
react-remove-scroll "^2.6.3"
+"@radix-ui/[email protected]":
+ version "2.1.15"
+ resolved "https://registry.yarnpkg.com/@radix-ui/react-menu/-/react-menu-2.1.15.tgz#a1a8f06cab3c309f9998cdbd2b3ad279e42ed483"
+ integrity sha512-tVlmA3Vb9n8SZSd+YSbuFR66l87Wiy4du+YE+0hzKQEANA+7cWKH1WgqcEX4pXqxUFQKrWQGHdvEfw00TjFiew==
+ dependencies:
+ "@radix-ui/primitive" "1.1.2"
+ "@radix-ui/react-collection" "1.1.7"
+ "@radix-ui/react-compose-refs" "1.1.2"
+ "@radix-ui/react-context" "1.1.2"
+ "@radix-ui/react-direction" "1.1.1"
+ "@radix-ui/react-dismissable-layer" "1.1.10"
+ "@radix-ui/react-focus-guards" "1.1.2"
+ "@radix-ui/react-focus-scope" "1.1.7"
+ "@radix-ui/react-id" "1.1.1"
+ "@radix-ui/react-popper" "1.2.7"
+ "@radix-ui/react-portal" "1.1.9"
+ "@radix-ui/react-presence" "1.1.4"
+ "@radix-ui/react-primitive" "2.1.3"
+ "@radix-ui/react-roving-focus" "1.1.10"
+ "@radix-ui/react-slot" "1.2.3"
+ "@radix-ui/react-use-callback-ref" "1.1.1"
+ aria-hidden "^1.2.4"
+ react-remove-scroll "^2.6.3"
+
"@radix-ui/[email protected]":
version "1.2.4"
resolved "https://registry.yarnpkg.com/@radix-ui/react-popper/-/react-popper-1.2.4.tgz#8fd6d954fca9e5d1341c7d9153cc88e05d5ed84e"
@@ -3346,6 +3420,22 @@
"@radix-ui/react-use-size" "1.1.1"
"@radix-ui/rect" "1.1.1"
+"@radix-ui/[email protected]":
+ version "1.2.7"
+ resolved "https://registry.yarnpkg.com/@radix-ui/react-popper/-/react-popper-1.2.7.tgz#531cf2eebb3d3270d58f7d8136e4517646429978"
+ integrity sha512-IUFAccz1JyKcf/RjB552PlWwxjeCJB8/4KxT7EhBHOJM+mN7LdW+B3kacJXILm32xawcMMjb2i0cIZpo+f9kiQ==
+ dependencies:
+ "@floating-ui/react-dom" "^2.0.0"
+ "@radix-ui/react-arrow" "1.1.7"
+ "@radix-ui/react-compose-refs" "1.1.2"
+ "@radix-ui/react-context" "1.1.2"
+ "@radix-ui/react-primitive" "2.1.3"
+ "@radix-ui/react-use-callback-ref" "1.1.1"
+ "@radix-ui/react-use-layout-effect" "1.1.1"
+ "@radix-ui/react-use-rect" "1.1.1"
+ "@radix-ui/react-use-size" "1.1.1"
+ "@radix-ui/rect" "1.1.1"
+
"@radix-ui/[email protected]":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-1.1.2.tgz#51eb46dae7505074b306ebcb985bf65cc547d74e"
@@ -3362,6 +3452,14 @@
"@radix-ui/react-primitive" "2.1.0"
"@radix-ui/react-use-layout-effect" "1.1.1"
+"@radix-ui/[email protected]":
+ version "1.1.9"
+ resolved "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-1.1.9.tgz#14c3649fe48ec474ac51ed9f2b9f5da4d91c4472"
+ integrity sha512-bpIxvq03if6UNwXZ+HTK71JLh4APvnXntDc6XOX8UVq4XQOVl7lwok0AvIl+b8zgCw3fSaVTZMpAPPagXbKmHQ==
+ dependencies:
+ "@radix-ui/react-primitive" "2.1.3"
+ "@radix-ui/react-use-layout-effect" "1.1.1"
+
"@radix-ui/[email protected]":
version "1.1.1"
resolved "https://registry.yarnpkg.com/@radix-ui/react-presence/-/react-presence-1.1.1.tgz#98aba423dba5e0c687a782c0669dcd99de17f9b1"
@@ -3378,6 +3476,14 @@
"@radix-ui/react-compose-refs" "1.1.2"
"@radix-ui/react-use-layout-effect" "1.1.1"
+"@radix-ui/[email protected]":
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/@radix-ui/react-presence/-/react-presence-1.1.4.tgz#253ac0ad4946c5b4a9c66878335f5cf07c967ced"
+ integrity sha512-ueDqRbdc4/bkaQT3GIpLQssRlFgWaL/U2z/S31qRwwLWoxHLgry3SIfCwhxeQNbirEUXFa+lq3RL3oBYXtcmIA==
+ dependencies:
+ "@radix-ui/react-compose-refs" "1.1.2"
+ "@radix-ui/react-use-layout-effect" "1.1.1"
+
"@radix-ui/[email protected]":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-2.0.0.tgz#fe05715faa9203a223ccc0be15dc44b9f9822884"
@@ -3392,6 +3498,28 @@
dependencies:
"@radix-ui/react-slot" "1.2.0"
+"@radix-ui/[email protected]":
+ version "2.1.3"
+ resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz#db9b8bcff49e01be510ad79893fb0e4cda50f1bc"
+ integrity sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==
+ dependencies:
+ "@radix-ui/react-slot" "1.2.3"
+
+"@radix-ui/[email protected]":
+ version "1.1.10"
+ resolved "https://registry.yarnpkg.com/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.10.tgz#46030496d2a490c4979d29a7e1252465e51e4b0b"
+ integrity sha512-dT9aOXUen9JSsxnMPv/0VqySQf5eDQ6LCk5Sw28kamz8wSOW2bJdlX2Bg5VUIIcV+6XlHpWTIuTPCf/UNIyq8Q==
+ dependencies:
+ "@radix-ui/primitive" "1.1.2"
+ "@radix-ui/react-collection" "1.1.7"
+ "@radix-ui/react-compose-refs" "1.1.2"
+ "@radix-ui/react-context" "1.1.2"
+ "@radix-ui/react-direction" "1.1.1"
+ "@radix-ui/react-id" "1.1.1"
+ "@radix-ui/react-primitive" "2.1.3"
+ "@radix-ui/react-use-callback-ref" "1.1.1"
+ "@radix-ui/react-use-controllable-state" "1.2.2"
+
"@radix-ui/[email protected]":
version "1.1.7"
resolved "https://registry.yarnpkg.com/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.7.tgz#02077705ab0c712d2d9692459a7194c5a4e5236d"
@@ -3429,7 +3557,7 @@
dependencies:
"@radix-ui/react-compose-refs" "1.1.2"
-"@radix-ui/react-slot@^1.2.3":
+"@radix-ui/[email protected]", "@radix-ui/react-slot@^1.2.3":
version "1.2.3"
resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.2.3.tgz#502d6e354fc847d4169c3bc5f189de777f68cfe1"
integrity sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==