Improve components TS

src/dom_components/index.ts

@@ -98,6 +98,7 @@ import ComponentFrameView from './view/ComponentFrameView';
 import { ItemManagerModule } from '../abstract/Module';
 import EditorModel from '../editor/model/Editor';
 import { ComponentAdd, ComponentDefinitionDefined } from './model/types';
+import { AddOptions } from '../common';
 
 export type ComponentEvent =
   | 'component:create'
@@ -323,7 +324,7 @@ export default class ComponentManager extends ItemManagerModule<DomComponentsCon
   }
 
   /**
-   * Returns privately the main wrapper
+   * Returns the main wrapper.
    * @return {Object}
    * @private
    */
@@ -376,7 +377,7 @@ export default class ComponentManager extends ItemManagerModule<DomComponentsCon
    */
   getComponents(): Components {
     const wrp = this.getWrapper();
-    return wrp?.get('components')!;
+    return wrp?.components()!;
   }
 
   /**
@@ -408,7 +409,7 @@ export default class ComponentManager extends ItemManagerModule<DomComponentsCon
    *   attributes: { title: 'here' }
    * });
    */
-  addComponent(component: ComponentAdd, opt = {}) {
+  addComponent(component: ComponentAdd, opt: AddOptions = {}) {
     return this.getComponents().add(component, opt);
   }
 
@@ -442,7 +443,7 @@ export default class ComponentManager extends ItemManagerModule<DomComponentsCon
    * @return {this}
    * @private
    */
-  setComponents(components: Component, opt = {}) {
+  setComponents(components: ComponentAdd, opt: AddOptions = {}) {
     this.clear(opt).addComponent(components, opt);
   }
 

src/editor/index.ts

@@ -60,7 +60,7 @@ import BlockManager, { BlockEvent } from '../block_manager';
 import CanvasModule, { CanvasEvent } from '../canvas';
 import CodeManagerModule from '../code_manager';
 import CommandsModule, { CommandEvent } from '../commands';
-import { EventHandler, LiteralUnion } from '../common';
+import { AddOptions, EventHandler, LiteralUnion } from '../common';
 import CssComposer from '../css_composer';
 import CssRule from '../css_composer/model/CssRule';
 import CssRules from '../css_composer/model/CssRules';
@@ -69,7 +69,7 @@ import ComponentManager, { ComponentEvent } from '../dom_components';
 import Component from '../dom_components/model/Component';
 import Components from '../dom_components/model/Components';
 import ComponentWrapper from '../dom_components/model/ComponentWrapper';
-import { ComponentDefinition, DragMode } from '../dom_components/model/types';
+import { ComponentAdd, DragMode } from '../dom_components/model/types';
 import I18nModule from '../i18n';
 import KeymapsModule, { KeymapEvent } from '../keymaps';
 import ModalModule, { ModalEvent } from '../modal_dialog';
@@ -322,7 +322,7 @@ export default class Editor implements IBaseModule<EditorConfig> {
    *   content: 'New component'
    * });
    */
-  setComponents(components: string | ComponentDefinition, opt: any = {}) {
+  setComponents(components: ComponentAdd, opt: AddOptions = {}) {
     this.em.setComponents(components, opt);
     return this;
   }
@@ -344,7 +344,7 @@ export default class Editor implements IBaseModule<EditorConfig> {
    *   content: 'New component'
    * });
    */
-  addComponents(components: string | ComponentDefinition, opts?: any): Component[] {
+  addComponents(components: ComponentAdd, opts?: AddOptions): Component[] {
     return this.getWrapper()!.append(components, opts);
   }
 

src/editor/model/Editor.ts

@@ -3,7 +3,7 @@ import Backbone from 'backbone';
 import $ from '../../utils/cash-dom';
 import Extender from '../../utils/extender';
 import { getModel, hasWin, isEmptyObj } from '../../utils/mixins';
-import { Model } from '../../common';
+import { AddOptions, Model } from '../../common';
 import Selected from './Selected';
 import FrameView from '../../canvas/view/FrameView';
 import Editor from '..';
@@ -40,7 +40,7 @@ import ComponentView from '../../dom_components/view/ComponentView';
 import { ProjectData } from '../../storage_manager/model/IStorage';
 import CssRules from '../../css_composer/model/CssRules';
 import Frame from '../../canvas/model/Frame';
-import { DragMode } from '../../dom_components/model/types';
+import { ComponentAdd, DragMode } from '../../dom_components/model/types';
 
 Backbone.$ = $;
 
@@ -652,7 +652,7 @@ export default class EditorModel extends Model {
    * @return {this}
    * @public
    */
-  setComponents(components: any, opt = {}) {
+  setComponents(components: ComponentAdd, opt: AddOptions = {}) {
     return this.Components.setComponents(components, opt);
   }