Fix: ListPicker selected index coercing

vakrilov · vakrilov · commit ef7d9155b2d2 · 2017-03-21T16:59:47.000+02:00
diff --git a/tns-core-modules/ui/list-picker/list-picker-common.ts b/tns-core-modules/ui/list-picker/list-picker-common.ts
@@ -46,7 +46,6 @@ export const itemsProperty = new Property<ListPickerBase, any[] | ItemsSource>({
     name: "items", valueChanged: (target, oldValue, newValue) => {
         let getItem = newValue && (<ItemsSource>newValue).getItem;
         target.isItemsSource = typeof getItem === "function";
-        selectedIndexProperty.coerce(target);
     }
 });
 itemsProperty.register(ListPickerBase);
diff --git a/tns-core-modules/ui/list-picker/list-picker.android.ts b/tns-core-modules/ui/list-picker/list-picker.android.ts
@@ -137,6 +137,9 @@ export class ListPicker extends ListPickerBase {
         let maxValue = value && value.length > 0 ? value.length - 1 : 0;
         this.android.setMaxValue(maxValue);
         this._fixNumberPickerRendering();
+
+        // Coerce selected index after we have set items to native view.
+        selectedIndexProperty.coerce(this);
     }
 
     get [colorProperty.native](): { wheelColor: number, textColor: number } {
diff --git a/tns-core-modules/ui/list-picker/list-picker.ios.ts b/tns-core-modules/ui/list-picker/list-picker.ios.ts
@@ -46,6 +46,9 @@ export class ListPicker extends ListPickerBase {
     }
     set [itemsProperty.native](value: any[] | ItemsSource) {
         this.ios.reloadAllComponents();
+
+        // Coerce selected index after we have set items to native view.
+        selectedIndexProperty.coerce(this);
     }
 
     get [backgroundColorProperty.native](): UIColor {

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ export const itemsProperty = new Property<ListPickerBase, any[] \| ItemsSource>({`
`46`	`46`	`name: "items", valueChanged: (target, oldValue, newValue) => {`
`47`	`47`	`let getItem = newValue && (<ItemsSource>newValue).getItem;`
`48`	`48`	`target.isItemsSource = typeof getItem === "function";`
`49`		`- selectedIndexProperty.coerce(target);`
`50`	`49`	`}`
`51`	`50`	`});`
`52`	`51`	`itemsProperty.register(ListPickerBase);`
Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,9 @@ export class ListPicker extends ListPickerBase {`
`137`	`137`	`let maxValue = value && value.length > 0 ? value.length - 1 : 0;`
`138`	`138`	`this.android.setMaxValue(maxValue);`
`139`	`139`	`this._fixNumberPickerRendering();`
	`140`	`+`
	`141`	`+ // Coerce selected index after we have set items to native view.`
	`142`	`+ selectedIndexProperty.coerce(this);`
`140`	`143`	`}`
`141`	`144`
`142`	`145`	`get [colorProperty.native](): { wheelColor: number, textColor: number } {`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,9 @@ export class ListPicker extends ListPickerBase {`
`46`	`46`	`}`
`47`	`47`	`set [itemsProperty.native](value: any[] \| ItemsSource) {`
`48`	`48`	`this.ios.reloadAllComponents();`
	`49`	`+`
	`50`	`+ // Coerce selected index after we have set items to native view.`
	`51`	`+ selectedIndexProperty.coerce(this);`
`49`	`52`	`}`
`50`	`53`
`51`	`54`	`get [backgroundColorProperty.native](): UIColor {`