|
@@ -25,12 +25,12 @@ type Props = {
|
|
|
bookmarkedPage: IPageHasId,
|
|
bookmarkedPage: IPageHasId,
|
|
|
onUnbookmarked: () => void,
|
|
onUnbookmarked: () => void,
|
|
|
onRenamed: () => void,
|
|
onRenamed: () => void,
|
|
|
- onDeleted: (pageToDelete: IPageToDeleteWithMeta) => void
|
|
|
|
|
|
|
+ onClickDeleteMenuItem: (pageToDelete: IPageToDeleteWithMeta) => void
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
const BookmarkItem = (props: Props) => {
|
|
const BookmarkItem = (props: Props) => {
|
|
|
const {
|
|
const {
|
|
|
- bookmarkedPage, onUnbookmarked, onRenamed, onDeleted,
|
|
|
|
|
|
|
+ bookmarkedPage, onUnbookmarked, onRenamed, onClickDeleteMenuItem,
|
|
|
} = props;
|
|
} = props;
|
|
|
const { t } = useTranslation();
|
|
const { t } = useTranslation();
|
|
|
const [isRenameInputShown, setRenameInputShown] = useState(false);
|
|
const [isRenameInputShown, setRenameInputShown] = useState(false);
|
|
@@ -97,8 +97,8 @@ const BookmarkItem = (props: Props) => {
|
|
|
meta: pageInfo,
|
|
meta: pageInfo,
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- onDeleted(pageToDelete);
|
|
|
|
|
- }, [bookmarkedPage, onDeleted]);
|
|
|
|
|
|
|
+ onClickDeleteMenuItem(pageToDelete);
|
|
|
|
|
+ }, [bookmarkedPage, onClickDeleteMenuItem]);
|
|
|
|
|
|
|
|
return (
|
|
return (
|
|
|
<div className="d-flex justify-content-between" key={bookmarkedPage._id}>
|
|
<div className="d-flex justify-content-between" key={bookmarkedPage._id}>
|
|
@@ -148,8 +148,8 @@ const Bookmarks = () : JSX.Element => {
|
|
|
const { data: currentUserBookmarksData, mutate: mutateCurrentUserBookmarks } = useSWRxCurrentUserBookmarks();
|
|
const { data: currentUserBookmarksData, mutate: mutateCurrentUserBookmarks } = useSWRxCurrentUserBookmarks();
|
|
|
const { open: openDeleteModal } = usePageDeleteModal();
|
|
const { open: openDeleteModal } = usePageDeleteModal();
|
|
|
|
|
|
|
|
- const deleteBookmarkItem = (pageToDelete: IPageToDeleteWithMeta) => {
|
|
|
|
|
- const onDeletedHandler: OnDeletedFunction = (pathOrPathsToDelete, _isRecursively, isCompletely) => {
|
|
|
|
|
|
|
+ const deleteMenuItemClickHandler = (pageToDelete: IPageToDeleteWithMeta) => {
|
|
|
|
|
+ const pageDeletedHandler : OnDeletedFunction = (pathOrPathsToDelete, _isRecursively, isCompletely) => {
|
|
|
if (typeof pathOrPathsToDelete !== 'string') {
|
|
if (typeof pathOrPathsToDelete !== 'string') {
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
@@ -163,7 +163,7 @@ const Bookmarks = () : JSX.Element => {
|
|
|
}
|
|
}
|
|
|
mutateCurrentUserBookmarks();
|
|
mutateCurrentUserBookmarks();
|
|
|
};
|
|
};
|
|
|
- openDeleteModal([pageToDelete], { onDeleted: onDeletedHandler });
|
|
|
|
|
|
|
+ openDeleteModal([pageToDelete], { onDeleted: pageDeletedHandler });
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
const renderBookmarkList = () => {
|
|
const renderBookmarkList = () => {
|
|
@@ -184,7 +184,7 @@ const Bookmarks = () : JSX.Element => {
|
|
|
bookmarkedPage={currentUserBookmark}
|
|
bookmarkedPage={currentUserBookmark}
|
|
|
onUnbookmarked={mutateCurrentUserBookmarks}
|
|
onUnbookmarked={mutateCurrentUserBookmarks}
|
|
|
onRenamed={mutateCurrentUserBookmarks}
|
|
onRenamed={mutateCurrentUserBookmarks}
|
|
|
- onDeleted={deleteBookmarkItem}
|
|
|
|
|
|
|
+ onClickDeleteMenuItem={deleteMenuItemClickHandler}
|
|
|
/>
|
|
/>
|
|
|
);
|
|
);
|
|
|
})}
|
|
})}
|