Browse Source

Update __upTargetsStyle

up-style-manager
Artur Arseniev 4 years ago
parent
commit
642cde6454
  1. 10
      src/style_manager/model/PropertyComposite.js

10
src/style_manager/model/PropertyComposite.js

@ -44,7 +44,11 @@ export default Property.extend({
if (!this.__hasCustom() || opts.__up || opts.__clearIn) return; if (!this.__hasCustom() || opts.__up || opts.__clearIn) return;
if (this.isDetached()) { if (this.isDetached()) {
this.__upTargetsStyle({ [prop.getName()]: prop.__getFullValue() }, opts); const style = this.getProperties().reduce((acc, prop) => {
acc[prop.getName()] = prop.hasValue({ noParent: true }) ? prop.__getFullValue() : '';
return acc;
}, {});
this.__upTargetsStyle({ ...style, [prop.getName()]: prop.__getFullValue() }, opts);
} else { } else {
const { __clear, ...rest } = opts; const { __clear, ...rest } = opts;
this.upValue(this.__getFullValue(), rest); this.upValue(this.__getFullValue(), rest);
@ -60,7 +64,9 @@ export default Property.extend({
newStyle = toStyle(values, { ...opts, style }); newStyle = toStyle(values, { ...opts, style });
} }
if (!this.isDetached()) { if (this.isDetached()) {
newStyle[this.getName()] = '';
} else {
this.getProperties().map(prop => { this.getProperties().map(prop => {
newStyle[prop.getName()] = ''; newStyle[prop.getName()] = '';
}); });

Loading…
Cancel
Save