Browse Source

Fix extendStyle with dataSources (#6220)

pull/6229/head
Artur Arseniev 2 years ago
committed by GitHub
parent
commit
f83ee42f17
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 8
      packages/core/src/domain_abstract/model/StyleableModel.ts

8
packages/core/src/domain_abstract/model/StyleableModel.ts

@ -62,21 +62,23 @@ export default class StyleableModel<T extends ObjectHash = any> extends Model<T>
* @return {Object} * @return {Object}
*/ */
extendStyle(prop: ObjectAny): ObjectAny { extendStyle(prop: ObjectAny): ObjectAny {
return { ...this.getStyle(), ...prop }; return { ...this.getStyle('', { skipResolve: true }), ...prop };
} }
/** /**
* Get style object * Get style object
* @return {Object} * @return {Object}
*/ */
getStyle(prop?: string | ObjectAny): StyleProps { getStyle(prop?: string | ObjectAny, opts: { skipResolve?: boolean } = {}): StyleProps {
const style = this.get('style') || {}; const style = this.get('style') || {};
const result: ObjectAny = { ...style }; const result: ObjectAny = { ...style };
if (this.em) {
if (this.em && !opts.skipResolve) {
const resolvedStyle = this.resolveDataVariables({ ...result }); const resolvedStyle = this.resolveDataVariables({ ...result });
// @ts-ignore // @ts-ignore
return prop && isString(prop) ? resolvedStyle[prop] : resolvedStyle; return prop && isString(prop) ? resolvedStyle[prop] : resolvedStyle;
} }
return prop && isString(prop) ? result[prop] : result; return prop && isString(prop) ? result[prop] : result;
} }

Loading…
Cancel
Save