Skip to content

Commit 3c2ba43

Browse files
ChronosSFChronosSF
authored
Merge branch 'master' into mpavlov/issue-5639
2 parents b1cf996 + d497969 commit 3c2ba43

26 files changed

+124
-54
lines changed

‎projects/igniteui-angular/src/lib/banner/banner.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ export class IgxBannerComponent implements IToggleView {
4747
@ViewChild('expansionPanel', { static: true })
4848
private _expansionPanel: IgxExpansionPanelComponent;
4949

50-
@ContentChild(IgxBannerActionsDirective, { static: true })
50+
@ContentChild(IgxBannerActionsDirective, { static: false })
5151
private _bannerActionTemplate: IgxBannerActionsDirective;
5252

5353
/**
5454
* @hidden
5555
*/
56-
@ContentChild(IgxIconComponent, { static: true })
56+
@ContentChild(IgxIconComponent, { static: false })
5757
public bannerIcon: IgxIconComponent;
5858

5959
/**

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
243243
* </igx-combo>
244244
* ```
245245
*/
246-
@ContentChild(IgxComboItemDirective, { read: TemplateRef, static: true })
246+
@ContentChild(IgxComboItemDirective, { read: TemplateRef, static: false })
247247
public itemTemplate: TemplateRef<any> = null;
248248

249249
/**
@@ -266,7 +266,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
266266
* </igx-combo>
267267
* ```
268268
*/
269-
@ContentChild(IgxComboHeaderDirective, { read: TemplateRef, static: true })
269+
@ContentChild(IgxComboHeaderDirective, { read: TemplateRef, static: false })
270270
public headerTemplate: TemplateRef<any> = null;
271271

272272
/**
@@ -289,7 +289,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
289289
* </igx-combo>
290290
* ```
291291
*/
292-
@ContentChild(IgxComboFooterDirective, { read: TemplateRef, static: true })
292+
@ContentChild(IgxComboFooterDirective, { read: TemplateRef, static: false })
293293
public footerTemplate: TemplateRef<any> = null;
294294

295295
/**
@@ -310,7 +310,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
310310
* </igx-combo>
311311
* ```
312312
*/
313-
@ContentChild(IgxComboHeaderItemDirective, { read: TemplateRef, static: true })
313+
@ContentChild(IgxComboHeaderItemDirective, { read: TemplateRef, static: false })
314314
public headerItemTemplate: TemplateRef<any> = null;
315315

316316
/**
@@ -333,7 +333,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
333333
* </igx-combo>
334334
* ```
335335
*/
336-
@ContentChild(IgxComboAddItemDirective, { read: TemplateRef, static: true })
336+
@ContentChild(IgxComboAddItemDirective, { read: TemplateRef, static: false })
337337
public addItemTemplate: TemplateRef<any> = null;
338338

339339
/**
@@ -356,7 +356,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
356356
* </igx-combo>
357357
* ```
358358
*/
359-
@ContentChild(IgxComboEmptyDirective, { read: TemplateRef, static: true })
359+
@ContentChild(IgxComboEmptyDirective, { read: TemplateRef, static: false })
360360
public emptyTemplate: TemplateRef<any> = null;
361361

362362
/**
@@ -377,7 +377,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
377377
* </igx-combo>
378378
* ```
379379
*/
380-
@ContentChild(IgxComboToggleIconDirective, { read: TemplateRef, static: true })
380+
@ContentChild(IgxComboToggleIconDirective, { read: TemplateRef, static: false })
381381
public toggleIconTemplate: TemplateRef<any> = null;
382382

383383
/**
@@ -398,7 +398,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
398398
* </igx-combo>
399399
* ```
400400
*/
401-
@ContentChild(IgxComboClearIconDirective, { read: TemplateRef, static: true })
401+
@ContentChild(IgxComboClearIconDirective, { read: TemplateRef, static: false })
402402
public clearIconTemplate: TemplateRef<any> = null;
403403

404404
@ViewChild('primitive', { read: TemplateRef, static: true })

‎projects/igniteui-angular/src/lib/core/styles/components/navdrawer/_navdrawer-theme.scss

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,10 @@
209209
%aside--mini {
210210
width: rem(60px);
211211
transition-duration: .2s, .2s;
212+
213+
%item {
214+
justify-content: center;
215+
}
212216
}
213217

214218
%aside--normal {
@@ -251,17 +255,18 @@
251255
%item {
252256
position: relative;
253257
display: flex;
258+
align-items: center;
254259
flex-flow: row nowrap;
255260
color: --var($theme, 'item-text-color');
256261
max-height: rem(48px);
257-
padding: rem(12px) rem(16px);
262+
min-width: rem(32px);
263+
padding: rem(12px) rem(8px);
258264
cursor: pointer;
259-
align-items: center;
260265
user-select: none;
261266
outline: transparent;
262267
white-space: nowrap;
263268
border-radius: --var($theme, 'item-border-radius');
264-
margin: 8px;
269+
margin: rem(8px) rem(8px);
265270

266271
> igx-icon + span {
267272
margin-left: rem(32px);

‎projects/igniteui-angular/src/lib/date-picker/date-picker.component.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -704,19 +704,19 @@ export class IgxDatePickerComponent implements IDatePicker, ControlValueAccessor
704704
/**
705705
*@hidden
706706
*/
707-
@ContentChild(IgxDatePickerTemplateDirective, { read: IgxDatePickerTemplateDirective, static: true })
707+
@ContentChild(IgxDatePickerTemplateDirective, { read: IgxDatePickerTemplateDirective, static: false })
708708
protected datePickerTemplateDirective: IgxDatePickerTemplateDirective;
709709

710710
/**
711711
*@hidden
712712
*/
713-
@ContentChild(IgxCalendarHeaderTemplateDirective, { read: IgxCalendarHeaderTemplateDirective, static: true })
713+
@ContentChild(IgxCalendarHeaderTemplateDirective, { read: IgxCalendarHeaderTemplateDirective, static: false })
714714
public headerTemplate: IgxCalendarHeaderTemplateDirective;
715715

716716
/**
717717
*@hidden
718718
*/
719-
@ContentChild(IgxCalendarSubheaderTemplateDirective, { read: IgxCalendarSubheaderTemplateDirective, static: true })
719+
@ContentChild(IgxCalendarSubheaderTemplateDirective, { read: IgxCalendarSubheaderTemplateDirective, static: false })
720720
public subheaderTemplate: IgxCalendarSubheaderTemplateDirective;
721721

722722
/**

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

Lines changed: 2 additions & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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);

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,7 +1101,7 @@ export class IgxColumnComponent implements AfterContentInit {
11011101
/**
11021102
*@hidden
11031103
*/
1104-
@ContentChild(IgxCellTemplateDirective, { read: IgxCellTemplateDirective, static: true })
1104+
@ContentChild(IgxCellTemplateDirective, { read: IgxCellTemplateDirective, static: false })
11051105
protected cellTemplate: IgxCellTemplateDirective;
11061106
/**
11071107
*@hidden
@@ -1111,14 +1111,14 @@ export class IgxColumnComponent implements AfterContentInit {
11111111
/**
11121112
*@hidden
11131113
*/
1114-
@ContentChild(IgxCellEditorTemplateDirective, { read: IgxCellEditorTemplateDirective, static: true })
1114+
@ContentChild(IgxCellEditorTemplateDirective, { read: IgxCellEditorTemplateDirective, static: false })
11151115
protected editorTemplate: IgxCellEditorTemplateDirective;
11161116

11171117
protected _vIndex = NaN;
11181118
/**
11191119
*@hidden
11201120
*/
1121-
@ContentChild(IgxFilterCellTemplateDirective, { read: IgxFilterCellTemplateDirective, static: true })
1121+
@ContentChild(IgxFilterCellTemplateDirective, { read: IgxFilterCellTemplateDirective, static: false })
11221122
public filterCellTemplateDirective: IgxFilterCellTemplateDirective;
11231123

11241124
constructor(public gridAPI: GridBaseAPIService<IgxGridBaseComponent & IGridDataBindable>, public cdr: ChangeDetectorRef) { }
@@ -2003,8 +2003,6 @@ export class IgxColumnLayoutComponent extends IgxColumnGroupComponent implements
20032003
}
20042004

20052005
this.children.forEach(child => {
2006-
child.disableHiding = true;
2007-
child.disablePinning = true;
20082006
child.movable = false;
20092007
});
20102008
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1576,25 +1576,25 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
15761576
/**
15771577
*@hidden
15781578
*/
1579-
@ContentChild(IgxExcelStyleSortingTemplateDirective, { read: IgxExcelStyleSortingTemplateDirective, static: true })
1579+
@ContentChild(IgxExcelStyleSortingTemplateDirective, { read: IgxExcelStyleSortingTemplateDirective, static: false })
15801580
public excelStyleSortingTemplateDirective: IgxExcelStyleSortingTemplateDirective;
15811581

15821582
/**
15831583
*@hidden
15841584
*/
1585-
@ContentChild(IgxExcelStyleMovingTemplateDirective, { read: IgxExcelStyleMovingTemplateDirective, static: true })
1585+
@ContentChild(IgxExcelStyleMovingTemplateDirective, { read: IgxExcelStyleMovingTemplateDirective, static: false })
15861586
public excelStyleMovingTemplateDirective: IgxExcelStyleMovingTemplateDirective;
15871587

15881588
/**
15891589
*@hidden
15901590
*/
1591-
@ContentChild(IgxExcelStyleHidingTemplateDirective, { read: IgxExcelStyleHidingTemplateDirective, static: true })
1591+
@ContentChild(IgxExcelStyleHidingTemplateDirective, { read: IgxExcelStyleHidingTemplateDirective, static: false })
15921592
public excelStyleHidingTemplateDirective: IgxExcelStyleHidingTemplateDirective;
15931593

15941594
/**
15951595
*@hidden
15961596
*/
1597-
@ContentChild(IgxExcelStylePinningTemplateDirective, { read: IgxExcelStylePinningTemplateDirective, static: true })
1597+
@ContentChild(IgxExcelStylePinningTemplateDirective, { read: IgxExcelStylePinningTemplateDirective, static: false })
15981598
public excelStylePinningTemplateDirective: IgxExcelStylePinningTemplateDirective;
15991599

16001600
/**
@@ -1884,18 +1884,18 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
18841884
/**
18851885
* @hidden
18861886
*/
1887-
@ContentChild(IgxRowEditTemplateDirective, { read: TemplateRef, static: true })
1887+
@ContentChild(IgxRowEditTemplateDirective, { read: TemplateRef, static: false })
18881888
public rowEditCustom: TemplateRef<any>;
18891889

18901890
/** @hidden */
18911891
public get rowEditContainer(): TemplateRef<any> {
18921892
return this.rowEditCustom ? this.rowEditCustom : this.defaultRowEditTemplate;
18931893
}
18941894
/** @hidden */
1895-
@ContentChild(IgxRowEditTextDirective, { read: TemplateRef, static: true })
1895+
@ContentChild(IgxRowEditTextDirective, { read: TemplateRef, static: false })
18961896
public rowEditText: TemplateRef<any>;
18971897
/** @hidden */
1898-
@ContentChild(IgxRowEditActionsDirective, { read: TemplateRef, static: true })
1898+
@ContentChild(IgxRowEditActionsDirective, { read: TemplateRef, static: false })
18991899
public rowEditActions: TemplateRef<any>;
19001900

19011901
/**

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ export class IgxGridComponent extends IgxGridBaseComponent implements IGridDataB
469469
/**
470470
* @hidden
471471
*/
472-
@ContentChild(IgxGroupByRowTemplateDirective, { read: IgxGroupByRowTemplateDirective, static: true })
472+
@ContentChild(IgxGroupByRowTemplateDirective, { read: IgxGroupByRowTemplateDirective, static: false })
473473
protected groupTemplate: IgxGroupByRowTemplateDirective;
474474

475475
/**
@@ -490,7 +490,7 @@ export class IgxGridComponent extends IgxGridBaseComponent implements IGridDataB
490490
* </igx-grid>
491491
* ```
492492
*/
493-
@ContentChild(IgxDragIndicatorIconDirective, { read: TemplateRef, static: true })
493+
@ContentChild(IgxDragIndicatorIconDirective, { read: TemplateRef, static: false })
494494
public dragIndicatorIconTemplate: TemplateRef<any> = null;
495495

496496
@ViewChildren(IgxGridGroupByRowComponent, { read: IgxGridGroupByRowComponent })

‎projects/igniteui-angular/src/lib/grids/grid/grid.multi-row-layout.integration.spec.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -801,6 +801,21 @@ describe('IgxGrid - multi-row-layout Integration - ', () => {
801801

802802
verifyDOMMatchesLayoutSettings(gridFirstRow, fixture.componentInstance.colGroups);
803803
});
804+
805+
it('should render unpin and hide column buttons into the excel style filter', () => {
806+
const filterIcons = fixture.debugElement.queryAll(By.css('.igx-excel-filter__icon'));
807+
expect(filterIcons.length).not.toBe(0);
808+
809+
filterIcons[0].nativeElement.click();
810+
fixture.detectChanges();
811+
812+
const excelMenu = grid.nativeElement.querySelector('.igx-excel-filter__menu');
813+
const unpinComponent = excelMenu.querySelector('.igx-excel-filter__actions-unpin');
814+
const hideComponent = excelMenu.querySelector('.igx-excel-filter__actions-hide');
815+
816+
expect(unpinComponent).toBeDefined();
817+
expect(hideComponent).toBeDefined();
818+
});
804819
});
805820

806821
describe('GroupBy ', () => {

0 commit comments

Comments
 (0)