From 93cc67bcadee337f4ed7c52bedc4e2ef1094279c Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Thu, 10 Feb 2022 13:19:55 +0100
Subject: [PATCH] Fix sector and property visibility update in Style Manager.
 Closes #4116

---
 src/style_manager/index.js | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/style_manager/index.js b/src/style_manager/index.js
index 4d9e80235..6fe3ad13f 100644
--- a/src/style_manager/index.js
+++ b/src/style_manager/index.js
@@ -362,17 +362,6 @@ export default () => {
       const lastTargetParents = this.getParentRules(lastTarget, { state, component });
       let stateTarget = this.__getStateTarget();
 
-      // Update sectors/properties visibility
-      sectors.forEach(sector => {
-        const props = sector.getProperties();
-        props.forEach(prop => {
-          const isVisible = prop.__checkVisibility({ target: lastTarget, component, sectors });
-          prop.set('visible', isVisible);
-        });
-        const sectorVisible = props.some(p => p.isVisible());
-        sector.set('visible', sectorVisible);
-      });
-
       // Handle the creation and update of the state rule, if enabled.
       em.skip(() => {
         if (state && lastTarget?.getState?.()) {
@@ -388,7 +377,7 @@ export default () => {
         }
       });
 
-      this.model.set({ targets, lastTarget, lastTargetParents, stateTarget });
+      this.model.set({ targets, lastTarget, lastTargetParents, stateTarget, component });
       this.__upProps(opts);
 
       return targets;
@@ -672,6 +661,7 @@ export default () => {
       const lastTarget = this.getSelected();
       if (!lastTarget) return;
 
+      const component = this.model.get('component');
       const lastTargetParents = this.getSelectedParents();
       const style = lastTarget.getStyle();
       const parentStyles = lastTargetParents.map(p => ({
@@ -684,6 +674,17 @@ export default () => {
           this.__upProp(prop, style, parentStyles, opts);
         });
       });
+
+      // Update sectors/properties visibility
+      sectors.forEach(sector => {
+        const props = sector.getProperties();
+        props.forEach(prop => {
+          const isVisible = prop.__checkVisibility({ target: lastTarget, component, sectors });
+          prop.set('visible', isVisible);
+        });
+        const sectorVisible = props.some(p => p.isVisible());
+        sector.set('visible', sectorVisible);
+      });
     },
 
     __upProp(prop, style, parentStyles, opts) {