chore: add missing type import (#1650)

* chore: add missing type * chore: add missing type(table plugin) * chore: fix broken type
nhn · Jul 7, 2021 · e38a81e · e38a81e
1 parent 1df1fb8
commit e38a81e
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 15 deletions.
diff --git a/apps/editor/types/editor.d.ts b/apps/editor/types/editor.d.ts
@@ -1,7 +1,14 @@
 import { Schema, NodeSpec, MarkSpec, Fragment } from 'prosemirror-model';
 import { EditorView, Decoration, DecorationSet } from 'prosemirror-view';
 import { EditorState, Plugin, Selection, TextSelection } from 'prosemirror-state';
-import { HTMLConvertor, MdPos, Sourcepos, Context as MdContext } from './toastmark';
+import {
+  HTMLConvertor,
+  MdPos,
+  Sourcepos,
+  Context as MdContext,
+  HTMLToken,
+  HTMLConvertorMap,
+} from './toastmark';
 import { Emitter, Handler } from './event';
 import { Context, EditorAllCommandMap, EditorCommandFn, SpecManager } from './spec';
 import { ToMdConvertorMap } from './convertor';

diff --git a/apps/editor/types/plugin.d.ts b/apps/editor/types/plugin.d.ts
@@ -3,7 +3,7 @@ import { EditorView, NodeView } from 'prosemirror-view';
 import { Node } from 'prosemirror-model';
 
 import { CustomParserMap } from './toastmark';
-import { CustomHTMLRendererOpt } from './editor';
+import { CustomHTMLRenderer } from './editor';
 import { Emitter } from './event';
 import { ToMdConvertorMap } from './convertor';
 import { Dispatch, Payload, DefaultPayload } from './spec';
@@ -35,7 +35,7 @@ interface PluginToolbarItem {
 }
 
 export interface PluginInfo {
-  toHTMLRenderers?: CustomHTMLRendererOpt;
+  toHTMLRenderers?: CustomHTMLRenderer;
   toMarkdownRenderers?: ToMdConvertorMap;
   markdownPlugins?: PluginProp[];
   wysiwygPlugins?: PluginProp[];
@@ -47,7 +47,7 @@ export interface PluginInfo {
 }
 
 export interface PluginInfoResult {
-  toHTMLRenderers: CustomHTMLRendererOpt;
+  toHTMLRenderers: CustomHTMLRenderer;
   toMarkdownRenderers: ToMdConvertorMap;
   mdPlugins: PluginProp[];
   wwPlugins: PluginProp[];

diff --git a/plugins/code-syntax-highlight/src/__test__/unit/languageSelectBox.spec.ts b/plugins/code-syntax-highlight/src/__test__/unit/languageSelectBox.spec.ts
@@ -25,6 +25,7 @@ describe('languageSelectBox', () => {
       removeEventHandler: jest.fn(),
       addEventType: jest.fn(),
       getEvents: jest.fn(),
+      holdEventInvoke: jest.fn(),
     };
 
     wwContainer = document.createElement('div');

diff --git a/plugins/table-merged-cell/src/markdown/renderer.ts b/plugins/table-merged-cell/src/markdown/renderer.ts
@@ -1,8 +1,8 @@
-import type { ToHTMLConvertorMap } from '@toast-ui/editor';
+import type { CustomHTMLRenderer } from '@toast-ui/editor';
 import type { OpenTagToken } from '@toast-ui/toastmark';
 import { MergedTableCellMdNode, MergedTableRowMdNode } from '@t/index';
 
-export const toHTMLRenderers: ToHTMLConvertorMap = {
+export const toHTMLRenderers: CustomHTMLRenderer = {
   // @ts-ignore
   tableRow(node: MergedTableRowMdNode, { entering, origin }) {
     if (entering) {

diff --git a/plugins/table-merged-cell/types/index.d.ts b/plugins/table-merged-cell/types/index.d.ts
@@ -1,5 +1,4 @@
-import type { PluginCommandMap } from '@toast-ui/editor';
-import type { TableCellMdNode, TableMdNode } from '@toast-ui/toastmark';
+import type { PluginCommandMap, TableMdNode, TableCellMdNode, MdNode } from '@toast-ui/editor';
 import type { Selection } from 'prosemirror-state';
 import type { Node, ResolvedPos } from 'prosemirror-model';
 
@@ -17,18 +16,18 @@ interface TableHeadMdNode extends MdNode {
 type SpanType = '@cols' | '@rows';
 
 export interface MergedTableRowMdNode extends MdNode {
-  firstChild: MergedTableCell | null;
-  lastChild: MergedTableCell | null;
+  firstChild: MergedTableCellMdNode | null;
+  lastChild: MergedTableCellMdNode | null;
   parent: TableBodyMdNode | TableHeadMdNode;
-  prev: MergedTableRow | null;
-  next: MergedTableRow | null;
+  prev: MergedTableRowMdNode | null;
+  next: MergedTableRowMdNode | null;
   rowspanMap: { [key: string]: number };
 }
 
 export interface MergedTableCellMdNode extends TableCellMdNode {
-  prev: MergedTableCell | null;
-  next: MergedTableCell | null;
-  parent: MergedTableRow;
+  prev: MergedTableCellMdNode | null;
+  next: MergedTableCellMdNode | null;
+  parent: MergedTableRowMdNode;
 }
 
 export interface CellSelection extends Selection {