type: Fix toolbars type errors.

Author: jaywcjlove

src/commands/bold.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ICommand} from './'
+import { ICommand } from './'
 
 export const bold: ICommand = {
   name: 'bold',

src/commands/fullscreen.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useRef, useState } from 'react';
-import { ICommand} from './';
+import { ICommand } from './';
 import { IMarkdownEditor } from '../';
 
 type Options = {

src/commands/preview.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { ICommand} from './';
+import { ICommand } from './';
 import { IMarkdownEditor } from '../';
 
 type Options = {

src/common/props.ts

@@ -2,7 +2,6 @@ import * as CodeMirror from 'codemirror';
 import 'codemirror/mode/markdown/markdown';
 import React, { Component } from 'react';
 import { DomEvent, IDefineModeOptions, IEventDict, IGetSelectionOptions, IInstance, ISetScrollOptions, ISetSelectionOptions } from '../../common/codemirror';
-import { IProps } from '../../common/props';
 import './codemirror.less';
 import './index.less';
 
@@ -17,7 +16,7 @@ if (!SERVER_RENDERED) {
   cm = require('codemirror');
 }
 
-export interface ICodeMirror extends IProps {
+export interface ICodeMirror {
   value?: string,
   width?: number | string,
   height?: number | string,

src/components/CodeMirror/index.tsx

@@ -1,19 +1,19 @@
 import * as React from "react";
-import { IProps } from '../../common/props';
 import CodeMirror from 'codemirror';
 import './index.less';
 import { ICommand, defaultCommands } from '../../commands';
 import { IMarkdownEditor } from '../../';
 
-export interface IToolBarProps extends IProps {
+export type IToolBarProps<T = (keyof (typeof defaultCommands)) | ICommand> = {
+  className?: string;
   editorProps: IMarkdownEditor;
   mode?: boolean;
   preview?: HTMLDivElement | null;
   container?: HTMLDivElement | null;
   containerEditor?: HTMLDivElement | null;
   prefixCls?: string;
   editor?: CodeMirror.Editor;
-  toolbars?: (keyof (typeof defaultCommands))[] | ICommand[] | false;
+  toolbars?: T[];
   onClick?: (type: string) => void;
 }
 
@@ -26,7 +26,7 @@ export default function ToolBar(props: IToolBarProps) {
     }
   }
   return (
-    <div className={`${prefixCls}-toolbar ${className} ${mode ? `${prefixCls}-toolbar-mode` : ''}`} {...htmlProps}>
+    <div className={`${prefixCls}-toolbar ${className || ''} ${mode ? `${prefixCls}-toolbar-mode` : ''}`} {...htmlProps}>
       {[...toolbars].map((command, key) => {
         let buttonProps: React.ButtonHTMLAttributes<HTMLButtonElement> = {
           type: 'button',

src/components/ToolBar/index.tsx

@@ -1,5 +1,4 @@
 import React, { useState, createRef, useRef, useEffect } from 'react';
-import { IProps } from './common/props';
 import CodeMirror, { ICodeMirror } from './components/CodeMirror';
 import MarkdownPreview, { MarkdownPreviewProps } from '@uiw/react-markdown-preview';
 import ToolBar, { IToolBarProps } from './components/ToolBar';
@@ -8,7 +7,8 @@ import './index.less';
 
 export * from './commands';
 
-export interface IMarkdownEditor extends IProps, ICodeMirror {
+export interface IMarkdownEditor extends ICodeMirror {
+  className?: string;
   prefixCls?: string,
   value?: string,
   height?: number,