Browse Source

Show computed values in stack stypes

pull/2578/head
Artur Arseniev 6 years ago
parent
commit
b2d68e3c98
  1. 11
      src/style_manager/view/PropertyStackView.js
  2. 12
      src/style_manager/view/PropertyView.js

11
src/style_manager/view/PropertyStackView.js

@ -124,7 +124,10 @@ export default PropertyCompositeView.extend({
const style = target ? target.getStyle() : {};
layersObj = layers.getLayersFromStyle(style);
} else {
let value = this.getTargetValue();
let value = this.getTargetValue({ ignoreDefault: 1 });
if (!value) value = this.getComputedValue();
value = value == model.getDefaultValue() ? '' : value;
layersObj = layers.getLayersFromValue(value);
}
@ -153,7 +156,11 @@ export default PropertyCompositeView.extend({
const values = self.getLayers().getPropertyValues(subProp);
view.updateTargetStyle(values, null, opt);
} else {
model.set('value', model.getFullValue(), opt);
// Update only if there is an actual update (to avoid changes for computed styles)
// ps: status is calculated in `targetUpdated` method
if (model.get('status') == 'updated') {
model.set('value', model.getFullValue(), opt);
}
}
}
};

12
src/style_manager/view/PropertyView.js

@ -249,6 +249,16 @@ export default Backbone.View.extend({
status = '';
}
if (property == 'box-shadow' || property == 'transition') {
console.log({
property,
status,
targetValue,
computedValue,
defaultValue
});
}
model.setValue(value, 0, { fromTarget: 1 });
this.setStatus(status);
@ -328,7 +338,7 @@ export default Backbone.View.extend({
const notToSkip = avoid.indexOf(property) < 0;
const value = computed[property];
const valueDef = computedDef[camelCase(property)];
return computed && notToSkip && valueDef !== value && value;
return (computed && notToSkip && valueDef !== value && value) || '';
},
/**

Loading…
Cancel
Save