From 82b6a1b4bbd42652de3631bf287a2815641cb4ac Mon Sep 17 00:00:00 2001 From: Philipinho <16838612+Philipinho@users.noreply.github.com> Date: Fri, 24 Nov 2023 18:06:32 +0000 Subject: [PATCH] fix --- client/src/features/comment/components/comment-list-item.tsx | 4 ++-- client/src/features/editor/atoms/page-editor-atom.ts | 2 +- client/src/features/editor/page-editor.tsx | 4 ++-- client/src/features/editor/title-editor.tsx | 4 ++-- client/src/features/page-history/components/history-list.tsx | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/src/features/comment/components/comment-list-item.tsx b/client/src/features/comment/components/comment-list-item.tsx index 2e2501b2..c5ea9878 100644 --- a/client/src/features/comment/components/comment-list-item.tsx +++ b/client/src/features/comment/components/comment-list-item.tsx @@ -4,7 +4,7 @@ import classes from './comment.module.css'; import { useAtomValue } from 'jotai'; import { timeAgo } from '@/lib/time'; import CommentEditor from '@/features/comment/components/comment-editor'; -import { editorAtoms } from '@/features/editor/atoms/editor-atoms'; +import { pageEditorAtom } from '@/features/editor/atoms/page-editor-atom'; import CommentActions from '@/features/comment/components/comment-actions'; import CommentMenu from '@/features/comment/components/comment-menu'; import { useHover } from '@mantine/hooks'; @@ -22,7 +22,7 @@ function CommentListItem({ comment }: CommentListItemProps) { const [isEditing, setIsEditing] = useState(false); const [isLoading, setIsLoading] = useState(false); - const editor = useAtomValue(editorAtoms); + const editor = useAtomValue(pageEditorAtom); const [content, setContent] = useState(comment.content); const updateCommentMutation = useUpdateCommentMutation(); const deleteCommentMutation = useDeleteCommentMutation(comment.pageId); diff --git a/client/src/features/editor/atoms/page-editor-atom.ts b/client/src/features/editor/atoms/page-editor-atom.ts index fa4fcb1d..e15b9ff2 100644 --- a/client/src/features/editor/atoms/page-editor-atom.ts +++ b/client/src/features/editor/atoms/page-editor-atom.ts @@ -1,6 +1,6 @@ import { atom } from 'jotai'; import { Editor } from '@tiptap/core'; -export const editorAtoms = atom(null); +export const pageEditorAtom = atom(null); export const titleEditorAtom = atom(null); diff --git a/client/src/features/editor/page-editor.tsx b/client/src/features/editor/page-editor.tsx index b780e511..1f10f652 100644 --- a/client/src/features/editor/page-editor.tsx +++ b/client/src/features/editor/page-editor.tsx @@ -14,7 +14,7 @@ import { useAtom } from 'jotai'; import { authTokensAtom } from '@/features/auth/atoms/auth-tokens-atom'; import useCollaborationUrl from '@/features/editor/hooks/use-collaboration-url'; import { currentUserAtom } from '@/features/user/atoms/current-user-atom'; -import { editorAtoms } from '@/features/editor/atoms/editor-atoms'; +import { pageEditorAtom } from '@/features/editor/atoms/page-editor-atom'; import { asideStateAtom } from '@/components/navbar/atoms/sidebar-atom'; import { activeCommentIdAtom, showCommentPopupAtom } from '@/features/comment/atoms/comment-atom'; import CommentDialog from '@/features/comment/components/comment-dialog'; @@ -34,7 +34,7 @@ export default function PageEditor({ pageId, editable = true }: PageEditorProps) const [token] = useAtom(authTokensAtom); const collaborationURL = useCollaborationUrl(); const [currentUser] = useAtom(currentUserAtom); - const [, setEditor] = useAtom(editorAtoms); + const [, setEditor] = useAtom(pageEditorAtom); const [, setAsideState] = useAtom(asideStateAtom); const [, setActiveCommentId] = useAtom(activeCommentIdAtom); diff --git a/client/src/features/editor/title-editor.tsx b/client/src/features/editor/title-editor.tsx index bb6af116..d3e317ac 100644 --- a/client/src/features/editor/title-editor.tsx +++ b/client/src/features/editor/title-editor.tsx @@ -6,7 +6,7 @@ import { Heading } from '@tiptap/extension-heading'; import { Text } from '@tiptap/extension-text'; import { Placeholder } from '@tiptap/extension-placeholder'; import { useAtomValue } from 'jotai'; -import { editorAtoms, titleEditorAtom } from '@/features/editor/atoms/editor-atoms'; +import { pageEditorAtom, titleEditorAtom } from '@/features/editor/atoms/page-editor-atom'; import { useUpdatePageMutation } from '@/features/page/queries/page-query'; import { useDebouncedValue } from '@mantine/hooks'; import { useAtom } from 'jotai'; @@ -22,7 +22,7 @@ export function TitleEditor({ pageId, title }: TitleEditorProps) { const [debouncedTitleState, setDebouncedTitleState] = useState(''); const [debouncedTitle] = useDebouncedValue(debouncedTitleState, 1000); const updatePageMutation = useUpdatePageMutation(); - const pageEditor = useAtomValue(editorAtoms); + const pageEditor = useAtomValue(pageEditorAtom); const [, setTitleEditor] = useAtom(titleEditorAtom); const [treeData, setTreeData] = useAtom(treeDataAtom); diff --git a/client/src/features/page-history/components/history-list.tsx b/client/src/features/page-history/components/history-list.tsx index 63d9ca2a..79ae6f17 100644 --- a/client/src/features/page-history/components/history-list.tsx +++ b/client/src/features/page-history/components/history-list.tsx @@ -5,7 +5,7 @@ import { activeHistoryIdAtom, historyAtoms } from '@/features/page-history/atoms import { useAtom } from 'jotai'; import { useCallback, useEffect } from 'react'; import { Button, ScrollArea, Group, Divider, Text } from '@mantine/core'; -import { editorAtoms, titleEditorAtom } from '@/features/editor/atoms/editor-atoms'; +import { pageEditorAtom, titleEditorAtom } from '@/features/editor/atoms/page-editor-atom'; import { modals } from '@mantine/modals'; import { notifications } from '@mantine/notifications'; @@ -15,7 +15,7 @@ function HistoryList() { const { data, isLoading, isError } = usePageHistoryListQuery(pageId); const { data: activeHistoryData } = usePageHistoryQuery(activeHistoryId); - const [mainEditor] = useAtom(editorAtoms); + const [mainEditor] = useAtom(pageEditorAtom); const [mainEditorTitle] = useAtom(titleEditorAtom); const [, setHistoryModalOpen] = useAtom(historyAtoms);