fix conflict

packages/app/src/components/PageComment/Comment.tsx

@@ -69,8 +69,13 @@ export const Comment = (props: CommentProps): JSX.Element => {
     return creator.username === currentUser.username;
   };
 
+<<<<<<< HEAD
   const getRootClassName = (comment) => {
     let className = `${styles['page-comment']} page-comment flex-column`;
+=======
+  const getRootClassName = (comment: ICommentHasId) => {
+    let className = 'page-comment flex-column';
+>>>>>>> support/rendering-CommentEditorLazyRenderer
 
     if (comment.revision === currentRevisionId) {
       className += ' page-comment-current page-comment flex-column';
@@ -89,11 +94,11 @@ export const Comment = (props: CommentProps): JSX.Element => {
     return className;
   };
 
-  const deleteBtnClickedHandler = (comment) => {
+  const deleteBtnClickedHandler = () => {
     deleteBtnClicked(comment);
   };
 
-  const renderText = (comment) => {
+  const renderText = (comment: string) => {
     return <span style={{ whiteSpace: 'pre-wrap' }}>{comment}</span>;
   };
 

packages/app/src/interfaces/editor-settings.ts

@@ -32,7 +32,7 @@ export interface IEditorSettings {
 
 export type EditorConfig = {
   upload: {
-    image: boolean,
-    file: boolean,
+    isUploadableFile: boolean,
+    isUploadableImage: boolean,
   }
 }

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

@@ -6,6 +6,7 @@ import EventEmitter from 'events';
 import {
   IDataWithMeta, IPageInfoForEntity, IPagePopulatedToShowRevision, isClient, isIPageInfoForEntity, isServer, IUser, IUserHasId, pagePathUtils, pathUtils,
 } from '@growi/core';
+import { EditorConfiguration } from 'codemirror';
 import ExtensibleCustomError from 'extensible-custom-error';
 import mongoose from 'mongoose';
 import {
@@ -72,7 +73,6 @@ import { useXss } from '../stores/xss';
 import {
   CommonProps, getNextI18NextConfig, getServerSideCommonProps, useCustomTitle,
 } from './utils/commons';
-import { EditorConfiguration } from 'codemirror';
 // import { useCurrentPageSWR } from '../stores/page';
 
 
@@ -501,8 +501,8 @@ function injectServerConfigurations(context: GetServerSidePropsContext, props: P
   props.disableLinkSharing = configManager.getConfig('crowi', 'security:disableLinkSharing');
   props.editorConfig = {
     upload: {
-      image: crowi.fileUploadService.getIsUploadable(),
-      file: crowi.fileUploadService.getFileUploadEnabled(),
+      isUploadableFile: crowi.fileUploadService.getFileUploadEnabled(),
+      isUploadableImage: crowi.fileUploadService.getIsUploadable(),
     },
   };
   // props.adminPreferredIndentSize = configManager.getConfig('markdown', 'markdown:adminPreferredIndentSize');