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

share page comment component between normal page and search page temporarily

yuto-oweseek 4 лет назад
Родитель
Сommit
8dd4fc4931

+ 2 - 3
packages/app/src/client/app.jsx

@@ -18,8 +18,8 @@ import TagsList from '../components/TagsList';
 import DisplaySwitcher from '../components/Page/DisplaySwitcher';
 import DisplaySwitcher from '../components/Page/DisplaySwitcher';
 import { defaultEditorOptions, defaultPreviewOptions } from '../components/PageEditor/OptionsSelector';
 import { defaultEditorOptions, defaultPreviewOptions } from '../components/PageEditor/OptionsSelector';
 import Page from '../components/Page';
 import Page from '../components/Page';
-import PageComments from '../components/PageComments';
 import PageContentFooter from '../components/PageContentFooter';
 import PageContentFooter from '../components/PageContentFooter';
+import PageCommentList from '../components/PageCommentList';
 import PageTimeline from '../components/PageTimeline';
 import PageTimeline from '../components/PageTimeline';
 import CommentEditorLazyRenderer from '../components/PageComment/CommentEditorLazyRenderer';
 import CommentEditorLazyRenderer from '../components/PageComment/CommentEditorLazyRenderer';
 import ShareLinkAlert from '../components/Page/ShareLinkAlert';
 import ShareLinkAlert from '../components/Page/ShareLinkAlert';
@@ -120,8 +120,7 @@ Object.assign(componentMappings, {
 // additional definitions if data exists
 // additional definitions if data exists
 if (pageContainer.state.pageId != null) {
 if (pageContainer.state.pageId != null) {
   Object.assign(componentMappings, {
   Object.assign(componentMappings, {
-    // todo: replace PageComments by commonalizing PageComments and PageCommentList
-    'page-comments-list': <PageComments />,
+    'page-comments-list': <PageCommentList appContainer={appContainer} pageId={pageContainer.state.pageId} />,
     'page-comment-write': <CommentEditorLazyRenderer appContainer={appContainer} />,
     'page-comment-write': <CommentEditorLazyRenderer appContainer={appContainer} />,
     'page-content-footer': <PageContentFooter
     'page-content-footer': <PageContentFooter
       createdAt={new Date(pageContainer.state.createdAt)}
       createdAt={new Date(pageContainer.state.createdAt)}

+ 3 - 1
packages/app/src/components/PageComment/CommentEditorLazyRenderer.tsx

@@ -10,10 +10,12 @@ type Props = {
 
 
 const CommentEditorLazyRenderer:FC<Props> = (props:Props):JSX.Element => {
 const CommentEditorLazyRenderer:FC<Props> = (props:Props):JSX.Element => {
 
 
-  const growiRenderer = props.appContainer.getRenderer('comment');
+  const { appContainer } = props;
+  const growiRenderer = appContainer.getRenderer('comment');
 
 
   return (
   return (
     <CommentEditor
     <CommentEditor
+      appContainer={appContainer}
       growiRenderer={growiRenderer}
       growiRenderer={growiRenderer}
       replyTo={undefined}
       replyTo={undefined}
       isForNewComment
       isForNewComment

+ 3 - 1
packages/app/src/components/SearchPage/SearchResultContent.tsx

@@ -17,6 +17,7 @@ import { toastSuccess } from '~/client/util/apiNotification';
 
 
 import PageContentFooter from '../PageContentFooter';
 import PageContentFooter from '../PageContentFooter';
 import PageCommentList from '../PageCommentList';
 import PageCommentList from '../PageCommentList';
+import CommentEditorLazyRenderer from '../PageComment/CommentEditorLazyRenderer';
 
 
 import RevisionLoader from '../Page/RevisionLoader';
 import RevisionLoader from '../Page/RevisionLoader';
 import AppContainer from '../../client/services/AppContainer';
 import AppContainer from '../../client/services/AppContainer';
@@ -220,7 +221,8 @@ export const SearchResultContent: FC<Props> = (props: Props) => {
           isRenderable
           isRenderable
         />
         />
         <PageCommentList appContainer={appContainer} pageId={page._id} highlightKeywords={highlightKeywords} />
         <PageCommentList appContainer={appContainer} pageId={page._id} highlightKeywords={highlightKeywords} />
-        {/* todo: insert adding comment feature by CommentEditorLazyRenderer */}
+        {/* todo: will be enable to run add comment feature */}
+        <CommentEditorLazyRenderer appContainer={appContainer} />
         <PageContentFooter
         <PageContentFooter
           createdAt={new Date(pageWithMeta.data.createdAt)}
           createdAt={new Date(pageWithMeta.data.createdAt)}
           updatedAt={new Date(pageWithMeta.data.updatedAt)}
           updatedAt={new Date(pageWithMeta.data.updatedAt)}