From 9a50de7bd9fea6a0d368ad0e3fbc2fd30da7f037 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Thu, 5 May 2022 14:08:41 +0200 Subject: [PATCH] TS fixes --- src/selector_manager/index.ts | 3 ++- src/selector_manager/view/ClassTagsView.ts | 2 +- src/utils/{html.js => html.ts} | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) rename src/utils/{html.js => html.ts} (89%) diff --git a/src/selector_manager/index.ts b/src/selector_manager/index.ts index 9d37f10e3..f70a47712 100644 --- a/src/selector_manager/index.ts +++ b/src/selector_manager/index.ts @@ -107,6 +107,7 @@ export default class SelectorManager extends Module { states!: Collection; selectorTags?: ClassTagsView; selected!: Selectors; + all!: Selectors; em!: EditorModel; events = { @@ -141,7 +142,7 @@ export default class SelectorManager extends Module { this.all = new Selectors(config.selectors); this.selected = new Selectors([], { em, config }); this.states = new Collection( - config.states.map(state => new State(state)), + config.states.map((state: any) => new State(state)), { model: State } ); this.model = new Model({ cFirst: config.componentFirst, _undo: true }); diff --git a/src/selector_manager/view/ClassTagsView.ts b/src/selector_manager/view/ClassTagsView.ts index 2239bc560..83c32eb36 100644 --- a/src/selector_manager/view/ClassTagsView.ts +++ b/src/selector_manager/view/ClassTagsView.ts @@ -1,7 +1,7 @@ import { isEmpty, isArray, isString, debounce } from 'underscore'; import { View } from '../../common'; import ClassTagView from './ClassTagView'; -import html from 'utils/html'; +import html from '../../utils/html'; import EditorModel from '../../editor/model/Editor'; import SelectorManager from '..'; import State from '../model/State'; diff --git a/src/utils/html.js b/src/utils/html.ts similarity index 89% rename from src/utils/html.js rename to src/utils/html.ts index d327f621f..2bca02a5d 100644 --- a/src/utils/html.js +++ b/src/utils/html.ts @@ -9,7 +9,7 @@ import { escape } from './mixins'; * const str = 'Hello'; * const strHtml = html`Escaped ${str}, unescaped $${str}`; */ -export default function html(literals, ...substs) { +export default function html(literals: TemplateStringsArray, ...substs: string[]) { const { raw } = literals; return raw.reduce((acc, lit, i) => {