Skip to content

Commit 5be7e11

Browse files
authored
Merge branch 'master' into tzhelev/fix-5577-8.2.x
2 parents 13db44b + a69d8e4 commit 5be7e11

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

projects/igniteui-angular/src/lib/directives/drag-drop/drag-drop.directive.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1166,7 +1166,8 @@ export class IgxDragDirective implements AfterContentInit, OnDestroy {
11661166
const viewPortY = pageY - window.pageYOffset;
11671167
if (document['msElementsFromPoint']) {
11681168
// Edge and IE special snowflakes
1169-
return document['msElementsFromPoint'](viewPortX, viewPortY);
1169+
const elements = document['msElementsFromPoint'](viewPortX, viewPortY);
1170+
return elements === null ? [] : elements;
11701171
} else {
11711172
// Other browsers like Chrome, Firefox, Opera
11721173
return document.elementsFromPoint(viewPortX, viewPortY);

projects/igniteui-angular/src/lib/grids/api.service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ export class GridBaseAPIService <T extends IgxGridBaseComponent & IGridDataBinda
207207

208208
update_row(row: IgxRow, value: any) {
209209
const grid = this.grid;
210-
const selected = grid.selection.is_item_selected(grid.id, row.id);
211210
const rowInEditMode = grid.crudService.row;
212211
const data = this.get_all_data(grid.transactions.enabled);
213212
const index = this.get_row_index_in_data(row.id);
@@ -246,6 +245,7 @@ export class GridBaseAPIService <T extends IgxGridBaseComponent & IGridDataBinda
246245

247246
this.updateData(grid, row.id, data[index], args.oldValue, args.newValue);
248247
const newId = grid.primaryKey ? args.newValue[grid.primaryKey] : args.newValue;
248+
const selected = grid.selection.is_item_selected(grid.id, row.id);
249249
if (selected) {
250250
grid.selection.deselect_item(grid.id, row.id);
251251
grid.selection.select_item(grid.id, newId);

0 commit comments

Comments
 (0)