diff --git a/src/asset_manager/view/AssetImageView.ts b/src/asset_manager/view/AssetImageView.ts index e384590c8..0853f9d4f 100644 --- a/src/asset_manager/view/AssetImageView.ts +++ b/src/asset_manager/view/AssetImageView.ts @@ -74,7 +74,7 @@ export default class AssetImageView extends AssetView { onDblClick(model); } else { this.updateTarget(target); - em && em.get('Modal').close(); + em?.Modal.close(); } isFunction(onSelect) && onSelect(model); } diff --git a/src/asset_manager/view/AssetView.ts b/src/asset_manager/view/AssetView.ts index e37fe2b45..307c26b02 100644 --- a/src/asset_manager/view/AssetView.ts +++ b/src/asset_manager/view/AssetView.ts @@ -39,8 +39,8 @@ export default class AssetView extends View { init() { const { em } = this; - const mainPage = em.get('PageManager').getMain(); + const mainPage = em.Pages.getMain(); this.set('frames', mainPage.getFrames()); this.updateDevice({ frame: mainPage.getMainFrame() }); } diff --git a/src/canvas/model/Frame.ts b/src/canvas/model/Frame.ts index b06ef5bed..034a306ea 100644 --- a/src/canvas/model/Frame.ts +++ b/src/canvas/model/Frame.ts @@ -42,16 +42,16 @@ export default class Frame extends Model { super(module, attr); const { em } = this; const { styles, component } = this.attributes; - const domc = em.get('DomComponents'); + const domc = em.Components; const conf = domc.getConfig(); - const allRules = em.get('CssComposer').getAll(); + const allRules = em.Css.getAll(); const idMap: any = {}; const modOpts = { em, config: conf, frame: this, idMap }; if (!isComponent(component)) { const wrp = isObject(component) ? component : { components: component }; !wrp.type && (wrp.type = 'wrapper'); - const Wrapper = domc.getType('wrapper').model; + const Wrapper = domc.getType('wrapper')!.model; this.set('component', new Wrapper(wrp, modOpts)); } diff --git a/src/canvas/view/FrameView.ts b/src/canvas/view/FrameView.ts index fa3091cee..899bb9af4 100644 --- a/src/canvas/view/FrameView.ts +++ b/src/canvas/view/FrameView.ts @@ -88,7 +88,7 @@ export default class FrameView extends View { } getCanvasModel(): Canvas { - return this.em.get('Canvas').getModel(); + return this.em.Canvas.getModel(); } getWindow() { @@ -124,7 +124,7 @@ export default class FrameView extends View { } getGlobalToolsEl() { - return this.em.get('Canvas').getGlobalToolsEl(); + return this.em.Canvas.getGlobalToolsEl()!; } getHighlighter() { @@ -202,11 +202,11 @@ export default class FrameView extends View { autoscroll() { if (this.dragging) { const { lastClientY } = this; - const canvas = this.em.get('Canvas'); + const canvas = this.em.Canvas; const win = this.getWindow(); const actualTop = win.pageYOffset; const clientY = lastClientY || 0; - const limitTop = canvas.getConfig().autoscrollLimit; + const limitTop = canvas.getConfig().autoscrollLimit!; const limitBottom = this.getRect().height - limitTop; let nextTop = actualTop; @@ -225,7 +225,7 @@ export default class FrameView extends View { nextTop < this.lastMaxHeight ) { const toolsEl = this.getGlobalToolsEl(); - toolsEl.style.opacity = 0; + toolsEl.style.opacity = '0'; this.showGlobalTools(); win.scrollTo(0, nextTop); } @@ -409,7 +409,7 @@ export default class FrameView extends View { ` ); const component = model.getComponent(); - const { view } = em.get('DomComponents').getType('wrapper'); + const { view } = em.Components.getType('wrapper')!; this.wrapper = new view({ model: component, config: { @@ -425,7 +425,7 @@ export default class FrameView extends View { collection: model.getStyles(), //@ts-ignore config: { - ...em.get('CssComposer').getConfig(), + ...em.Css.getConfig(), frameView: this, }, }).render().el diff --git a/src/commands/index.ts b/src/commands/index.ts index 5647427b4..c012d9d64 100644 --- a/src/commands/index.ts +++ b/src/commands/index.ts @@ -414,7 +414,7 @@ export default class CommandsModule extends Module extends Model { * Stop current command */ stopCommand(opts?: any) { - this.em.get('Commands').stop(this.id, opts); + this.em.Commands.stop(this.id as string, opts); } /** diff --git a/src/commands/view/Preview.ts b/src/commands/view/Preview.ts index b49db770b..2354b1a7e 100644 --- a/src/commands/view/Preview.ts +++ b/src/commands/view/Preview.ts @@ -21,12 +21,12 @@ export default { const { em } = this; const mthEv = on ? 'on' : 'off'; if (em) { - const canvas = em.get('Canvas'); + const canvas = em.Canvas; const body = canvas.getBody(); const tlb = canvas.getToolbarEl(); tlb && (tlb.style.display = on ? 'none' : ''); const elP = body.querySelectorAll(`.${this.ppfx}no-pointer`); - each(elP, item => (item.style.pointerEvents = on ? 'all' : '')); + each(elP, item => ((item as HTMLElement).style.pointerEvents = on ? 'all' : '')); em[mthEv]('run:tlb-move:before', this.preventDrag); } }, diff --git a/src/commands/view/SelectPosition.ts b/src/commands/view/SelectPosition.ts index 40aa9470d..b96f921f8 100644 --- a/src/commands/view/SelectPosition.ts +++ b/src/commands/view/SelectPosition.ts @@ -10,7 +10,7 @@ export default { * */ startSelectPosition(trg: HTMLElement, doc: Document, opts: any = {}) { this.isPointed = false; - var utils = this.em.get('Utils'); + const utils = this.em.Utils; const container = trg.ownerDocument.body; if (utils && !this.sorter) diff --git a/src/css_composer/index.ts b/src/css_composer/index.ts index c0dcc0d33..bf4f24757 100644 --- a/src/css_composer/index.ts +++ b/src/css_composer/index.ts @@ -170,10 +170,10 @@ export default class CssComposer extends ItemManagerModule) { let slc = selectors; if (isString(selectors)) { - const sm = this.em.get('SelectorManager'); + const sm = this.em.Selectors; const singleSel = selectors.split(',')[0].trim(); - const node = this.em.get('Parser').parserCss.checkNode({ selectors: singleSel })[0]; - slc = sm.get(node.selectors); + const node = this.em.Parser.parserCss.checkNode({ selectors: singleSel } as any)[0]; + slc = sm.get(node.selectors as string[]); } return this.rules.find(rule => rule.compare(slc, state, width, ruleProps)) || null; } @@ -273,13 +273,13 @@ export default class CssComposer extends ItemManagerModule