Skip to content

Commit 2477686

Browse files
fix(dropdown,select): owner in selectionChanging event args (#12920)
1 parent 081425e commit 2477686

File tree

4 files changed

+23
-13
lines changed

4 files changed

+23
-13
lines changed

projects/igniteui-angular/src/lib/drop-down/drop-down.component.spec.ts

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,17 @@ describe('IgxDropDown ', () => {
7777
const selectionArgs: ISelectionEventArgs = {
7878
newSelection: dropdown.items[1],
7979
oldSelection: null,
80-
cancel: false
80+
cancel: false,
81+
owner: dropdown
8182
};
8283
dropdown.selectItem(data[1]);
8384
expect(dropdown.selectionChanging.emit).toHaveBeenCalledWith(selectionArgs);
8485

8586
const newSelectionArgs: ISelectionEventArgs = {
8687
newSelection: dropdown.items[4],
8788
oldSelection: dropdown.items[1],
88-
cancel: false
89+
cancel: false,
90+
owner: dropdown
8991
};
9092
dropdown.selectItem(data[4]);
9193
expect(dropdown.selectionChanging.emit).toHaveBeenCalledWith(newSelectionArgs);
@@ -106,7 +108,8 @@ describe('IgxDropDown ', () => {
106108
let args: ISelectionEventArgs = {
107109
oldSelection: null,
108110
newSelection: data[1],
109-
cancel: false
111+
cancel: false,
112+
owner: dropdown
110113
};
111114
expect(dropdown.selectionChanging.emit).toHaveBeenCalledWith(args);
112115

@@ -116,7 +119,8 @@ describe('IgxDropDown ', () => {
116119
args = {
117120
oldSelection: selected,
118121
newSelection: null,
119-
cancel: false
122+
cancel: false,
123+
owner: dropdown
120124
};
121125
expect(dropdown.selectionChanging.emit).toHaveBeenCalledWith(args);
122126
});
@@ -509,7 +513,8 @@ describe('IgxDropDown ', () => {
509513
const selectionArgs: ISelectionEventArgs = {
510514
oldSelection: null,
511515
newSelection: dropdown.items[3],
512-
cancel: false
516+
cancel: false,
517+
owner: dropdown
513518
};
514519
expect(dropdown.selectionChanging.emit).toHaveBeenCalledWith(selectionArgs);
515520

@@ -520,7 +525,8 @@ describe('IgxDropDown ', () => {
520525
const canceledSelectionArgs: ISelectionEventArgs = {
521526
oldSelection: dropdown.items[3],
522527
newSelection: dropdown.items[1],
523-
cancel: true
528+
cancel: true,
529+
owner: dropdown
524530
};
525531
expect(dropdown.selectionChanging.emit).toHaveBeenCalledWith(canceledSelectionArgs);
526532
}));

projects/igniteui-angular/src/lib/drop-down/drop-down.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ export class IgxDropDownComponent extends IgxDropDownBaseDirective implements ID
521521
index: newSelection.index
522522
} as IgxDropDownItemBaseDirective;
523523
}
524-
const args: ISelectionEventArgs = { oldSelection, newSelection, cancel: false };
524+
const args: ISelectionEventArgs = { oldSelection, newSelection, cancel: false, owner:this };
525525
this.selectionChanging.emit(args);
526526

527527
if (!args.cancel) {
@@ -553,7 +553,7 @@ export class IgxDropDownComponent extends IgxDropDownBaseDirective implements ID
553553
public clearSelection() {
554554
const oldSelection = this.selectedItem;
555555
const newSelection: IgxDropDownItemBaseDirective = null;
556-
const args: ISelectionEventArgs = { oldSelection, newSelection, cancel: false };
556+
const args: ISelectionEventArgs = { oldSelection, newSelection, cancel: false, owner: this };
557557
this.selectionChanging.emit(args);
558558
if (this.selectedItem && !args.cancel) {
559559
this.selectedItem.selected = false;

projects/igniteui-angular/src/lib/select/select.component.spec.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,7 +1239,8 @@ describe('igxSelect', () => {
12391239
const args: ISelectionEventArgs = {
12401240
oldSelection: <IgxDropDownItemBaseDirective>{},
12411241
newSelection: selectedItem,
1242-
cancel: false
1242+
cancel: false,
1243+
owner: select
12431244
};
12441245

12451246
select.toggle();
@@ -1274,7 +1275,8 @@ describe('igxSelect', () => {
12741275
const args: ISelectionEventArgs = {
12751276
oldSelection: <IgxDropDownItemBaseDirective>{},
12761277
newSelection: selectedItem,
1277-
cancel: false
1278+
cancel: false,
1279+
owner: select
12781280
};
12791281

12801282
selectedItem.selected = true;
@@ -1305,7 +1307,8 @@ describe('igxSelect', () => {
13051307
const args: ISelectionEventArgs = {
13061308
oldSelection: <IgxDropDownItemBaseDirective>{},
13071309
newSelection: selectedItem,
1308-
cancel: false
1310+
cancel: false,
1311+
owner: select
13091312
};
13101313

13111314
const navigateDropdownItems = (selectEvent: KeyboardEvent) => {
@@ -1379,7 +1382,8 @@ describe('igxSelect', () => {
13791382
const args: ISelectionEventArgs = {
13801383
oldSelection: <IgxDropDownItemBaseDirective>{},
13811384
newSelection: selectedItem,
1382-
cancel: false
1385+
cancel: false,
1386+
owner: select
13831387
};
13841388

13851389
select.selectItem(selectedItem);

projects/igniteui-angular/src/lib/select/select.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ export class IgxSelectComponent extends IgxDropDownComponent implements IgxSelec
379379
return;
380380
}
381381

382-
const args: ISelectionEventArgs = { oldSelection, newSelection, cancel: false };
382+
const args: ISelectionEventArgs = { oldSelection, newSelection, cancel: false, owner:this };
383383
this.selectionChanging.emit(args);
384384

385385
if (args.cancel) {

0 commit comments

Comments
 (0)