fix: remove default compareWith

ng-select · Mar 30, 2018 · ec56c64 · ec56c64
1 parent e9e6652
commit ec56c64
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/src/ng-select/items-list.ts b/src/ng-select/items-list.ts
@@ -69,13 +69,14 @@ export class ItemsList {
 
     findItem(value: any): NgOption {
         if (this._ngSelect.bindValue) {
-            return this._items.find(item => !item.hasChildren &&
-                this._ngSelect.compareWith(this.resolveNested(item.value, this._ngSelect.bindValue), value));
+            return this._items.find(item => !item.hasChildren && this.resolveNested(item.value, this._ngSelect.bindValue) === value);
         }
-        const index = this._items.findIndex(x => this._ngSelect.compareWith(x.value, value));
-        return index > -1 ?
-            this._items[index] :
-            this._items.find(item => !item.hasChildren && item.label && item.label === this.resolveNested(value, this._ngSelect.bindLabel));
+        const option = this._items.find(x => x.value === value);
+        const findBy = this._ngSelect.compareWith ?
+            (item: NgOption) => this._ngSelect.compareWith(item.value, value) :
+            (item: NgOption) => !item.hasChildren && item.label && item.label === this.resolveNested(value, this._ngSelect.bindLabel);
+
+        return option || this._items.find(item => findBy(item));
     }
 
     unselect(item: NgOption) {

diff --git a/src/ng-select/ng-select.component.spec.ts b/src/ng-select/ng-select.component.spec.ts
@@ -187,7 +187,7 @@ describe('NgSelectComponent', function () {
             expect(vilnius.selected).toBeTruthy();
         }));
 
-        it('should set items correctly after ngModel set first when typeahead and multiselect is used', fakeAsync(() => {
+        it('should set items correctly after ngModel set first when typeahead and multi-select is used', fakeAsync(() => {
             const fixture = createTestingModule(
                 NgSelectTestCmp,
                 `<ng-select [items]="cities"
@@ -2367,7 +2367,9 @@ class NgSelectTestCmp {
         });
     }
 
-    compareWith = (a, b) => a.name === b.name && a.district === b.district;
+    compareWith(a, b) {
+        return a.name === b.name && a.district === b.district
+    }
 
     toggleVisible() {
         this.visible = !this.visible;

diff --git a/src/ng-select/ng-select.component.ts b/src/ng-select/ng-select.component.ts
@@ -147,9 +147,9 @@ export class NgSelectComponent implements OnDestroy, OnChanges, AfterViewInit, C
     private _defaultValue = 'value';
     private _typeaheadLoading = false;
     private _primitive: boolean;
+    private _compareWith: CompareWithFn;
 
     private readonly _destroy$ = new Subject<void>();
-    private _compareWith = (a: any, b: any) => a === b;
     private _onChange = (_: NgOption) => { };
     private _onTouched = () => { };