diff --git a/.eslintrc.js b/.eslintrc.js index 014262e..c8eefb9 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -26,6 +26,7 @@ module.exports = { "@typescript-eslint/no-use-before-define": "off", "@typescript-eslint/restrict-template-expressions": "off", "@typescript-eslint/unbound-method": "off", + "@typescript-eslint/quotes": "warn", "arrow-parens": "off", "class-methods-use-this": "off", "func-names": "off", @@ -34,6 +35,7 @@ module.exports = { "max-len": "off", "no-console": "off", "no-new": "off", + "no-continue": "off", "no-plusplus": "off", "object-curly-newline": "off", }, diff --git a/src/components/excel/Excel.ts b/src/components/excel/Excel.ts index d856a30..6f070e8 100644 --- a/src/components/excel/Excel.ts +++ b/src/components/excel/Excel.ts @@ -1,8 +1,8 @@ -import { Store } from '../../core/createStore'; -import { $, Dom } from '../../core/dom'; -import { Emitter } from '../../core/Emitter'; -import { ExcelComponent } from '../../core/ExcelComponent'; -import { StoreSubscriber } from '../../core/StoreSubscriber'; +import { Store } from 'core/createStore'; +import { $, Dom } from 'core/dom'; +import { Emitter } from 'core/Emitter'; +import { ExcelComponent } from 'core/ExcelComponent'; +import { StoreSubscriber } from 'core/StoreSubscriber'; interface ExcelOptionsType { components: any[], @@ -16,14 +16,11 @@ export class Excel { store: Store; subscriber: StoreSubscriber; - constructor(selector: string, options: ExcelOptionsType) { - this.$el = $(selector); + constructor(options: ExcelOptionsType) { this.components = options.components; this.emitter = new Emitter(); this.store = options.store; this.subscriber = new StoreSubscriber(this.store); - - console.log(`Created new Excel class in ${selector} with options: ${options}`); } getRoot() { @@ -44,12 +41,10 @@ export class Excel { return component; }); - return $root.$el; + return $root; } - render() { - this.$el.append(this.getRoot()); - + init() { this.subscriber.subscribeComponents(this.components); this.components.forEach(component => component.init()); } diff --git a/src/components/formula/Formula.ts b/src/components/formula/Formula.ts index ea137aa..7a6e738 100644 --- a/src/components/formula/Formula.ts +++ b/src/components/formula/Formula.ts @@ -1,5 +1,5 @@ -import { Dom } from '../../core/dom'; -import { ExcelComponent } from '../../core/ExcelComponent'; +import { Dom } from 'core/dom'; +import { ExcelComponent } from 'core/ExcelComponent'; export class Formula extends ExcelComponent { static className = 'excel__formula'; diff --git a/src/components/header/Header.ts b/src/components/header/Header.ts index 143266c..77e46cc 100644 --- a/src/components/header/Header.ts +++ b/src/components/header/Header.ts @@ -1,14 +1,16 @@ -import { $, Dom } from '../../core/dom'; -import { ExcelComponent } from '../../core/ExcelComponent'; -import * as actions from '../../redux/actions'; +import { $, Dom } from 'core/dom'; +import { ExcelStateComponent } from 'core/ExcelStateComponent'; +import { deleteTable } from 'redux/actions'; +import * as actions from 'redux/actions'; -export class Header extends ExcelComponent { +export class Header extends ExcelStateComponent { static className = 'excel__header'; constructor($root: Dom, options: any) { super($root, { name: 'Header', - listeners: ['input'], + listeners: ['input', 'click'], + subscribe: ['title'], ...options, }); } @@ -20,10 +22,10 @@ export class Header extends ExcelComponent {