diff --git a/src/editor/index.ts b/src/editor/index.ts index 4234bce4a..5b42f62a6 100644 --- a/src/editor/index.ts +++ b/src/editor/index.ts @@ -58,6 +58,7 @@ import { EventHandler } from 'backbone'; import { isUndefined } from 'underscore'; import { IBaseModule } from '../abstract/Module'; import CanvasModule from '../canvas'; +import UtilsModule from '../utils'; import cash from '../utils/cash-dom'; import html from '../utils/html'; import defaults from './config/config'; @@ -97,7 +98,6 @@ export default class EditorModule implements IBaseModule { get I18n(): I18nModule { return this.em.get('I18n'); } - //@ts-ignore get Utils(): UtilsModule { return this.em.get('Utils'); } diff --git a/src/panels/view/PanelView.ts b/src/panels/view/PanelView.ts index 70f616fa2..c16184fbf 100644 --- a/src/panels/view/PanelView.ts +++ b/src/panels/view/PanelView.ts @@ -1,5 +1,6 @@ import { View } from '../../abstract'; import EditorModule from '../../editor'; +import Resizer from '../../utils/Resizer'; import Panel from '../model/Panel'; import ButtonsView from './ButtonsView'; @@ -67,7 +68,7 @@ export default class PanelView extends View { cl = resz[3]; } - var resizer = new editor.Utils.Resizer({ + const resizer: Resizer = new editor.Utils.Resizer({ tc, cr, bc, @@ -84,10 +85,10 @@ export default class PanelView extends View { em && em.trigger('change:canvasOffset'); }, posFetcher: (el: HTMLElement, { target }: any) => { - const style = el.style; + const style = el.style as any; const config = resizer.getConfig(); - const keyWidth = config.keyWidth; - const keyHeight = config.keyHeight; + const keyWidth = config.keyWidth!; + const keyHeight = config.keyHeight!; const rect = el.getBoundingClientRect(); const forContainer = target == 'container'; const styleWidth = style[keyWidth]; diff --git a/src/utils/Resizer.ts b/src/utils/Resizer.ts index 8ac444808..607ae058e 100644 --- a/src/utils/Resizer.ts +++ b/src/utils/Resizer.ts @@ -262,7 +262,7 @@ export default class Resizer { * Init the Resizer with options * @param {Object} options */ - constructor(opts = {}) { + constructor(opts: ResizerOptions = {}) { this.opts = { ratioDefault: false, onUpdateContainer: () => {}, diff --git a/src/utils/index.ts b/src/utils/index.ts index 7febe65b9..3cf27fab9 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -7,7 +7,7 @@ import EditorModel from '../editor/model/Editor'; export default class UtilsModule extends Module { Sorter = Sorter; - Resizer = Resizer; + Resizer: typeof Resizer = Resizer; Dragger = Dragger; helpers = { ...mixins };