Просмотр исходного кода

Move double extending of interface to abstract editor

stevenfukase 4 лет назад
Родитель
Сommit
6a3c0c8e44

+ 2 - 1
packages/app/src/components/PageEditor/AbstractEditor.tsx

@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import React from 'react';
 import React from 'react';
+import { ICodeMirror } from 'react-codemirror2';
 
 
 
 
-export interface AbstractEditorProps {
+export interface AbstractEditorProps extends ICodeMirror {
   value?: string;
   value?: string;
   isGfmMode?: boolean;
   isGfmMode?: boolean;
   onScrollCursorIntoView?: (line: number) => void;
   onScrollCursorIntoView?: (line: number) => void;

+ 1 - 1
packages/app/src/components/UncontrolledCodeMirror.tsx

@@ -8,7 +8,7 @@ window.CodeMirror = require('codemirror');
 require('codemirror/addon/display/placeholder');
 require('codemirror/addon/display/placeholder');
 require('~/client/util/codemirror/gfm-growi.mode');
 require('~/client/util/codemirror/gfm-growi.mode');
 
 
-export interface UncontrolledCodeMirrorProps extends AbstractEditorProps, ICodeMirror {
+export interface UncontrolledCodeMirrorProps extends AbstractEditorProps {
   value: string;
   value: string;
   options?: ICodeMirror['options'];
   options?: ICodeMirror['options'];
   isGfmMode?: boolean;
   isGfmMode?: boolean;