From b538f5a4c83417c613b365ce548d864bd8755e56 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Fri, 25 Mar 2022 13:33:43 +0100
Subject: [PATCH] Fix issues with the state rule. Closes #4208

---
 src/css_composer/model/CssRule.js  |  2 ++
 src/css_composer/model/CssRules.js |  4 ++--
 src/style_manager/index.js         | 17 +++++++++++++++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/css_composer/model/CssRule.js b/src/css_composer/model/CssRule.js
index 0ec25000b..72301873f 100644
--- a/src/css_composer/model/CssRule.js
+++ b/src/css_composer/model/CssRule.js
@@ -36,6 +36,8 @@ export default class CssRule extends Model.extend(Styleable) {
       singleAtRule: false,
       important: false,
       group: '',
+      // If true, won't be stored in JSON or showed in CSS
+      shallow: false,
       _undo: true,
     };
   }
diff --git a/src/css_composer/model/CssRules.js b/src/css_composer/model/CssRules.js
index 1a7660a07..1042aac2b 100644
--- a/src/css_composer/model/CssRules.js
+++ b/src/css_composer/model/CssRules.js
@@ -19,7 +19,7 @@ export default Collection.extend({
 
   toJSON(opts) {
     const result = Collection.prototype.toJSON.call(this, opts);
-    return result.filter(i => i.style);
+    return result.filter(rule => rule.style && !rule.shallow);
   },
 
   onAdd(model, c, o) {
@@ -38,5 +38,5 @@ export default Collection.extend({
     }
     opt.em = this.editor;
     return Collection.prototype.add.apply(this, [models, opt]);
-  }
+  },
 });
diff --git a/src/style_manager/index.js b/src/style_manager/index.js
index b64d1dbb2..1da1d7ffb 100644
--- a/src/style_manager/index.js
+++ b/src/style_manager/index.js
@@ -63,7 +63,7 @@
  * @module StyleManager
  */
 
-import { isElement, isUndefined, isArray, isString, debounce } from 'underscore';
+import { isUndefined, isArray, isString, debounce, bindAll } from 'underscore';
 import { isComponent } from 'utils/mixins';
 import Module from 'common/module';
 import { Model } from 'common';
@@ -127,6 +127,7 @@ export default () => {
      * @private
      */
     init(config = {}) {
+      bindAll(this, '__clearStateTarget');
       this.__initConfig(defaults, config);
       const c = this.config;
       const { em } = c;
@@ -145,6 +146,8 @@ export default () => {
       const ev = 'component:toggled component:update:classes change:state change:device frame:resized selector:type';
       const upAll = debounce(() => this.__upSel());
       model.listenTo(em, ev, upAll);
+      // Clear state target on any component selection change, without debounce (#4208)
+      model.listenTo(em, 'component:toggled', this.__clearStateTarget);
 
       // Triggers only for properties (avoid selection refresh)
       const upProps = debounce(() => {
@@ -176,6 +179,16 @@ export default () => {
       this.em.trigger(event, ...data);
     },
 
+    __clearStateTarget() {
+      const { em } = this;
+      const stateTarget = this.__getStateTarget();
+      stateTarget &&
+        em?.skip(() => {
+          em.get('CssComposer').remove(stateTarget);
+          this.model.set({ stateTarget: null });
+        });
+    },
+
     onLoad() {
       // Use silent as sectors' view will be created and rendered on StyleManager.render
       sectors.add(this.config.sectors, { silent: true });
@@ -367,7 +380,7 @@ export default () => {
         if (state && lastTarget?.getState?.()) {
           const style = lastTarget.getStyle();
           if (!stateTarget) {
-            stateTarget = cssc.getAll().add({ selectors: 'gjs-selected', style, important: true });
+            stateTarget = cssc.getAll().add({ selectors: 'gjs-selected', style, shallow: true, important: true });
           } else {
             stateTarget.setStyle(style);
           }