kaori 4 лет назад
Родитель
Сommit
61bea12363

+ 9 - 4
packages/app/src/components/Common/Dropdown/PageItemControl.tsx

@@ -45,14 +45,19 @@ const PageItemControl: FC<PageItemControlProps> = (props: PageItemControlProps)
     }
   });
 
-  if (bookmarkInfoError != null || bookmarkInfo == null) {
-    return <>hoge</>;
-  }
+  const renderBookmarkText = () => {
+    if (bookmarkInfoError != null || bookmarkInfo == null) {
+      return '';
+    }
+    return bookmarkInfo.isBookmarked ? t('remove_bookmark') : t('add_bookmark');
+  };
+
 
   const dropdownToggle = () => {
     setIsOpen(!isOpen);
   };
 
+
   return (
     <Dropdown isOpen={isOpen} toggle={dropdownToggle}>
       <DropdownToggle color="transparent" className="btn-link border-0 rounded grw-btn-page-management p-0">
@@ -90,7 +95,7 @@ const PageItemControl: FC<PageItemControlProps> = (props: PageItemControlProps)
         {isEnableActions && (
           <DropdownItem onClick={bookmarkToggleHandler}>
             <i className="fa fa-fw fa-bookmark-o"></i>
-            { bookmarkInfo.isBookmarked ? t('remove_bookmark') : t('add_bookmark') }
+            {renderBookmarkText()}
           </DropdownItem>
         )}
         {isEnableActions && (

+ 0 - 1
packages/app/src/stores/bookmark.ts

@@ -8,7 +8,6 @@ export const useSWRBookmarkInfo = (pageId: string | null | undefined, isOpen = t
     pageId != null && isOpen
       ? `/bookmarks/info?pageId=${pageId}` : null,
     endpoint => apiv3Get(endpoint).then((response) => {
-      console.log('isOpen_swr', isOpen);
       return {
         sumOfBookmarks: response.data.sumOfBookmarks,
         isBookmarked: response.data.isBookmarked,