diff --git a/packages/core/src/domain_abstract/model/StyleableModel.ts b/packages/core/src/domain_abstract/model/StyleableModel.ts index 684450919..dd3124050 100644 --- a/packages/core/src/domain_abstract/model/StyleableModel.ts +++ b/packages/core/src/domain_abstract/model/StyleableModel.ts @@ -62,21 +62,23 @@ export default class StyleableModel extends Model * @return {Object} */ extendStyle(prop: ObjectAny): ObjectAny { - return { ...this.getStyle(), ...prop }; + return { ...this.getStyle('', { skipResolve: true }), ...prop }; } /** * Get style object * @return {Object} */ - getStyle(prop?: string | ObjectAny): StyleProps { + getStyle(prop?: string | ObjectAny, opts: { skipResolve?: boolean } = {}): StyleProps { const style = this.get('style') || {}; const result: ObjectAny = { ...style }; - if (this.em) { + + if (this.em && !opts.skipResolve) { const resolvedStyle = this.resolveDataVariables({ ...result }); // @ts-ignore return prop && isString(prop) ? resolvedStyle[prop] : resolvedStyle; } + return prop && isString(prop) ? result[prop] : result; }