clean code

packages/app/src/components/PageEditor/CodeMirrorEditor.jsx

@@ -12,7 +12,7 @@ import urljoin from 'url-join';
 import InterceptorManager from '~/services/interceptor-manager';
 import loggerFactory from '~/utils/logger';
 
-// import UncontrolledCodeMirror from '../UncontrolledCodeMirror';
+import { UncontrolledCodeMirror } from '../UncontrolledCodeMirror';
 
 import AbstractEditor from './AbstractEditor';
 import CommentMentionHelper from './CommentMentionHelper';
@@ -96,8 +96,6 @@ require('codemirror/mode/vue/vue');
 require('codemirror/mode/xml/xml');
 require('codemirror/mode/yaml/yaml');
 
-const { UncontrolledCodeMirror } = require('../UncontrolledCodeMirror');
-
 
 const MARKDOWN_TABLE_ACTIVATED_CLASS = 'markdown-table-activated';
 const MARKDOWN_LINK_ACTIVATED_CLASS = 'markdown-link-activated';

packages/app/src/components/PageEditor/ConflictDiffModal.tsx

@@ -17,15 +17,13 @@ import { useEditorMode } from '~/stores/ui';
 import PageContainer from '../../client/services/PageContainer';
 import { IRevisionOnConflict } from '../../interfaces/revision';
 import ExpandOrContractButton from '../ExpandOrContractButton';
-// import UncontrolledCodeMirror from '../UncontrolledCodeMirror';
+import { UncontrolledCodeMirror } from '../UncontrolledCodeMirror';
 
 require('codemirror/lib/codemirror.css');
 require('codemirror/addon/merge/merge');
 require('codemirror/addon/merge/merge.css');
 const DMP = require('diff_match_patch');
 
-const { UncontrolledCodeMirror } = require('../UncontrolledCodeMirror');
-
 Object.keys(DMP).forEach((key) => { window[key] = DMP[key] });
 
 type ConflictDiffModalProps = {

packages/app/src/components/PageEditor/Editor.jsx

@@ -1,6 +1,5 @@
 import React from 'react';
 
-import dynamic from 'next/dynamic';
 import PropTypes from 'prop-types';
 import Dropzone from 'react-dropzone';
 import {
@@ -12,10 +11,11 @@ import { useEditorSettings } from '~/stores/editor';
 
 import AbstractEditor from './AbstractEditor';
 import Cheatsheet from './Cheatsheet';
+import CodeMirrorEditor from './CodeMirrorEditor';
 import pasteHelper from './PasteHelper';
 import TextAreaEditor from './TextAreaEditor';
 
-const CodeMirrorEditor = dynamic(() => import('./CodeMirrorEditor'), { ssr: false });
+
 class Editor extends AbstractEditor {
 
   constructor(props) {
@@ -275,7 +275,6 @@ class Editor extends AbstractEditor {
 
 
   render() {
-
     const flexContainer = {
       height: '100%',
       display: 'flex',

packages/app/src/pages/[[...path]].page.tsx

@@ -20,6 +20,7 @@ import superjson from 'superjson';
 import { PageAlerts } from '~/components/PageAlert/PageAlerts';
 import { PageComment } from '~/components/PageComment';
 // import { useTranslation } from '~/i18n';
+import CommentEditorLazyRenderer from '~/components/PageComment/CommentEditorLazyRenderer';
 import { CrowiRequest } from '~/interfaces/crowi-request';
 // import { renderScriptTagByName, renderHighlightJsStyleTag } from '~/service/cdn-resources-loader';
 // import { useIndentSize } from '~/stores/editor';
@@ -322,6 +323,7 @@ const GrowiPage: NextPage<Props> = (props: Props) => {
         </div>
         <footer>
           <PageComment pageId={useCurrentPageId().data} isReadOnly={false} titleAlign="left" />
+          {/* <CommentEditorLazyRenderer pageId={useCurrentPageId().data} /> */}
         </footer>
 
         <UnsavedAlertDialog />