Skip to content

Fixed binding converter calls. #2299

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

Merged
nsndeck merged 1 commit into from
Jun 14, 2016
Merged

Fixed binding converter calls. #2299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 30 additions & 0 deletions tests/app/ui/bindable-tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,36 @@ export function test_BindingToDictionaryAtAppLevel() {
helper.buildUIAndRunTest(createLabel(), testFunc);
}

export function test_BindingConverterCalledEvenWithNullValue() {
var createLabel = function () {
var label = new labelModule.Label();
return label;
}
var pageViewModel = new observable.Observable();
var testPropertyValue = null;
var expectedValue = "collapsed";
pageViewModel.set("testProperty", testPropertyValue);
appModule.resources["converter"] = function(value) {
if (value) {
return "visible";
} else {
return "collapsed";
}
};

var testFunc = function (views: Array<viewModule.View>) {
var testLabel = <labelModule.Label>(views[0]);
testLabel.bind({ sourceProperty: "testProperty", targetProperty: "text", expression: "testProperty | converter" });

var page = <pageModule.Page>(views[1]);
page.bindingContext = pageViewModel;

TKUnit.assertEqual(testLabel.text, expectedValue);
}

helper.buildUIAndRunTest(createLabel(), testFunc);
}

export function test_UpdatingNestedPropertyViaBinding() {
var expectedValue1 = "Alabala";
var expectedValue2 = "Tralala";
Expand Down
25 changes: 18 additions & 7 deletions tns-core-modules/ui/core/bindable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export class Bindable extends DependencyObservable implements definition.Bindabl
}

// if (!types.isNullOrUndefined(bindingSource)) {
binding.bind(bindingSource);
binding.bind(bindingSource);
// }
}

Expand Down Expand Up @@ -119,7 +119,11 @@ export class Bindable extends DependencyObservable implements definition.Bindabl
if (trace.enabled) {
trace.write(`Binding ${binding.target.get()}.${binding.options.targetProperty} to new context ${newValue}`, trace.categories.Binding);
}
binding.bind(newValue);
if (!types.isNullOrUndefined(newValue)) {
binding.bind(newValue);
} else {
binding.clearBinding();
}
}
});
}
Expand Down Expand Up @@ -222,16 +226,18 @@ export class Binding {

source = this.sourceAsObject(source);

let sourceValue;

if (!types.isNullOrUndefined(source)) {
this.source = new WeakRef(source);
this.sourceOptions = this.resolveOptions(source, this.sourceProperties);

let sourceValue = this.getSourcePropertyValue();
sourceValue = this.getSourcePropertyValue();
this.updateTarget(sourceValue);
this.addPropertyChangeListeners(this.source, this.sourceProperties);
}
else {
this.updateTarget(source);
} else if (!this.sourceIsBindingContext) {
sourceValue = this.getSourcePropertyValue();
this.updateTarget(sourceValue ? sourceValue : source);
}
}

Expand Down Expand Up @@ -489,7 +495,7 @@ export class Binding {
private getSourcePropertyValue() {
if (this.options.expression) {
let changedModel = {};
changedModel[bc.bindingValueKey] = this.source.get();
changedModel[bc.bindingValueKey] = this.source ? this.source.get() : undefined;
let expressionValue = this._getExpressionValue(this.options.expression, false, changedModel);
if (expressionValue instanceof Error) {
trace.write((<Error>expressionValue).message, trace.categories.Binding, trace.messageType.error);
Expand All @@ -516,6 +522,11 @@ export class Binding {
return null;
}

public clearBinding() {
this.clearSource();
this.updateTarget(undefined);
}

private updateTarget(value: any) {
if (this.updating) {
return;
Expand Down