|
|
@@ -9,16 +9,13 @@ import {
|
|
|
} from 'reactstrap';
|
|
|
import * as toastr from 'toastr';
|
|
|
|
|
|
-import AppContainer from '~/client/services/AppContainer';
|
|
|
-import EditorContainer from '~/client/services/EditorContainer';
|
|
|
-import PageContainer from '~/client/services/PageContainer';
|
|
|
import { apiPostForm } from '~/client/util/apiv1-client';
|
|
|
import { CustomWindow } from '~/interfaces/global';
|
|
|
import { IInterceptorManager } from '~/interfaces/interceptor-manager';
|
|
|
import GrowiRenderer from '~/services/renderer/growi-renderer';
|
|
|
import { useSWRxPageComment } from '~/stores/comment';
|
|
|
import {
|
|
|
- useCurrentPagePath, useCurrentPageId, useCurrentUser, useRevisionId,
|
|
|
+ useCurrentPagePath, useCurrentPageId, useCurrentUser, useRevisionId, useGrowiRendererConfig
|
|
|
} from '~/stores/context';
|
|
|
import { useSWRxSlackChannels, useIsSlackEnabled } from '~/stores/editor';
|
|
|
import { useIsMobile } from '~/stores/ui';
|
|
|
@@ -47,8 +44,6 @@ const navTabMapping = {
|
|
|
};
|
|
|
|
|
|
type PropsType = {
|
|
|
- appContainer: AppContainer,
|
|
|
-
|
|
|
growiRenderer: GrowiRenderer,
|
|
|
isForNewComment?: boolean,
|
|
|
replyTo?: string,
|
|
|
@@ -68,7 +63,7 @@ type EditorRef = {
|
|
|
const CommentEditor = (props: PropsType): JSX.Element => {
|
|
|
|
|
|
const {
|
|
|
- appContainer, growiRenderer, isForNewComment, replyTo,
|
|
|
+ growiRenderer, isForNewComment, replyTo,
|
|
|
currentCommentId, commentBody, commentCreator, onCancelButtonClicked, onCommentButtonClicked,
|
|
|
} = props;
|
|
|
const { data: currentUser } = useCurrentUser();
|
|
|
@@ -79,8 +74,8 @@ 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 config = appContainer.getConfig();
|
|
|
const isUploadable = config.upload.image || config.upload.file;
|
|
|
const isUploadableFile = config.upload.file;
|
|
|
const isSlackConfigured = config.isSlackConfigured;
|
|
|
@@ -375,11 +370,4 @@ const CommentEditor = (props: PropsType): JSX.Element => {
|
|
|
|
|
|
};
|
|
|
|
|
|
-/**
|
|
|
- * Wrapper component for using unstated
|
|
|
- */
|
|
|
-const CommentEditorWrapper = withUnstatedContainers<unknown, Partial<PropsType>>(
|
|
|
- CommentEditor, [AppContainer, PageContainer, EditorContainer],
|
|
|
-);
|
|
|
-
|
|
|
-export default CommentEditorWrapper;
|
|
|
+export default CommentEditor;
|