From 8274d07025b13dab115e3f770aa0bd691d340d02 Mon Sep 17 00:00:00 2001 From: MohamedBassem Date: Sun, 19 May 2024 18:17:00 +0000 Subject: fix(web): Stop pre-loading all the bookmark lists in the bookmark grid --- .../dashboard/bookmarks/ManageListsModal.tsx | 77 ++++++++++++---------- 1 file changed, 44 insertions(+), 33 deletions(-) diff --git a/apps/web/components/dashboard/bookmarks/ManageListsModal.tsx b/apps/web/components/dashboard/bookmarks/ManageListsModal.tsx index 9451e736..c1a75a43 100644 --- a/apps/web/components/dashboard/bookmarks/ManageListsModal.tsx +++ b/apps/web/components/dashboard/bookmarks/ManageListsModal.tsx @@ -16,6 +16,7 @@ import { FormItem, FormMessage, } from "@/components/ui/form"; +import LoadingSpinner from "@/components/ui/spinner"; import { toast } from "@/components/ui/use-toast"; import { api } from "@/lib/trpc"; import { zodResolver } from "@hookform/resolvers/zod"; @@ -53,15 +54,21 @@ export default function ManageListsModal({ }, }); - const { data: allLists } = useBookmarkLists(undefined, { enabled: open }); - - const { data: alreadyInList } = api.lists.getListsOfBookmark.useQuery( - { - bookmarkId, - }, + const { data: allLists, isPending: isAllListsPending } = useBookmarkLists( + undefined, { enabled: open }, ); + const { data: alreadyInList, isPending: isAlreadyInListPending } = + api.lists.getListsOfBookmark.useQuery( + { + bookmarkId, + }, + { enabled: open }, + ); + + const isLoading = isAllListsPending || isAlreadyInListPending; + const { mutate: addToList, isPending: isAddingToListPending } = useAddBookmarkToList({ onSuccess: () => { @@ -123,33 +130,37 @@ export default function ManageListsModal({ Manage Lists - {allLists && ( - + ) )}
@@ -208,7 +219,7 @@ export function useManageListsModal(bookmarkId: string) { return { open, setOpen, - content: ( + content: open && ( ), }; -- cgit v1.2.3-70-g09d2