Skip to content

Commit 8bb8913

Browse files
ChronosSFChronosSF
authored
Merge branch '8.1.x' into mkirova/fix-4719-8.1.x
2 parents 2243c89 + ce6df3d commit 8bb8913

27 files changed

+437
-209
lines changed

‎projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-date-expression.component.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#dropdownConditions
33
[maxHeight]="'200px'"
44
[width]="getInputWidth()"
5+
[displayDensity]="displayDensity"
56
(onSelection)="onConditionsChanged($event)">
67
<igx-drop-down-item *ngFor="let condition of conditions" [value]="condition" [selected]="isConditionSelected(condition)">
78
<igx-icon fontSet="filtering-icons" [name]="getCondition(condition).iconName"></igx-icon>

‎projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-default-expression.component.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#dropdownConditions
33
[maxHeight]="'200px'"
44
[width]="getInputWidth()"
5+
[displayDensity]="displayDensity"
56
(onSelection)="onConditionsChanged($event)">
67
<igx-drop-down-item *ngFor="let condition of conditions" [value]="condition" [selected]="isConditionSelected(condition)">
78
<igx-icon fontSet="filtering-icons" [name]="getCondition(condition).iconName"></igx-icon>

‎projects/igniteui-angular/src/lib/grids/filtering/excel-style/grid.excel-style-filtering.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ <h4>{{ column.header || column.field }}</h4>
131131
</footer>
132132
</article>
133133

134-
<igx-drop-down [maxHeight]="'397px'" #subMenu (onSelection)="onSubMenuSelection($event)" (onClosed)="onSubMenuClosed()">
134+
<igx-drop-down [maxHeight]="'397px'" [displayDensity]="grid.displayDensity" #subMenu (onSelection)="onSubMenuSelection($event)" (onClosed)="onSubMenuClosed()">
135135
<div>
136136
<igx-drop-down-item
137137
*ngFor="let condition of conditions"

‎projects/igniteui-angular/src/lib/grids/grid-base.component.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4110,15 +4110,15 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
41104110
if (!this._height) {
41114111
return null;
41124112
}
4113-
const footerBordersAndScrollbars = this.tfoot.nativeElement.offsetHeight -
4114-
this.tfoot.nativeElement.clientHeight;
4113+
const footerHeight = this.summariesHeight || this.tfoot.nativeElement.offsetHeight -
4114+
this.tfoot.nativeElement.clientHeight;
41154115
let gridHeight;
41164116
const computed = this.document.defaultView.getComputedStyle(this.nativeElement);
41174117
const toolbarHeight = this.getToolbarHeight();
41184118
const pagingHeight = this.getPagingHeight();
41194119
const groupAreaHeight = this.getGroupAreaHeight();
41204120
const renderedHeight = toolbarHeight + this.theadRow.nativeElement.offsetHeight +
4121-
this.summariesHeight + pagingHeight + groupAreaHeight + footerBordersAndScrollbars +
4121+
footerHeight + pagingHeight + groupAreaHeight +
41224122
this.scr.nativeElement.clientHeight;
41234123

41244124
if (this.isPercentHeight) {

‎projects/igniteui-angular/src/lib/grids/grid/cell.spec.ts‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -214,20 +214,20 @@ describe('IgxGrid - Cell component', () => {
214214
const firstCell = grid.getCellByColumn(0, 'fullName');
215215

216216
expect(firstCell.nativeElement.textContent).toBe('John Brown');
217-
expect(firstCell.inEditMode).toBeFalsy();
217+
expect(firstCell.editMode).toBeFalsy();
218218

219219
cellElem.triggerEventHandler('dblclick', new Event('dblclick'));
220220
fix.detectChanges();
221221
const editCell = cellElem.query(By.css('input'));
222222
expect(editCell.nativeElement.value).toBe('John Brown');
223-
expect(firstCell.inEditMode).toBeTruthy();
223+
expect(firstCell.editMode).toBeTruthy();
224224

225225
UIInteractions.sendInput(editCell, 'test');
226226
fix.detectChanges();
227227
cellElem.triggerEventHandler('dblclick', new Event('dblclick'));
228228
fix.detectChanges();
229229
expect(editCell.nativeElement.value).toBe('test');
230-
expect(firstCell.inEditMode).toBeTruthy();
230+
expect(firstCell.editMode).toBeTruthy();
231231
}));
232232

