jam411 3 лет назад
Родитель
Сommit
1febe8bbca

+ 0 - 3
packages/app/src/components/PageComment.tsx

@@ -7,10 +7,7 @@ import { Button } from 'reactstrap';
 
 import { toastError } from '~/client/util/apiNotification';
 import { apiPost } from '~/client/util/apiv1-client';
-<<<<<<< HEAD
 import { Nullable } from '~/interfaces/common';
-=======
->>>>>>> support/apply-nextjs-to-PageComments
 import { useCommentPreviewOptions } from '~/stores/renderer';
 
 import { ICommentHasId, ICommentHasIdList } from '../interfaces/comment';

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

@@ -15,7 +15,7 @@ import { IInterceptorManager } from '~/interfaces/interceptor-manager';
 import { RendererOptions } from '~/services/renderer/renderer';
 import { useSWRxPageComment } from '~/stores/comment';
 import {
-  useCurrentPagePath, useCurrentPageId, useCurrentUser, useRevisionId, useGrowiRendererConfig,
+  useCurrentPagePath, useCurrentPageId, useCurrentUser, useRevisionId, useRendererConfig,
 } from '~/stores/context';
 import { useSWRxSlackChannels, useIsSlackEnabled } from '~/stores/editor';
 import { useIsMobile } from '~/stores/ui';
@@ -73,7 +73,7 @@ const CommentEditor = (props: PropsType): JSX.Element => {
   const { data: isMobile } = useIsMobile();
   const { data: isSlackEnabled, mutate: mutateIsSlackEnabled } = useIsSlackEnabled();
   const { data: slackChannelsData } = useSWRxSlackChannels(currentPagePath);
-  const { data: config } = useGrowiRendererConfig();
+  const { data: config } = useRendererConfig();
 
   const isUploadable = config.upload.image || config.upload.file;
   const isUploadableFile = config.upload.file;

+ 2 - 7
packages/app/src/components/PageComment/ReplayComments.jsx

@@ -3,17 +3,12 @@ import PropTypes from 'prop-types';
 
 import { Collapse } from 'reactstrap';
 
-import { useGrowiRendererConfig } from '~/stores/context';
+import { useRendererConfig } from '~/stores/context';
 
 import Comment from './Comment';
 
-<<<<<<< HEAD
-=======
-import { withUnstatedContainers } from '../UnstatedUtils';
-
 import { RendererOptions } from '~/services/renderer/renderer';
 
->>>>>>> support/apply-nextjs-to-PageComments
 class ReplayComments extends React.PureComponent {
 
   constructor() {
@@ -111,7 +106,7 @@ ReplayComments.propTypes = {
 };
 
 const ReplayCommentsWrapperFC = (props) => {
-  const { data: config } = useGrowiRendererConfig();
+  const { data: config } = useRendererConfig();
 
   return <ReplayComments config={config} {...props} />;
 };