ryoji-s 3 лет назад
Родитель
Сommit
92f53ea53e
1 измененных файлов с 17 добавлено и 6 удалено
  1. 17 6
      apps/app/src/components/Bookmarks/BookmarkFolderMenu.tsx

+ 17 - 6
apps/app/src/components/Bookmarks/BookmarkFolderMenu.tsx

@@ -12,7 +12,7 @@ import { toastError } from '~/client/util/toastr';
 import { BookmarkFolderItems } from '~/interfaces/bookmark-info';
 import { BookmarkFolderItems } from '~/interfaces/bookmark-info';
 import { useSWRBookmarkInfo, useSWRxCurrentUserBookmarks } from '~/stores/bookmark';
 import { useSWRBookmarkInfo, useSWRxCurrentUserBookmarks } from '~/stores/bookmark';
 import { useSWRxBookamrkFolderAndChild } from '~/stores/bookmark-folder';
 import { useSWRxBookamrkFolderAndChild } from '~/stores/bookmark-folder';
-import { useSWRxCurrentPage } from '~/stores/page';
+import { useSWRxCurrentPage, useSWRxPageInfo } from '~/stores/page';
 
 
 import { FolderIcon } from '../Icons/FolderIcon';
 import { FolderIcon } from '../Icons/FolderIcon';
 
 
@@ -33,12 +33,12 @@ export const BookmarkFolderMenu = (props: Props): JSX.Element => {
   const { data: currentPage } = useSWRxCurrentPage();
   const { data: currentPage } = useSWRxCurrentPage();
   const { data: userBookmarkInfo, mutate: mutateBookmarkInfo } = useSWRBookmarkInfo(currentPage?._id);
   const { data: userBookmarkInfo, mutate: mutateBookmarkInfo } = useSWRBookmarkInfo(currentPage?._id);
   const { mutate: mutateUserBookmarks } = useSWRxCurrentUserBookmarks();
   const { mutate: mutateUserBookmarks } = useSWRxCurrentUserBookmarks();
+  const { mutate: mutatePageInfo } = useSWRxPageInfo(currentPage?._id);
   const isBookmarked = userBookmarkInfo?.isBookmarked ?? false;
   const isBookmarked = userBookmarkInfo?.isBookmarked ?? false;
   const [isOpen, setIsOpen] = useState(false);
   const [isOpen, setIsOpen] = useState(false);
 
 
 
 
   const toggleBookmarkHandler = useCallback(async() => {
   const toggleBookmarkHandler = useCallback(async() => {
-
     try {
     try {
       if (currentPage != null) {
       if (currentPage != null) {
         await toggleBookmark(currentPage._id, isBookmarked);
         await toggleBookmark(currentPage._id, isBookmarked);
@@ -47,8 +47,6 @@ export const BookmarkFolderMenu = (props: Props): JSX.Element => {
     catch (err) {
     catch (err) {
       toastError(err);
       toastError(err);
     }
     }
-
-
   }, [currentPage, isBookmarked]);
   }, [currentPage, isBookmarked]);
 
 
   const onClickNewBookmarkFolder = useCallback(() => {
   const onClickNewBookmarkFolder = useCallback(() => {
@@ -60,8 +58,9 @@ export const BookmarkFolderMenu = (props: Props): JSX.Element => {
     mutateUserBookmarks();
     mutateUserBookmarks();
     mutateBookmarkInfo();
     mutateBookmarkInfo();
     mutateBookmarkFolderData();
     mutateBookmarkFolderData();
+    mutatePageInfo();
     setSelectedItem(null);
     setSelectedItem(null);
-  }, [mutateBookmarkFolderData, mutateBookmarkInfo, mutateUserBookmarks, toggleBookmarkHandler]);
+  }, [mutateBookmarkFolderData, mutateBookmarkInfo, mutatePageInfo, mutateUserBookmarks, toggleBookmarkHandler]);
 
 
   const toggleHandler = useCallback(async() => {
   const toggleHandler = useCallback(async() => {
     setIsOpen(!isOpen);
     setIsOpen(!isOpen);
@@ -80,13 +79,25 @@ export const BookmarkFolderMenu = (props: Props): JSX.Element => {
         toggleBookmarkHandler();
         toggleBookmarkHandler();
         mutateUserBookmarks();
         mutateUserBookmarks();
         mutateBookmarkInfo();
         mutateBookmarkInfo();
+        mutatePageInfo();
         setSelectedItem(null);
         setSelectedItem(null);
       }
       }
       catch (err) {
       catch (err) {
         toastError(err);
         toastError(err);
       }
       }
     }
     }
-  }, [isOpen, mutateBookmarkFolderData, bookmarkFolders, isBookmarked, currentPage?._id, toggleBookmarkHandler, mutateUserBookmarks, mutateBookmarkInfo]);
+  },
+  [
+    isOpen,
+    mutateBookmarkFolderData,
+    bookmarkFolders,
+    isBookmarked,
+    currentPage?._id,
+    toggleBookmarkHandler,
+    mutateUserBookmarks,
+    mutateBookmarkInfo,
+    mutatePageInfo,
+  ]);
 
 
 
 
   const isBookmarkFolderExists = useCallback((): boolean => {
   const isBookmarkFolderExists = useCallback((): boolean => {