Yuki Takei 2 лет назад
Родитель
Сommit
7183dcc9ec

+ 1 - 1
packages/editor/src/components/CodeMirrorEditor/CodeMirrorEditor.tsx

@@ -30,7 +30,6 @@ const CodeMirrorEditorContainer = forwardRef<HTMLDivElement>((props, ref) => {
 });
 
 export type CodeMirrorEditorProps = {
-  editorKey: string | GlobalCodeMirrorEditorKey,
   acceptedUploadFileType?: AcceptedUploadFileType,
   indentSize?: number,
   editorSettings?: EditorSettings,
@@ -41,6 +40,7 @@ export type CodeMirrorEditorProps = {
 }
 
 type Props = CodeMirrorEditorProps & {
+  editorKey: string | GlobalCodeMirrorEditorKey,
   hideToolbar?: boolean,
 }
 

+ 7 - 2
packages/editor/src/components/CodeMirrorEditorComment.tsx

@@ -5,15 +5,20 @@ import { keymap, scrollPastEnd } from '@codemirror/view';
 
 import { useCodeMirrorEditorIsolated } from '../stores';
 
-import { CodeMirrorEditor, CodeMirrorEditorProps } from '.';
+import { CodeMirrorEditor, type CodeMirrorEditorProps } from '.';
+
+import type { GlobalCodeMirrorEditorKey } from 'src/consts';
 
 
 const additionalExtensions: Extension[] = [
   scrollPastEnd(),
 ];
 
+type Props = CodeMirrorEditorProps & {
+  editorKey: string | GlobalCodeMirrorEditorKey,
+}
 
-export const CodeMirrorEditorComment = memo((props: CodeMirrorEditorProps): JSX.Element => {
+export const CodeMirrorEditorComment = memo((props: Props): JSX.Element => {
   const {
     editorKey,
     onSave, ...rest

+ 1 - 1
packages/editor/src/components/CodeMirrorEditorMain.tsx

@@ -8,7 +8,7 @@ import { GlobalCodeMirrorEditorKey } from '../consts';
 import { setDataLine } from '../services/extensions/setDataLine';
 import { useCodeMirrorEditorIsolated, useCollaborativeEditorMode } from '../stores';
 
-import { CodeMirrorEditor, CodeMirrorEditorProps } from '.';
+import { CodeMirrorEditor, type CodeMirrorEditorProps } from '.';
 
 const additionalExtensions: Extension[] = [
   [