From 33acc8efd9bc5b63e319c3cc68d2da3de19015bc Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Tue, 23 Jan 2024 23:22:51 +0400 Subject: [PATCH] Up PropertyStackView --- .../view/PropertyCompositeView.ts | 1 - .../style_manager/view/PropertySelectView.ts | 1 - ...pertyStackView.js => PropertyStackView.ts} | 49 +++++++++---------- 3 files changed, 23 insertions(+), 28 deletions(-) rename test/specs/style_manager/view/{PropertyStackView.js => PropertyStackView.ts} (61%) diff --git a/test/specs/style_manager/view/PropertyCompositeView.ts b/test/specs/style_manager/view/PropertyCompositeView.ts index 96032f37c..bbec2067d 100644 --- a/test/specs/style_manager/view/PropertyCompositeView.ts +++ b/test/specs/style_manager/view/PropertyCompositeView.ts @@ -37,7 +37,6 @@ describe('PropertyCompositeView', () => { compOpts = { em, componentTypes: dcomp.componentTypes }; target = new Component({}, compOpts); component = new Component({}, compOpts); - // target.model = component; model = new PropertyComposite( { type: 'composite', diff --git a/test/specs/style_manager/view/PropertySelectView.ts b/test/specs/style_manager/view/PropertySelectView.ts index 13b3f5cfa..224ff2d23 100644 --- a/test/specs/style_manager/view/PropertySelectView.ts +++ b/test/specs/style_manager/view/PropertySelectView.ts @@ -1,7 +1,6 @@ import PropertySelectView from '../../../../src/style_manager/view/PropertySelectView'; import Property from '../../../../src/style_manager/model/PropertyRadio'; import Editor from '../../../../src/editor/model/Editor'; -import DomComponents from '../../../../src/dom_components'; import Component from '../../../../src/dom_components/model/Component'; describe('PropertySelectView', () => { diff --git a/test/specs/style_manager/view/PropertyStackView.js b/test/specs/style_manager/view/PropertyStackView.ts similarity index 61% rename from test/specs/style_manager/view/PropertyStackView.js rename to test/specs/style_manager/view/PropertyStackView.ts index a92fcc742..8ca57530b 100644 --- a/test/specs/style_manager/view/PropertyStackView.js +++ b/test/specs/style_manager/view/PropertyStackView.ts @@ -1,25 +1,25 @@ -import PropertyStackView from 'style_manager/view/PropertyStackView'; -import Property from 'style_manager/model/PropertyStack'; -import Component from 'dom_components/model/Component'; -import Editor from 'editor/model/Editor'; -import DomComponents from 'dom_components'; +import PropertyStackView from '../../../../src/style_manager/view/PropertyStackView'; +import PropertyStack from '../../../../src/style_manager/model/PropertyStack'; +import Component from '../../../../src/dom_components/model/Component'; +import Editor from '../../../../src/editor/model/Editor'; +import DomComponents from '../../../../src/dom_components'; describe('PropertyStackView', () => { - let em; - let dcomp; - let compOpts; - var component; - var fixtures; - var target; - var model; - var view; - var propName = 'testprop'; - var properties = [ + let em: Editor; + let dcomp: Editor['Components']; + let compOpts: any; + let component: Component; + let fixtures: HTMLElement; + let target: Component; + let model: PropertyStack; + let view: PropertyStackView; + const propName = 'testprop'; + const properties = [ { property: 'subprop1' }, { type: 'integer', property: 'subprop2', - defaults: 0, + defaults: '0', units: ['%', 'px'], }, { @@ -36,8 +36,7 @@ describe('PropertyStackView', () => { compOpts = { em, componentTypes: dcomp.componentTypes }; target = new Component({}, compOpts); component = new Component({}, compOpts); - target.model = component; - model = new Property({ + model = new PropertyStack({ type: 'stack', property: propName, properties, @@ -46,19 +45,17 @@ describe('PropertyStackView', () => { model, }); document.body.innerHTML = '
'; - fixtures = document.body.firstChild; + fixtures = document.body.firstChild as HTMLElement; view.render(); fixtures.appendChild(view.el); }); - afterAll(() => { - component = null; - view = null; - model = null; + afterEach(() => { + em.destroy(); }); test('Rendered correctly', () => { - var prop = view.el; + const prop = view.el; expect(fixtures.querySelector('.property')).toBeTruthy(); expect(prop.querySelector('.label')).toBeTruthy(); expect(prop.querySelector('.field')).toBeTruthy(); @@ -74,12 +71,12 @@ describe('PropertyStackView', () => { }); test('Layers rendered correctly', () => { - var children = view.el.querySelector('[data-layers-wrapper]').children; + const children = view.el.querySelector('[data-layers-wrapper]')!.children; expect(children.length).toEqual(1); }); test('Layers container is empty', () => { - var layers = view.el.querySelector('.layers'); + const layers = view.el.querySelector('.layers')!; expect(layers.innerHTML).toBeFalsy(); }); });