From 6b2de1dfb383bd1e30ba8c169ce3053cd2e0b2fe Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Mon, 13 Dec 2021 12:00:43 +0100
Subject: [PATCH] Update layers parser

---
 src/style_manager/model/PropertyStack.js     | 13 +++-
 test/specs/style_manager/model/Properties.js | 62 +++++++++++++++++---
 2 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/src/style_manager/model/PropertyStack.js b/src/style_manager/model/PropertyStack.js
index f8eff73f7..89057440e 100644
--- a/src/style_manager/model/PropertyStack.js
+++ b/src/style_manager/model/PropertyStack.js
@@ -112,7 +112,14 @@ export default Property.extend({
   __parseLayer(value) {
     const parseFn = this.get('parseLayer');
     const values = value.split(PARTS_REG);
-    return parseFn ? parseFn({ value, values }) : values;
+    const properties = this.getProperties();
+    return parseFn
+      ? parseFn({ value, values })
+      : properties.reduce((acc, prop, i) => {
+          const value = values[i];
+          acc[prop.getId()] = !isUndefined(value) ? value : prop.getDefaultValue();
+          return acc;
+        }, {});
   },
 
   __getFromStyle(style = {}) {
@@ -214,6 +221,10 @@ export default Property.extend({
     return this.get('layers');
   },
 
+  getLayer(index = 0) {
+    return this.getLayers().at(index);
+  },
+
   getCurrentLayer() {
     return this.getLayers().filter(layer => layer.get('active'))[0];
   },
diff --git a/test/specs/style_manager/model/Properties.js b/test/specs/style_manager/model/Properties.js
index 2985628de..87772eeda 100644
--- a/test/specs/style_manager/model/Properties.js
+++ b/test/specs/style_manager/model/Properties.js
@@ -10,6 +10,7 @@ describe('StyleManager properties logic', () => {
   let cmp;
   let rule1;
   let rule2;
+  const sectorTest = 'sector-test';
 
   beforeEach(() => {
     em = new Editor({
@@ -24,12 +25,6 @@ describe('StyleManager properties logic', () => {
     obj = em.get('StyleManager');
     em.get('PageManager').onLoad();
     cmp = domc.addComponent(`<div class="cls"></div>`);
-    [rule1, rule2] = cssc.addRules(`
-        .cls { color: red; }
-        @media (max-width: 992px) {
-            .cls { color: blue; }
-        }
-    `);
   });
 
   afterEach(() => {
@@ -38,13 +33,13 @@ describe('StyleManager properties logic', () => {
   });
 
   describe('Composite type', () => {
-    const sectorTest = 'sector-test';
     const propTest = 'padding';
     const propInTest = 'padding-top';
     let compTypeProp;
     let compTypePropInn;
 
     beforeEach(() => {
+      rule1 = cssc.addRules(`.cls { color: red; }`)[0];
       obj.addSector(sectorTest, {
         properties: [
           {
@@ -92,4 +87,57 @@ describe('StyleManager properties logic', () => {
       });
     });
   });
+
+  describe('Stack type (not detached)', () => {
+    const propTest = 'stack-prop';
+    const propATest = `${propTest}-a`;
+    const propBTest = `${propTest}-b`;
+    const propCTest = `${propTest}-c`;
+    let compTypeProp;
+    let compTypePropInn;
+
+    beforeEach(() => {
+      rule1 = cssc.addRules(`
+        .cls {
+            ${propTest}: valueA-1 valueB-1 valueC-1, valueA-2 valueB-2 valueC-2;
+        }
+      `)[0];
+      obj.addSector(sectorTest, {
+        properties: [
+          {
+            type: 'stack',
+            property: propTest,
+            properties: [{ property: propATest }, { property: propBTest }, { property: propCTest }],
+          },
+        ],
+      });
+      compTypeProp = obj.getProperty(sectorTest, propTest);
+      compTypePropInn = compTypeProp.getProperty(propATest);
+      em.setSelected(cmp);
+      obj.__upSel();
+    });
+
+    test('Property exists', () => {
+      expect(compTypeProp).toBeTruthy();
+      expect(compTypePropInn).toBeTruthy();
+      expect(compTypeProp.getProperties().length).toBe(3);
+    });
+
+    test('Has the right number of layers', () => {
+      expect(compTypeProp.getLayers().length).toBe(2);
+    });
+
+    test('Layers has the right values', () => {
+      expect(compTypeProp.getLayer(0).getValues()).toEqual({
+        [propATest]: 'valueA-1',
+        [propBTest]: 'valueB-1',
+        [propCTest]: 'valueC-1',
+      });
+      expect(compTypeProp.getLayer(1).getValues()).toEqual({
+        [propATest]: 'valueA-2',
+        [propBTest]: 'valueB-2',
+        [propCTest]: 'valueC-2',
+      });
+    });
+  });
 });