233233
describe('Cell Editing', () => {
@@ -252,27 +252,27 @@ describe('IgxGrid - Cell component', () => {
252252

253253
rv.triggerEventHandler('dblclick', {});
254254
fixture.detectChanges();
255-
expect(cell.inEditMode).toBe(true);
255+
expect(cell.editMode).toBe(true);
256256

257257
UIInteractions.triggerKeyDownEvtUponElem('escape', rv.nativeElement, true);
258258
fixture.detectChanges();
259-
expect(cell.inEditMode).toBe(false);
259+
expect(cell.editMode).toBe(false);
260260

261261
UIInteractions.triggerKeyDownEvtUponElem('enter', rv.nativeElement, true);
262262
fixture.detectChanges();
263-
expect(cell.inEditMode).toBe(true);
263+
expect(cell.editMode).toBe(true);
264264

265265
UIInteractions.triggerKeyDownEvtUponElem('escape', rv.nativeElement, true);
266266
fixture.detectChanges();
267-
expect(cell.inEditMode).toBe(false);
267+
expect(cell.editMode).toBe(false);
268268

269269
UIInteractions.triggerKeyDownEvtUponElem('f2', rv.nativeElement, true);
270270
fixture.detectChanges();
271-
expect(cell.inEditMode).toBe(true);
271+
expect(cell.editMode).toBe(true);
272272

273273
UIInteractions.triggerKeyDownEvtUponElem('escape', rv.nativeElement, true);
274274
fixture.detectChanges();
275-
expect(cell.inEditMode).toBe(false);
275+
expect(cell.editMode).toBe(false);
276276
});
277277

278278
it('should be able to edit cell which is a Primary Key', () => {
@@ -285,7 +285,7 @@ describe('IgxGrid - Cell component', () => {
285285
fixture.detectChanges();
286286
cellDomPK.triggerEventHandler('dblclick', {});
287287
fixture.detectChanges();
288-
expect(cell.inEditMode).toBe(true);
288+
expect(cell.editMode).toBe(true);
289289

290290
const editTemplate = cellDomPK.query(By.css('input[type=\'number\']'));
291291
UIInteractions.sendInput(editTemplate, 87);
@@ -294,7 +294,7 @@ describe('IgxGrid - Cell component', () => {
294294
UIInteractions.triggerKeyDownEvtUponElem('enter', cellDomPK.nativeElement, true);
295295

296296
fixture.detectChanges();
297-
expect(cell.inEditMode).toBe(false);
297+
expect(cell.editMode).toBe(false);
298298
expect(cell.value).toBe(87);
299299
});
300300

@@ -305,7 +305,7 @@ describe('IgxGrid - Cell component', () => {
305305
cellDomNumber.triggerEventHandler('dblclick', {});
306306
fixture.detectChanges();
307307

308-
expect(cell.inEditMode).toBe(true);
308+
expect(cell.editMode).toBe(true);
309309
const editTemplate = cellDomNumber.query(By.css('input[type=\'number\']'));
310310
expect(editTemplate).toBeDefined();
311311

@@ -314,7 +314,7 @@ describe('IgxGrid - Cell component', () => {
314314
UIInteractions.triggerKeyDownEvtUponElem('enter', cellDomNumber.nativeElement, true);
315315
fixture.detectChanges();
316316

317-
expect(cell.inEditMode).toBe(false);
317+
expect(cell.editMode).toBe(false);
318318
expect(parseFloat(cell.value)).toBe(0.3698);
319319
expect(editTemplate.nativeElement.type).toBe('number');
320320
});
@@ -336,7 +336,7 @@ describe('IgxGrid - Cell component', () => {
336336
UIInteractions.triggerKeyDownEvtUponElem('enter', cellDomNumber.nativeElement, true);
337337
fixture.detectChanges();
338338

339-
expect(cell.inEditMode).toBe(false);
339+
expect(cell.editMode).toBe(false);
340340
expect(parseFloat(cell.value)).toBe(expectedValue);
341341

342342
cellDomNumber.triggerEventHandler('dblclick', {});
@@ -348,7 +348,7 @@ describe('IgxGrid - Cell component', () => {
348348
UIInteractions.triggerKeyDownEvtUponElem('enter', cellDomNumber.nativeElement, true);
349349
fixture.detectChanges();
350350

351-
expect(cell.inEditMode).toBe(false);
351+
expect(cell.editMode).toBe(false);
352352
expect(parseFloat(cell.value)).toBe(expectedValue);
353353
});
354354

@@ -359,7 +359,7 @@ describe('IgxGrid - Cell component', () => {
359359
cellDomBoolean.triggerEventHandler('dblclick', {});
360360
fixture.detectChanges();
361361

362-
expect(cell.inEditMode).toBe(true);
362+
expect(cell.editMode).toBe(true);
363363

364364
const editTemplate = cellDomBoolean.query(By.css('.igx-checkbox')).query(By.css('.igx-checkbox__label'));
365365
expect(editTemplate).toBeDefined();
@@ -371,7 +371,7 @@ describe('IgxGrid - Cell component', () => {
371371
UIInteractions.triggerKeyDownEvtUponElem('enter', cellDomBoolean.nativeElement, true);
372372
fixture.detectChanges();
373373

374-
expect(cell.inEditMode).toBe(false);
374+
expect(cell.editMode).toBe(false);
375375
expect(cell.value).toBe(false);
376376
});
377377

@@ -383,7 +383,7 @@ describe('IgxGrid - Cell component', () => {
383383
cellDomDate.triggerEventHandler('dblclick', {});
384384
fixture.detectChanges();
385385

386-
expect(cell.inEditMode).toBe(true);
386+
expect(cell.editMode).toBe(true);
387387
const datePicker = cellDomDate.query(By.css('igx-date-picker')).componentInstance;
388388
expect(datePicker).toBeDefined();
389389

@@ -394,7 +394,7 @@ describe('IgxGrid - Cell component', () => {
394394
UIInteractions.triggerKeyDownEvtUponElem('enter', cellDomDate.nativeElement, true);
395395
fixture.detectChanges();
396396

397-
expect(cell.inEditMode).toBe(false);
397+
expect(cell.editMode).toBe(false);
398398
expect(cell.value.getTime()).toBe(selectedDate.getTime());
399399
});
400400

@@ -407,7 +407,7 @@ describe('IgxGrid - Cell component', () => {
407407
fixture.detectChanges();
408408

409409
const editTemplate = cellDom.query(By.css('input'));
410-
expect(cell.inEditMode).toBe(true);
410+
expect(cell.editMode).toBe(true);
411411

412412
UIInteractions.sendInput(editTemplate, 'Rick Gilmore');
413413
fixture.detectChanges();
@@ -418,7 +418,7 @@ describe('IgxGrid - Cell component', () => {
418418
fixture.detectChanges();
419419

420420
cell = grid.getCellByColumn(0, 'fullName');
421-
expect(cell.inEditMode).toBe(false);
421+
expect(cell.editMode).toBe(false);
422422
expect(cell.value).toBe(cellValue);
423423
});
424424

@@ -432,7 +432,7 @@ describe('IgxGrid - Cell component', () => {
432432

433433
cellDomPK.triggerEventHandler('dblclick', {});
434434
fixture.detectChanges();
435-
expect(cell.inEditMode).toBe(true);
435+
expect(cell.editMode).toBe(true);
436436

437437
const editTemplate = cellDomPK.query(By.css('input[type=\'number\']'));
438438
UIInteractions.sendInput(editTemplate, 9);
@@ -449,7 +449,7 @@ describe('IgxGrid - Cell component', () => {
449449
fixture.detectChanges();
450450

451451
const editTemplate = cellDom.query(By.css('input'));
452-
expect(cell.inEditMode).toBe(true);
452+
expect(cell.editMode).toBe(true);
453453
UIInteractions.sendInput(editTemplate, 'Rick Gilmore');
454454
fixture.detectChanges();
455455

@@ -469,7 +469,7 @@ describe('IgxGrid - Cell component', () => {
469469
fixture.detectChanges();
470470

471471
const editTemplate = cellDom.query(By.css('input'));
472-
expect(cell.inEditMode).toBe(true);
472+
expect(cell.editMode).toBe(true);
473473
expect(cell.editValue).toBe('Tom Riddle');
474474
UIInteractions.sendInput(editTemplate, 'Rick Gilmore');
475475
fixture.detectChanges();
@@ -507,12 +507,12 @@ describe('IgxGrid - Cell component', () => {
507507
UIInteractions.triggerKeyDownEvtUponElem('enter', rv.nativeElement, true);
508508
fixture.detectChanges();
509509

510-
expect(cell.inEditMode).toBe(true);
510+
expect(cell.editMode).toBe(true);
511511

512512
button.nativeElement.dispatchEvent(new Event('click'));
513513
fixture.detectChanges();
514514

515-
expect(cell.inEditMode).toBe(true);
515+
expect(cell.editMode).toBe(true);
516516
}));
517517

518518
it('edit mode - exit edit mode and submit when pin/unpin unpin column', fakeAsync(/** height/width setter rAF */() => {
@@ -534,15 +534,15 @@ describe('IgxGrid - Cell component', () => {
534534
expect(cell.value).toBe('Gary Martin');
535535
cell = grid.getCellByColumn(1, 'firstName');
536536
const cellValue = cell.value;
537-
cell.inEditMode = true;
537+
cell.setEditMode(true);
538538
fixture.detectChanges();
539539

540540
expect(cell.gridAPI.get_cell_inEditMode()).toBeDefined();
541541
grid.unpinColumn('firstName');
542542
cell = grid.getCellByColumn(1, 'firstName');
543543
expect(grid.pinnedColumns.length).toBe(0);
544544
expect(cell.gridAPI.get_cell_inEditMode()).toBeNull();
545-
expect(cell.inEditMode).toBe(false);
545+
expect(cell.editMode).toBe(false);
546546
expect(cell.value).toBe(cellValue);
547547
}));
548548

‎projects/igniteui-angular/src/lib/grids/grid/column-moving.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ describe('IgxGrid - Column Moving', () => {
346346

347347
cell.triggerEventHandler('dblclick', {});
348348
fixture.detectChanges();
349-
expect(grid.getCellByColumn(0, 'ID').inEditMode).toBe(true);
349+
expect(grid.getCellByColumn(0, 'ID').editMode).toBe(true);
350350

351351
// step 2 - enter some new value
352352
const editTemplate = cell.query(By.css('input'));
@@ -368,7 +368,7 @@ describe('IgxGrid - Column Moving', () => {
368368

369369
// step 4 - verify cell has exited edit mode correctly
370370
expect(grid.columnList.toArray()[1].field).toEqual('ID');
371-
expect(grid.getCellByColumn(0, 'ID').inEditMode).toBe(false);
371+
expect(grid.getCellByColumn(0, 'ID').editMode).toBe(false);
372372
expect(grid.getCellByColumn(0, 'ID').value).toBe('4');
373373
}));
374374

‎projects/igniteui-angular/src/lib/grids/grid/column.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ describe('IgxGrid - Column properties', () => {
263263
expect(header.elementRef.nativeElement.querySelector('.customHeaderTemplate')).toBeDefined());
264264

265265
const cell = grid.getCellByColumn(0, 'ID');
266-
cell.inEditMode = true;
266+
cell.setEditMode(true);
267267
fixture.detectChanges();
268268

269269
expect(cell.nativeElement.querySelector('.customEditorTemplate')).toBeDefined();

0 commit comments

Comments
 (0)