From 8e4fba774ea5f3443e52647f46e69c44bc938dc3 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Thu, 18 Nov 2021 11:35:30 +0100
Subject: [PATCH] Update getParentRules in StyleManager

---
 src/css_composer/model/CssRule.js |  6 ++++--
 src/style_manager/index.js        | 22 ++++++++++++++++++----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/css_composer/model/CssRule.js b/src/css_composer/model/CssRule.js
index f3847273c..b0e9f6fb3 100644
--- a/src/css_composer/model/CssRule.js
+++ b/src/css_composer/model/CssRule.js
@@ -147,7 +147,7 @@ export default class CssRule extends Model.extend(Styleable) {
     const style = this.styleToString(opts);
     const singleAtRule = this.get('singleAtRule');
 
-    if ((selectors || singleAtRule) && style) {
+    if ((selectors || singleAtRule) && (style || opts.allowEmpty)) {
       result = singleAtRule ? style : `${selectors}{${style}}`;
     }
 
@@ -218,7 +218,9 @@ export default class CssRule extends Model.extend(Styleable) {
     let result = '';
     const atRule = this.getAtRule();
     const block = this.getDeclaration(opts);
-    block && (result = block);
+    if (block || opts.allowEmpty) {
+      result = block;
+    }
 
     if (atRule && result) {
       result = `${atRule}{${result}}`;
diff --git a/src/style_manager/index.js b/src/style_manager/index.js
index 08a1d8400..9571deafb 100644
--- a/src/style_manager/index.js
+++ b/src/style_manager/index.js
@@ -363,13 +363,27 @@ export default () => {
       if (em && target) {
         const cssC = em.get('CssComposer');
         const cssGen = em.get('CodeManager').getGenerator('css');
-        const cmp = target.toHTML ? true : target.getComponent();
-        console.log({ cmp });
-        const all = cssC
-          .getRules(target.getSelectors().getFullString())
+        const cmp = target.toHTML ? target : target.getComponent();
+        const sel = em.getSelected();
+        let cmpRules = [];
+        let otherRules = [];
+
+        // Componente related rule
+        if (cmp) {
+          cmpRules = cssC.getRules(`#${cmp.getId()}`);
+          otherRules = cssC.getRules(sel.getSelectors().getFullString());
+        } else {
+          cmpRules = cssC.getRules(`#${sel.getId()}`);
+          otherRules = cssC.getRules(target.getSelectors().getFullString());
+        }
+
+        const all = otherRules
+          .concat(cmpRules)
           .filter(rule => (state ? rule.get('state') === state : 1))
           .sort(cssGen.sortRules)
           .reverse();
+
+        // Slice removes rules not related to the current device
         result = all.slice(all.indexOf(target) + 1);
       }