From 0bb9172245954cfbede2de9b47a4ca6f0a24c9f2 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Tue, 15 Oct 2024 17:04:24 +0400
Subject: [PATCH] Update style changes with DataSources

---
 packages/core/src/css_composer/index.ts             |  2 +-
 .../core/src/data_sources/model/DataVariable.ts     |  2 +-
 .../src/domain_abstract/model/StyleableModel.ts     | 13 +------------
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/packages/core/src/css_composer/index.ts b/packages/core/src/css_composer/index.ts
index f7106d6f1..562b77bff 100644
--- a/packages/core/src/css_composer/index.ts
+++ b/packages/core/src/css_composer/index.ts
@@ -254,7 +254,7 @@ export default class CssComposer extends ItemManagerModule<CssComposerConfig & {
 
       if (updateStyle) {
         const styleUpdate = opts.extend ? { ...model.get('style'), ...style } : style;
-        model.set('style', styleUpdate, opts);
+        model.setStyle(styleUpdate, opts);
       }
 
       result.push(model);
diff --git a/packages/core/src/data_sources/model/DataVariable.ts b/packages/core/src/data_sources/model/DataVariable.ts
index fce884565..a03e1d677 100644
--- a/packages/core/src/data_sources/model/DataVariable.ts
+++ b/packages/core/src/data_sources/model/DataVariable.ts
@@ -37,7 +37,7 @@ export default class DataVariable extends Model {
 
   getDataValue() {
     const { path, defaultValue } = this.attributes;
-    const val = this.em?.DataSources?.getValue?.(path, defaultValue);
+    const val = this.em?.DataSources.getValue(path, defaultValue);
 
     return val;
   }
diff --git a/packages/core/src/domain_abstract/model/StyleableModel.ts b/packages/core/src/domain_abstract/model/StyleableModel.ts
index 02b4980f8..684450919 100644
--- a/packages/core/src/domain_abstract/model/StyleableModel.ts
+++ b/packages/core/src/domain_abstract/model/StyleableModel.ts
@@ -151,22 +151,11 @@ export default class StyleableModel<T extends ObjectHash = any> extends Model<T>
         model: this,
         em: this.em!,
         dataVariable: dataVar,
-        updateValueFromDataVariable: (newValue: string) => this.updateStyleProp(styleProp, newValue),
+        updateValueFromDataVariable: () => this.updateView(),
       });
     }
   }
 
-  /**
-   * Update a specific style property
-   */
-  updateStyleProp(prop: string, value: string) {
-    const style = this.getStyle();
-    style[prop] = value;
-    this.setStyle(style, { noEvent: true });
-    this.trigger(`change:style:${prop}`);
-    this.updateView();
-  }
-
   getView(frame?: Frame) {
     let { views, em } = this;
     const frm = frame || em?.getCurrentFrameModel();