From 717fa234bd6c7d4ab1c8a425c8a7b778ff65307f Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Sun, 12 Nov 2017 12:48:09 +0100
Subject: [PATCH] Pass options in setIdStyle

---
 src/css_composer/index.js                | 2 +-
 src/dom_components/view/ComponentView.js | 5 +++--
 src/domain_abstract/model/Styleable.js   | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/css_composer/index.js b/src/css_composer/index.js
index 9ce542156..e66f18bda 100644
--- a/src/css_composer/index.js
+++ b/src/css_composer/index.js
@@ -286,7 +286,7 @@ module.exports = () => {
         const sm = em.get('SelectorManager');
         const selector = sm.add({ name, type: Selector.TYPE_ID });
         const rule = this.add(selector, state, media);
-        rule.setStyle(style);
+        rule.setStyle(style, opts);
         return rule;
       },
 
diff --git a/src/dom_components/view/ComponentView.js b/src/dom_components/view/ComponentView.js
index b37588ed0..2b92939f3 100644
--- a/src/dom_components/view/ComponentView.js
+++ b/src/dom_components/view/ComponentView.js
@@ -144,12 +144,13 @@ module.exports = Backbone.View.extend({
    * Update style attribute
    * @private
    * */
-  updateStyle() {
+  updateStyle(mod, val, opts = {}) {
     const em = this.em;
     const model = this.model;
     const style = model.getStyle();
     const state = model.get('state');
-    em.get('CssComposer').setIdStyle(model.getId(), style, { state });
+    const cc = em.get('CssComposer');
+    cc.setIdStyle(model.getId(), style, { ...opts, state });
   },
 
 
diff --git a/src/domain_abstract/model/Styleable.js b/src/domain_abstract/model/Styleable.js
index 83223f206..4a228f68a 100644
--- a/src/domain_abstract/model/Styleable.js
+++ b/src/domain_abstract/model/Styleable.js
@@ -11,7 +11,7 @@ export default {
    * @return {Object}
    */
   extendStyle(prop) {
-    return Object.assign({}, this.getStyle(), prop);
+    return { ...this.getStyle(), ...prop};
   },
 
   /**
@@ -19,7 +19,7 @@ export default {
    * @return {Object}
    */
   getStyle() {
-    return Object.assign({}, this.get('style'));
+    return { ...this.get('style') };
   },
 
   /**
@@ -32,7 +32,7 @@ export default {
       prop = parseStyle(prop);
     }
 
-    this.set('style', Object.assign({}, prop), opts);
+    this.set('style', { ...prop }, opts);
 
     for (let pr in prop) {
       this.trigger(`change:style:${pr}`);