From e577995a20c4a09c8d7bda69116a05db1a2353cc Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Sun, 21 Feb 2021 22:33:23 +0100
Subject: [PATCH] Update frame props

---
 src/canvas/model/Canvas.js   |  9 +++--
 src/canvas/model/Frame.js    | 64 ++++++++++++++----------------------
 src/canvas/view/FrameView.js |  8 ++---
 src/utils/Droppable.js       |  2 +-
 4 files changed, 35 insertions(+), 48 deletions(-)

diff --git a/src/canvas/model/Canvas.js b/src/canvas/model/Canvas.js
index d957748d4..2a2f6113f 100644
--- a/src/canvas/model/Canvas.js
+++ b/src/canvas/model/Canvas.js
@@ -14,11 +14,14 @@ export default Backbone.Model.extend({
   initialize(config = {}) {
     const { em } = config;
     const { styles = [], scripts = [] } = config;
-    const root = em && em.getWrapper();
-    const css = em && em.getStyle();
     const mainPage = em.get('Pages').getMain();
     const frames = mainPage.getFrames();
-    const frame = mainPage.getMainFrame() || frames.add({ root, styles: css });
+    const frame =
+      mainPage.getMainFrame() ||
+      frames.add({
+        components: em.getWrapper(),
+        styles: em.getStyle()
+      });
     styles.forEach(style => frame.addLink(style));
     scripts.forEach(script => frame.addScript(script));
     this.em = em;
diff --git a/src/canvas/model/Frame.js b/src/canvas/model/Frame.js
index 4c3702730..fd8cae1da 100644
--- a/src/canvas/model/Frame.js
+++ b/src/canvas/model/Frame.js
@@ -1,62 +1,46 @@
 import Backbone from 'backbone';
-import Component from 'dom_components/model/Component';
-import CssRules from 'css_composer/model/CssRules';
-import { isString } from 'underscore';
+import Component from 'dom_components/model/ComponentWrapper';
+import { isComponent, isObject } from 'utils/mixins';
 
 export default Backbone.Model.extend({
   defaults: () => ({
+    x: 0,
+    y: 0,
+    attributes: {},
     width: null,
     height: null,
     head: [],
-    x: 0,
-    y: 0,
-    root: 0,
-    components: 0,
-    styles: 0,
-    attributes: {}
+    components: '',
+    styles: ''
   }),
 
   initialize(props, opts = {}) {
     const { config } = opts;
     const { em } = config;
-    const { root, styles, components } = this.attributes;
+    const { styles, components } = this.attributes;
     const conf = em.get('DomComponents').getConfig();
+    const allRules = em.get('CssComposer').getAll();
     this.em = em;
     const modOpts = { em, config: conf, frame: this };
 
-    !root &&
-      this.set(
-        'root',
-        new Component(
-          {
-            type: 'wrapper',
-            components: components || []
-          },
-          modOpts
-        )
-      );
-
-    (!styles || isString(styles)) &&
-      this.set('styles', new CssRules(styles, modOpts));
-  },
+    if (!isComponent(components)) {
+      this.set('components', new Component({ components }, modOpts));
+    }
 
-  /*
-  frames: [
-    {
-        components: '<div id="wrapper">...</div>',
-        styles: '#wrapper{...}, .class{...}',
-    }, {
-        component: 'i123', // get reference on render
-        style: 'rules-id' // get reference on render
-    }, {
-        components: '<div id="wrapper2">...</div>',
-        style: 'rules-id', // get reference on render
+    if (!styles) {
+      this.set('styles', allRules);
+    } else if (!isObject(styles)) {
+      allRules.add(styles);
     }
-]
-  */
-  getComponent() {},
+  },
 
-  getStyle() {},
+  getComponents() {
+    return this.get('components');
+  },
+
+  getStyles() {
+    return this.get('styles');
+  },
 
   disable() {
     this.trigger('disable');
diff --git a/src/canvas/view/FrameView.js b/src/canvas/view/FrameView.js
index 28e8081e7..f8a6e7b91 100644
--- a/src/canvas/view/FrameView.js
+++ b/src/canvas/view/FrameView.js
@@ -252,8 +252,8 @@ export default Backbone.View.extend({
 
   renderBody() {
     const { config, model, ppfx } = this;
-    const root = model.get('root');
-    const styles = model.get('styles');
+    const components = model.getComponents();
+    const styles = model.getStyles();
     const { em } = config;
     const doc = this.getDoc();
     const head = this.getHead();
@@ -355,9 +355,9 @@ export default Backbone.View.extend({
     </style>`
     );
     this.root = new ComponentView({
-      model: root,
+      model: components,
       config: {
-        ...root.config,
+        ...components.config,
         frameView: this
       }
     }).render();
diff --git a/src/utils/Droppable.js b/src/utils/Droppable.js
index d1c5539f2..20bb0209c 100644
--- a/src/utils/Droppable.js
+++ b/src/utils/Droppable.js
@@ -13,7 +13,7 @@ export default class Droppable {
       em
         .get('Canvas')
         .getFrames()
-        .map(frame => frame.get('root').getEl());
+        .map(frame => frame.getComponents().getEl());
     const els = Array.isArray(el) ? el : [el];
     this.el = el;
     this.counter = 0;