Skip to content

Commit 05c226c

Browse files
Ivan KitanovIvan Kitanov
authored andcommitted
chore(combo): Updating changelog and removing unnecessary code
1 parent b9be829 commit 05c226c

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

CHANGELOG.md

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
All notable changes for each version of this project will be documented in this file.
44

5+
## 20.0.5
6+
### General
7+
- `IgxSimpleCombo`
8+
- Added `disableFiltering` to the `IgxSimpleCombo`, which enables/disables the filtering in the list. The default is `false`. With this introduction, `filteringOptions.filterable` is no longer usde.
9+
- `IgxCombo`, `IgxSimpleCombo`
10+
- Removed deprecated `filteringOptions.filterable` option.
11+
512
## 20.0.2
613

714
### New Features
@@ -41,12 +48,14 @@ All notable changes for each version of this project will be documented in this
4148
</igx-grid>
4249
```
4350

44-
## 19.2.0
45-
46-
### New Features
51+
## 19.2.14
52+
### General
4753
- `IgxSimpleCombo`
48-
- Added `disableFiltering` to the `IgxSimpleCombo`, which enables/disables the filtering in the list. The default is `false`.
54+
- Added `disableFiltering` to the `IgxSimpleCombo`, which enables/disables the filtering in the list. The default is `false`. With this introduction, `filteringOptions.filterable` is no longer usde.
55+
- `IgxCombo`, `IgxSimpleCombo`
56+
- Removed deprecated `filteringOptions.filterable` option.
4957

58+
## 19.2.0
5059
### General
5160
- `IgxCarousel`
5261
- Removed deprecated property `keyboardSupport`.

projects/igniteui-angular/src/lib/simple-combo/simple-combo.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1234,7 +1234,6 @@ describe('IgxSimpleCombo', () => {
12341234
combo.disableFiltering = true;
12351235
fixture.detectChanges();
12361236
combo.focusSearchInput();
1237-
expect(combo.filteredData.length).toEqual(combo.data.length);
12381237

12391238
UIInteractions.simulateTyping('con', input);
12401239
expect(combo.comboInput.value).toEqual('con');
@@ -1247,7 +1246,8 @@ describe('IgxSimpleCombo', () => {
12471246
combo.disableFiltering = false;
12481247
fixture.detectChanges();
12491248
combo.focusSearchInput();
1250-
expect(combo.filteredData.length).toEqual(combo.data.length);
1249+
combo.comboInput.value = '';
1250+
fixture.detectChanges();
12511251
UIInteractions.simulateTyping('con', input);
12521252
expect(combo.comboInput.value).toEqual('con');
12531253
fixture.detectChanges();

projects/igniteui-angular/src/lib/simple-combo/simple-combo.component.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import { NgTemplateOutlet } from '@angular/common';
22
import {
33
AfterViewInit, ChangeDetectorRef, Component, DoCheck, ElementRef, EventEmitter, HostListener, Inject, Injector,
4-
Optional, Output, ViewChild, DOCUMENT,
5-
Input,
6-
booleanAttribute
4+
Optional, Output, ViewChild, DOCUMENT
75
} from '@angular/core';
86
import { ControlValueAccessor, FormGroupDirective, NG_VALUE_ACCESSOR } from '@angular/forms';
97
import { takeUntil } from 'rxjs/operators';
@@ -118,7 +116,7 @@ export class IgxSimpleComboComponent extends IgxComboBaseDirective implements Co
118116

119117
/** @hidden @internal */
120118
public get filteredData(): any[] | null {
121-
return this.disableFiltering ? this.data : this._filteredData;
119+
return this._filteredData;
122120
}
123121
/** @hidden @internal */
124122
public set filteredData(val: any[] | null) {
@@ -292,9 +290,6 @@ export class IgxSimpleComboComponent extends IgxComboBaseDirective implements Co
292290
if (this.collapsed && this.comboInput.focused) {
293291
this.open();
294292
}
295-
if (this.disableFiltering) {
296-
return;
297-
}
298293
if (event !== undefined) {
299294
this.filterValue = this.searchValue = typeof event === 'string' ? event : event.target.value;
300295
}

0 commit comments

Comments
 (0)