jam411 3 лет назад
Родитель
Сommit
9f1c77707e

+ 1 - 2
packages/app/src/components/PageComment.tsx

@@ -19,7 +19,6 @@ import { CommentEditor } from './PageComment/CommentEditor';
 import { CommentEditorLazyRenderer } from './PageComment/CommentEditorLazyRenderer';
 import { CommentEditorLazyRenderer } from './PageComment/CommentEditorLazyRenderer';
 import DeleteCommentModal from './PageComment/DeleteCommentModal';
 import DeleteCommentModal from './PageComment/DeleteCommentModal';
 import { ReplayComments } from './PageComment/ReplayComments';
 import { ReplayComments } from './PageComment/ReplayComments';
-import { Skelton } from './Skelton';
 
 
 import styles from './PageComment.module.scss';
 import styles from './PageComment.module.scss';
 
 
@@ -225,7 +224,7 @@ export const PageComment: FC<Props> = memo((props:Props): JSX.Element => {
 
 
             </div>
             </div>
             {/* TODO: Check if identical-page */}
             {/* TODO: Check if identical-page */}
-            <CommentEditorLazyRenderer />
+            <CommentEditorLazyRenderer pageId={pageId} rendererOptions={rendererOptions}/>
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>

+ 12 - 9
packages/app/src/components/PageComment/CommentEditorLazyRenderer.tsx

@@ -1,21 +1,24 @@
 import React from 'react';
 import React from 'react';
 
 
-import { useCurrentPageId } from '~/stores/context';
-import { useCommentPreviewOptions } from '~/stores/renderer';
+import { Nullable } from '@growi/core';
+
+import { RendererOptions } from '~/services/renderer/renderer';
 
 
 import { useSWRxPageComment } from '../../stores/comment';
 import { useSWRxPageComment } from '../../stores/comment';
 
 
 import { CommentEditor } from './CommentEditor';
 import { CommentEditor } from './CommentEditor';
 
 
-export const CommentEditorLazyRenderer = (): JSX.Element => {
 
 
-  const { data: pageId } = useCurrentPageId();
-  const { mutate } = useSWRxPageComment(pageId);
-  const { data: rendererOptions } = useCommentPreviewOptions();
+type Props = {
+  pageId?: Nullable<string>,
+  rendererOptions: RendererOptions,
+}
+
+export const CommentEditorLazyRenderer = (props: Props): JSX.Element => {
 
 
-  if (rendererOptions == null) {
-    return <></>;
-  }
+  const { pageId, rendererOptions } = props;
+
+  const { mutate } = useSWRxPageComment(pageId);
 
 
   return (
   return (
     <CommentEditor
     <CommentEditor