From b0033b4e1f8f2adc6582a081d01dbf4fca77dc6c Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Tue, 21 Dec 2021 14:53:45 +0100 Subject: [PATCH] Propagate nested composite types --- src/style_manager/model/PropertyComposite.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/style_manager/model/PropertyComposite.js b/src/style_manager/model/PropertyComposite.js index fe568aad9..b08a4d542 100644 --- a/src/style_manager/model/PropertyComposite.js +++ b/src/style_manager/model/PropertyComposite.js @@ -42,13 +42,17 @@ export default Property.extend({ __upProperties(p, opts = {}) { if (!this.__hasCustom() || opts.__up || opts.__clearIn) return; - this.__upTargetsStyleProps(p, opts); + + const parentProp = this.__getParentProp(); + if (parentProp) return parentProp.__upProperties(this, opts); + + this.__upTargetsStyleProps(opts, p); }, - __upTargetsStyleProps(prop, opts = {}) { + __upTargetsStyleProps(opts = {}, prop) { let style = this.getStyleFromProps(); - if (this.isDetached()) { + if (this.isDetached() && prop) { const name = prop.getName(); style = { [name]: style[name] }; }