Просмотр исходного кода

update CommentEditorLazyRenderer.tsx

jam411 3 лет назад
Родитель
Сommit
527aa5980e

+ 6 - 22
packages/app/src/components/PageComment/CommentEditorLazyRenderer.tsx

@@ -1,38 +1,22 @@
-import React, { FC } from 'react';
+import React from 'react';
 
-import { useSWRxPageComment } from '../../stores/comment';
+import { useCurrentPageId } from '~/stores/context';
 
-import AppContainer from '~/client/services/AppContainer';
+import { useSWRxPageComment } from '../../stores/comment';
 
-import CommentEditor from './CommentEditor';
-import { useCommentPreviewOptions } from '~/stores/renderer';
+import { CommentEditor } from './CommentEditor';
 
-type Props = {
-  appContainer: AppContainer,
-  pageId: string,
-}
 
-const CommentEditorLazyRenderer:FC<Props> = (props:Props):JSX.Element => {
+export const CommentEditorLazyRenderer = (): JSX.Element => {
 
-  const { pageId } = props;
+  const { data: pageId } = useCurrentPageId();
   const { mutate } = useSWRxPageComment(pageId);
-  const { data: rendererOptions } = useCommentPreviewOptions();
-
-  if (rendererOptions == null) {
-    return <></>;
-  }
-
-  const { appContainer } = props;
 
   return (
     <CommentEditor
-      appContainer={appContainer}
-      rendererOptions={rendererOptions}
       replyTo={undefined}
       onCommentButtonClicked={mutate}
       isForNewComment
     />
   );
 };
-
-export default CommentEditorLazyRenderer;

+ 2 - 1
packages/app/src/pages/[[...path]].page.tsx

@@ -48,7 +48,7 @@ import DisplaySwitcher from '../components/Page/DisplaySwitcher';
 // import { serializeUserSecurely } from '../server/models/serializers/user-serializer';
 // import PageStatusAlert from '../client/js/components/PageStatusAlert';
 
-
+import { CommentEditorLazyRenderer } from '../components/PageComment/CommentEditorLazyRenderer';
 import {
   useCurrentUser, useCurrentPagePath,
   useIsLatestRevision,
@@ -325,6 +325,7 @@ const GrowiPage: NextPage<Props> = (props: Props) => {
         <footer>
           {/* <PageComments /> */}
           PageComments
+          <CommentEditorLazyRenderer />
         </footer>
 
         <UnsavedAlertDialog />