From 6997fd0c4790a2b7a94f32b96da81eaf69a9401a Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Thu, 16 Dec 2021 17:34:59 +0100
Subject: [PATCH] Update Composite props

---
 src/style_manager/model/PropertyComposite.js | 64 +++++++++++---------
 test/specs/style_manager/model/Properties.js | 18 +++++-
 2 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/src/style_manager/model/PropertyComposite.js b/src/style_manager/model/PropertyComposite.js
index 17079be48..23fc4ce87 100644
--- a/src/style_manager/model/PropertyComposite.js
+++ b/src/style_manager/model/PropertyComposite.js
@@ -43,38 +43,44 @@ export default Property.extend({
   __upProperties(prop, opts = {}) {
     if (!this.__hasCustom() || opts.__up || opts.__clearIn) return;
 
-    if (this.isDetached()) {
-      const style = this.getProperties().reduce((acc, prop) => {
-        acc[prop.getName()] = prop.hasValue({ noParent: true }) ? prop.__getFullValue() : '';
-        return acc;
-      }, {});
-      this.__upTargetsStyle({ ...style, [prop.getName()]: prop.__getFullValue() }, opts);
-    } else {
-      const { __clear, ...rest } = opts;
-      this.upValue(this.__getFullValue(), rest);
-    }
+    // if (this.isDetached()) {
+    //   const style = this.getProperties().reduce((acc, prop) => {
+    //     acc[prop.getName()] = prop.hasValue({ noParent: true }) ? prop.__getFullValue() : '';
+    //     return acc;
+    //   }, {});
+    //   this.__upTargetsStyle({ ...style, [prop.getName()]: prop.__getFullValue() }, opts);
+    // } else {
+    //   const { __clear, ...rest } = opts;
+    //   this.upValue(this.__getFullValue(), rest);
+    // }
+
+    this.__upTargetsStyleProps(opts);
   },
 
-  __upTargetsStyle(style, opts = {}) {
-    const toStyle = this.get('toStyle');
-    const { __clear } = opts;
-    let newStyle = style;
+  __upTargetsStyleProps(opts = {}) {
+    this.__upTargetsStyle(this.getStyleFromProps(), opts);
+  },
 
-    if (toStyle && !__clear) {
-      const values = this.getValues();
-      newStyle = toStyle(values, { ...opts, style });
-    }
+  // __upTargetsStyle(style, opts = {}) {
+  //   const toStyle = this.get('toStyle');
+  //   const { __clear } = opts;
+  //   let newStyle = style;
 
-    if (this.isDetached()) {
-      newStyle[this.getName()] = '';
-    } else {
-      this.getProperties().map(prop => {
-        newStyle[prop.getName()] = '';
-      });
-    }
+  //   if (toStyle && !__clear) {
+  //     const values = this.getValues();
+  //     newStyle = toStyle(values, { ...opts, style });
+  //   }
 
-    return Property.prototype.__upTargetsStyle.call(this, newStyle, opts);
-  },
+  //   if (this.isDetached()) {
+  //     newStyle[this.getName()] = '';
+  //   } else {
+  //     this.getProperties().map(prop => {
+  //       newStyle[prop.getName()] = '';
+  //     });
+  //   }
+
+  //   return Property.prototype.__upTargetsStyle.call(this, newStyle, opts);
+  // },
 
   /**
    * Get style object from current properties
@@ -165,7 +171,7 @@ export default Property.extend({
       const values = this.__splitStyleName(style, this.getName(), sep);
       props.forEach((prop, i) => {
         const value = values[i];
-        let res = !isUndefined(value) ? value : prop.getDefaultValue();
+        let res = !isUndefined(value) ? value : ''; // : prop.getDefaultValue();
 
         if (props4Nums) {
           // Try to get value from a shorthand:
@@ -213,7 +219,7 @@ export default Property.extend({
   getValues({ byName } = {}) {
     return this.getProperties().reduce((res, prop) => {
       const key = byName ? prop.getName() : prop.getId();
-      res[key] = `${prop.__getFullValue({ withDefault: 1 })}`;
+      res[key] = `${prop.__getFullValue()}`;
       return res;
     }, {});
   },
diff --git a/test/specs/style_manager/model/Properties.js b/test/specs/style_manager/model/Properties.js
index a89b7d0c1..0d643adbe 100644
--- a/test/specs/style_manager/model/Properties.js
+++ b/test/specs/style_manager/model/Properties.js
@@ -124,10 +124,10 @@ describe('StyleManager properties logic', () => {
           [propCTest]: '33px',
         })
       ).toEqual({
-        [propATest]: '0',
-        [propBTest]: '0',
+        [propATest]: '',
+        [propBTest]: '',
         [propCTest]: '33px',
-        [propDTest]: '0',
+        [propDTest]: '',
       });
 
       // null if no properties are found
@@ -162,6 +162,7 @@ describe('StyleManager properties logic', () => {
         [propCTest]: '3px',
         [propDTest]: '4px',
       });
+
       compTypeProp.set('detached', false);
       expect(compTypeProp.getStyleFromProps()).toEqual({
         [propTest]: '1px 2px 3px 4px',
@@ -170,6 +171,17 @@ describe('StyleManager properties logic', () => {
         [propCTest]: '',
         [propDTest]: '',
       });
+
+      compTypeProp.set('detached', true);
+      rule1.setStyle({ [propATest]: '10px', [propBTest]: '20px' });
+      obj.__upSel();
+      expect(compTypeProp.getStyleFromProps()).toEqual({
+        [propTest]: '',
+        [propATest]: '10px',
+        [propBTest]: '20px',
+        [propCTest]: '',
+        [propDTest]: '',
+      });
     });
 
     test('getStyleFromProps with custom toStyle', () => {