fix: don't fire change event for same selection

fixes #664
ng-select · Jul 9, 2018 · 8ed435c · 8ed435c
1 parent cbfd948
commit 8ed435c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/src/ng-select/ng-select.component.spec.ts b/src/ng-select/ng-select.component.spec.ts
@@ -2423,10 +2423,11 @@ describe('NgSelectComponent', function () {
 
             spyOn(fixture.componentInstance, 'onChange');
 
-            fixture.componentInstance.selectedCity = fixture.componentInstance.cities[0];
-            tickAndDetectChanges(fixture);
+            triggerKeyDownEvent(getNgSelectElement(fixture), KeyCode.Space);
+            triggerKeyDownEvent(getNgSelectElement(fixture), KeyCode.Enter);
 
-            fixture.componentInstance.select.select(fixture.componentInstance.cities[0]);
+            triggerKeyDownEvent(getNgSelectElement(fixture), KeyCode.Space);
+            triggerKeyDownEvent(getNgSelectElement(fixture), KeyCode.Enter);
 
             expect(fixture.componentInstance.onChange).toHaveBeenCalledTimes(1);
         }));

diff --git a/src/ng-select/ng-select.component.ts b/src/ng-select/ng-select.component.ts
@@ -372,20 +372,21 @@ export class NgSelectComponent implements OnDestroy, OnChanges, AfterViewInit, C
     }
 
     select(item: NgOption) {
-        this.itemsList.select(item);
-        if (this.clearSearchOnAdd) {
-            this._clearSearch();
-        }
+        if (!item.selected) {
+            this.itemsList.select(item);
+            if (this.clearSearchOnAdd) {
+                this._clearSearch();
+            }
 
-        if (this.multiple) {
-            this.addEvent.emit(item.value);
+            if (this.multiple) {
+                this.addEvent.emit(item.value);
+            }
+            this._updateNgModel();
         }
 
         if (this.closeOnSelect || this.itemsList.noItemsToSelect) {
             this.close();
         }
-
-        this._updateNgModel();
     }
 
     focus() {
@@ -586,9 +587,7 @@ export class NgSelectComponent implements OnDestroy, OnChanges, AfterViewInit, C
         };
 
         if (this.multiple) {
-            (<any[]>ngModel).forEach(item => {
-                select(item);
-            });
+            (<any[]>ngModel).forEach(item => select(item));
         } else {
             select(ngModel);
         }