jam411 3 лет назад
Родитель
Сommit
5d32ab8234

+ 2 - 2
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 UncontrolledCodeMirrorCore from '../UncontrolledCodeMirror';
 
 import AbstractEditor from './AbstractEditor';
 import CommentMentionHelper from './CommentMentionHelper';
@@ -991,7 +991,7 @@ class CodeMirrorEditor extends AbstractEditor {
     return (
       <React.Fragment>
 
-        <UncontrolledCodeMirror
+        <UncontrolledCodeMirrorCore
           ref={(c) => { this.cm = c }}
           className={additionalClasses}
           placeholder="search"

+ 2 - 2
packages/app/src/components/PageEditor/ConflictDiffModal.tsx

@@ -17,7 +17,7 @@ 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 UncontrolledCodeMirrorCore from '../UncontrolledCodeMirror';
 
 require('codemirror/lib/codemirror.css');
 require('codemirror/addon/merge/merge');
@@ -229,7 +229,7 @@ const ConflictDiffModalCore = (props: ConflictDiffModalProps & { currentUser: IU
             <div className="col-12">
               <div className="border border-dark">
                 <h3 className="font-weight-bold my-2 mx-2">{t('modal_resolve_conflict.selected_editable_revision')}</h3>
-                <UncontrolledCodeMirror
+                <UncontrolledCodeMirrorCore
                   ref={uncontrolledRef}
                   value={resolvedRevision}
                   options={{