From e1783f7dbcbd25d3fe92c42dc9fcbd293c0d05dc Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Tue, 8 Jun 2021 14:44:33 +0200
Subject: [PATCH] Improve loading style function

---
 src/canvas/model/Frame.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/canvas/model/Frame.js b/src/canvas/model/Frame.js
index 36eadfa0e..42ed6098e 100644
--- a/src/canvas/model/Frame.js
+++ b/src/canvas/model/Frame.js
@@ -1,5 +1,5 @@
 import { Model } from 'backbone';
-import { result, forEach, isEmpty, debounce } from 'underscore';
+import { result, forEach, isEmpty, debounce, isString } from 'underscore';
 import { isComponent, isObject } from 'utils/mixins';
 
 const keyAutoW = '__aw';
@@ -51,10 +51,16 @@ export default Model.extend({
             const idSel = sSel.name && sSel.type === 2 && sSel;
             if (idSel && idMap[idSel.name]) {
               idSel.name = idMap[idSel.name];
+            } else if (isString(sSel) && sSel[0] === '#') {
+              const prevId = sSel.substring(1);
+              if (prevId && idMap[prevId]) {
+                sel[0] = `#${idMap[prevId]}`;
+              }
             }
           }
         });
       }
+
       allRules.add(styles);
       this.set('styles', allRules);
     }