From 5af9be77c2a10dc02921770bc08b11cb272c25fa Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Fri, 14 Jan 2022 18:33:53 +0100
Subject: [PATCH] Fix style views

---
 src/style_manager/model/PropertyComposite.js    | 2 +-
 src/style_manager/view/PropertyColorView.js     | 4 ++--
 src/style_manager/view/PropertyCompositeView.js | 2 +-
 src/style_manager/view/PropertyNumberView.js    | 2 +-
 src/style_manager/view/PropertyRadioView.js     | 2 +-
 src/style_manager/view/PropertyStackView.js     | 2 +-
 src/style_manager/view/PropertyView.js          | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/style_manager/model/PropertyComposite.js b/src/style_manager/model/PropertyComposite.js
index 556c6b268..97949f8bd 100644
--- a/src/style_manager/model/PropertyComposite.js
+++ b/src/style_manager/model/PropertyComposite.js
@@ -1,5 +1,6 @@
 import { isString, isUndefined, keys } from 'underscore';
 import Property from './Property';
+import Properties from './Properties';
 
 export const isNumberType = type => type === 'integer' || type === 'number';
 
@@ -54,7 +55,6 @@ export default class PropertyComposite extends Property {
   initialize(props = {}, opts = {}) {
     Property.callParentInit(Property, this, props, opts);
     const { em } = this;
-    const Properties = require('./Properties').default;
     const properties = new Properties(this.get('properties') || [], { em, parentProp: this });
     this.set('properties', properties, { silent: 1 });
     this.listenTo(properties, 'change', this.__upProperties);
diff --git a/src/style_manager/view/PropertyColorView.js b/src/style_manager/view/PropertyColorView.js
index e494123fa..c31606fd8 100644
--- a/src/style_manager/view/PropertyColorView.js
+++ b/src/style_manager/view/PropertyColorView.js
@@ -3,14 +3,14 @@ import InputColor from 'domain_abstract/ui/InputColor';
 
 export default class PropertyColorView extends PropertyNumberView {
   setValue(value) {
-    this.inputInst.setValue(value, { fromTarget: 1, def: this.model.getDefaultValue() });
+    this.inputInst?.setValue(value, { fromTarget: 1, def: this.model.getDefaultValue() });
   }
 
   remove() {
     PropertyNumberView.prototype.remove.apply(this, arguments);
     const inp = this.inputInst;
     inp && inp.remove && inp.remove();
-    ['inputInst', '$color'].forEach(i => (this[i] = {}));
+    ['inputInst', '$color'].forEach(i => (this[i] = null));
   }
 
   __handleChange(value, partial) {
diff --git a/src/style_manager/view/PropertyCompositeView.js b/src/style_manager/view/PropertyCompositeView.js
index ed0bfd01e..ef2ae1fca 100644
--- a/src/style_manager/view/PropertyCompositeView.js
+++ b/src/style_manager/view/PropertyCompositeView.js
@@ -20,7 +20,7 @@ export default class PropertyCompositeView extends PropertyView {
 
   onRender() {
     const { model, pfx } = this;
-    const props = model.getProperties();
+    const props = model.get('properties');
 
     if (props.length && !this.props) {
       const detached = model.isDetached();
diff --git a/src/style_manager/view/PropertyNumberView.js b/src/style_manager/view/PropertyNumberView.js
index e38fd21bd..2fe2f7f01 100644
--- a/src/style_manager/view/PropertyNumberView.js
+++ b/src/style_manager/view/PropertyNumberView.js
@@ -14,7 +14,7 @@ export default class PropertyNumberView extends PropertyView {
   setValue(value) {
     const parsed = this.model.parseValue(value);
     value = `${parsed.value}${parsed.unit}`;
-    this.inputInst.setValue(value, { silent: 1 });
+    this.inputInst?.setValue(value, { silent: 1 });
   }
 
   onRender() {
diff --git a/src/style_manager/view/PropertyRadioView.js b/src/style_manager/view/PropertyRadioView.js
index a5b72ff15..c794544ab 100644
--- a/src/style_manager/view/PropertyRadioView.js
+++ b/src/style_manager/view/PropertyRadioView.js
@@ -39,7 +39,7 @@ export default class PropertyRadioView extends PropertySelectView {
   }
 
   __setValueInput(value) {
-    const model = this.model;
+    const { model } = this;
     const id = value || model.getDefaultValue();
     const inputIn = this.getInputEl()?.querySelector(`[value="${id}"]`);
     inputIn && (inputIn.checked = true);
diff --git a/src/style_manager/view/PropertyStackView.js b/src/style_manager/view/PropertyStackView.js
index 0c9dfa79b..c156eeaea 100644
--- a/src/style_manager/view/PropertyStackView.js
+++ b/src/style_manager/view/PropertyStackView.js
@@ -53,7 +53,7 @@ export default class PropertyStackView extends PropertyCompositeView {
 
   onRender() {
     const { model, el, config } = this;
-    const props = model.getProperties();
+    const props = model.get('properties');
 
     if (props.length && !this.props) {
       const propsView = new PropertiesView({
diff --git a/src/style_manager/view/PropertyView.js b/src/style_manager/view/PropertyView.js
index 0a38f3a9b..12c71207b 100644
--- a/src/style_manager/view/PropertyView.js
+++ b/src/style_manager/view/PropertyView.js
@@ -65,7 +65,7 @@ export default class Property extends View {
 
   remove() {
     View.prototype.remove.apply(this, arguments);
-    ['em', 'input', '$input', 'view'].forEach(i => (this[i] = {}));
+    ['em', 'input', '$input', 'view'].forEach(i => (this[i] = null));
     this.__destroyFn(this._getClbOpts());
   }