Skip to content

feat: bind overridden value converters to the target #11018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
triniwiz wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: bind overridden value converters to the target #11018

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f890938
feat: bind overridden value converters to the target
triniwiz Dec 30, 2025
59e3dee
fix: use style instance
triniwiz Jan 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions packages/core/ui/core/properties/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ export class Property<T extends ViewBase, U> implements TypedPropertyDescriptor<
let affectsLayout: boolean = options.affectsLayout;
let valueChanged = options.valueChanged;
let valueConverter = options.valueConverter;
let overrideConverter = false;

this.overrideHandlers = function (options: PropertyOptions<T, U>) {
if (typeof options.equalityComparer !== 'undefined') {
Expand All @@ -213,6 +214,7 @@ export class Property<T extends ViewBase, U> implements TypedPropertyDescriptor<
}
if (typeof options.valueConverter !== 'undefined') {
valueConverter = options.valueConverter;
overrideConverter = true;
}
};

Expand All @@ -229,7 +231,7 @@ export class Property<T extends ViewBase, U> implements TypedPropertyDescriptor<
value = wrapped ? WrappedValue.unwrap(boxedValue) : boxedValue;

if (valueConverter && typeof value === 'string') {
value = valueConverter(value);
value = overrideConverter ? valueConverter.call(this, value) : valueConverter(value);
}
}

Expand Down Expand Up @@ -372,7 +374,7 @@ export class CoercibleProperty<T extends ViewBase, U> extends Property<T, U> imp
let valueChanged = options.valueChanged;
let valueConverter = options.valueConverter;
let coerceCallback = options.coerceValue;

let overrideConverter = false;
const property = this;

this.overrideHandlers = function (options: CoerciblePropertyOptions<T, U>) {
Expand All @@ -387,6 +389,7 @@ export class CoercibleProperty<T extends ViewBase, U> extends Property<T, U> imp
}
if (typeof options.valueConverter !== 'undefined') {
valueConverter = options.valueConverter;
overrideConverter = true;
}
if (typeof options.coerceValue !== 'undefined') {
coerceCallback = options.coerceValue;
Expand All @@ -411,7 +414,7 @@ export class CoercibleProperty<T extends ViewBase, U> extends Property<T, U> imp
value = wrapped ? WrappedValue.unwrap(boxedValue) : boxedValue;

if (valueConverter && typeof value === 'string') {
value = valueConverter(value);
value = overrideConverter ? valueConverter.call(this, value) : valueConverter(value);
}

this[coerceKey] = value;
Expand Down Expand Up @@ -615,6 +618,7 @@ export class CssProperty<T extends Style, U> {
let equalityComparer = options.equalityComparer;
let valueChanged = options.valueChanged;
let valueConverter = options.valueConverter;
let overrideConverter = false;

this.overrideHandlers = function (options: CssPropertyOptions<T, U>) {
if (typeof options.equalityComparer !== 'undefined') {
Expand All @@ -628,6 +632,7 @@ export class CssProperty<T extends Style, U> {
}
if (typeof options.valueConverter !== 'undefined') {
valueConverter = options.valueConverter;
overrideConverter = true;
}
};

Expand All @@ -649,7 +654,7 @@ export class CssProperty<T extends Style, U> {
delete this[sourceKey];
} else {
this[sourceKey] = ValueSource.Local;
value = valueConverter && typeof newValue === 'string' ? valueConverter(newValue) : <U>newValue;
value = valueConverter && typeof newValue === 'string' ? (overrideConverter ? valueConverter.call(this, newValue) : valueConverter(newValue)) : <U>newValue;
}

const oldValue = <U>(key in this ? this[key] : defaultValue);
Expand Down Expand Up @@ -732,7 +737,7 @@ export class CssProperty<T extends Style, U> {
value = defaultValue;
delete this[sourceKey];
} else {
value = valueConverter && typeof newValue === 'string' ? valueConverter(newValue) : <U>newValue;
value = valueConverter && typeof newValue === 'string' ? (overrideConverter ? valueConverter.call(this, newValue) : valueConverter(newValue)) : <U>newValue;
this[sourceKey] = ValueSource.Css;
}

Expand Down Expand Up @@ -943,7 +948,7 @@ export class CssAnimationProperty<T extends Style, U> implements CssAnimationPro
}
} else {
if (options.valueConverter && typeof boxedValue === 'string') {
boxedValue = options.valueConverter(boxedValue);
boxedValue = options.valueConverter.call(this, boxedValue);
}
this[symbol] = boxedValue;
if (this[computedSource] <= propertySource) {
Expand Down Expand Up @@ -1071,6 +1076,7 @@ export class InheritedCssProperty<T extends Style, U> extends CssProperty<T, U>
let equalityComparer = options.equalityComparer;
let valueChanged = options.valueChanged;
let valueConverter = options.valueConverter;
let overrideConverter = false;

const property = this;

Expand All @@ -1086,6 +1092,7 @@ export class InheritedCssProperty<T extends Style, U> extends CssProperty<T, U>
}
if (typeof options.valueConverter !== 'undefined') {
valueConverter = options.valueConverter;
overrideConverter = true;
}
};

Expand Down Expand Up @@ -1132,7 +1139,7 @@ export class InheritedCssProperty<T extends Style, U> extends CssProperty<T, U>
} else {
this[sourceKey] = valueSource;
if (valueConverter && typeof boxedValue === 'string') {
value = valueConverter(boxedValue);
value = overrideConverter ? valueConverter.call(this, boxedValue) : valueConverter(boxedValue);
} else {
value = boxedValue;
}
Expand Down