fix: label formatting (ng-select#327)

fixes ng-select#326
jakemdunn · Mar 8, 2018 · 05572a1 · 05572a1
1 parent 463773f
commit 05572a1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/ng-select/items-list.ts b/ng-select/items-list.ts
@@ -1,7 +1,7 @@
 import { NgOption } from './ng-select.types';
 import * as searchHelper from './search-helper';
 import { NgSelectComponent } from './ng-select.component';
-import { isObject } from './utils';
+import { isObject, isDefined } from './utils';
 
 export class ItemsList {
 
@@ -180,7 +180,7 @@ export class ItemsList {
         const label = this.resolveNested(item, this._ngSelect.bindLabel);
         return {
             index: index,
-            label: label || '',
+            label: isDefined(label) ? label.toString() : '',
             value: item,
             disabled: item.disabled,
         };

diff --git a/ng-select/ng-select.component.spec.ts b/ng-select/ng-select.component.spec.ts
@@ -24,6 +24,23 @@ import { MockNgZone, MockNgWindow } from '../testing/mocks';
 
 describe('NgSelectComponent', function () {
 
+    describe('init', () => {
+        it('should map items correctly', fakeAsync(() => {
+            const fixture = createTestingModule(
+                NgSelectSelectedSimpleCmp,
+                `<ng-select [searchable]="false"
+                                [clearable]="false"
+                                [items]="[0, 30, 60, 90, 120, 180, 240]"
+                                [(ngModel)]="selectedCity">
+                    </ng-select>`);
+
+            fixture.componentInstance.selectedCity = 0;
+            tickAndDetectChanges(fixture);
+            expect(fixture.componentInstance.selectedCity).toEqual(0);
+            expect(fixture.componentInstance.select.itemsList.items[0].label).toEqual('0');
+        }));
+    });
+
     describe('Model bindings', () => {
         it('should update ngModel on value change', fakeAsync(() => {
             const fixture = createTestingModule(
@@ -560,7 +577,7 @@ describe('NgSelectComponent', function () {
                     tickAndDetectChanges(fixture);
                     const selected = fixture.componentInstance.select.selectedItems[0];
                     expect(selected.label).toEqual('');
-                    expect(selected.value).toEqual({name: null, id: 2});
+                    expect(selected.value).toEqual({ name: null, id: 2 });
                 }));
             });
 
@@ -616,7 +633,7 @@ describe('NgSelectComponent', function () {
                             bindLabel="name"
                             [(ngModel)]="city">
                 </ng-select>`);
-            
+
             const select = fixture.componentInstance.select;
             select.open();
 
@@ -642,7 +659,7 @@ describe('NgSelectComponent', function () {
                             [virtualScroll]="true"
                             [(ngModel)]="city">
                 </ng-select>`);
-            
+
             const select = fixture.componentInstance.select;
             select.open();