Skip to content

Commit e620ee7

Browse files
MKirovaMKirova
authored andcommitted
Merge branch 'dmdimitrov/esf-templates' of https://github.com/IgniteUI/igniteui-angular.git
2 parents 67f7e22 + d4a9dcc commit e620ee7

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ All notable changes for each version of this project will be documented in this
1717
- **Breaking Changes** - The `igx-action-icon` has been renamed to `igx-navbar-action`. It should get renamed in your components via `ng update`;
1818
- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
1919
- **Breaking Change** - The `selectedRows` method is now an `@Input` property. Setting it to an array of Row IDs will update the grid's selection state, any previous selection will be cleared. Setting it to an empty array will clear the selection entirely.
20+
- **Breaking Change** - Removed `IgxExcelStyleSortingTemplateDirective`, `IgxExcelStyleHidingTemplateDirective`, `IgxExcelStyleMovingTemplateDirective`, `IgxExcelStylePinningTemplateDirective` and `IgxExcelStyleSelectingTemplateDirective` directives for re-templating the Excel style filter menu. Added two new directives for re-templating the column operations and filter operations areas - `IgxExcelStyleColumnOperationsTemplateDirective` and `IgxExcelStyleFilterOperationsTemplateDirective`. Exposed all internal components of the Excel style filter menu in order to be used inside the templates.
2021
- `igxGrid`
2122
- Added `onScroll` event, which is emitted when the grid is scrolled vertically or horizontally.
2223
- Each grid now expose a default handling for boolean column types. The column will display `check` or `close` icon, instead of true/false by default.

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

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<ng-template #defaultExcelColumnOperations>
22
<igx-excel-style-header
3-
[showHiding]="grid.displayDensity !== 'comfortable' && !column.disableHiding"
4-
[showPinning]="grid.displayDensity !== 'comfortable' && !column.disablePinning"
5-
[showSelecting]="grid.displayDensity !== 'comfortable' && columnSelectable()"
3+
[showHiding]="displayDensity !== 'comfortable' && !column?.disableHiding"
4+
[showPinning]="displayDensity !== 'comfortable' && !column?.disablePinning"
5+
[showSelecting]="displayDensity !== 'comfortable' && columnSelectable()"
66
>
77
</igx-excel-style-header>
88

9-
<igx-excel-style-sorting *ngIf="column.sortable">
9+
<igx-excel-style-sorting *ngIf="column?.sortable">
1010
</igx-excel-style-sorting>
1111

12-
<igx-excel-style-moving *ngIf="column.movable">
12+
<igx-excel-style-moving *ngIf="column?.movable">
1313
</igx-excel-style-moving>
1414

15-
<igx-excel-style-pinning *ngIf="!column.disablePinning && grid.displayDensity==='comfortable'">
15+
<igx-excel-style-pinning *ngIf="!column?.disablePinning && displayDensity==='comfortable'">
1616
</igx-excel-style-pinning>
1717

18-
<igx-excel-style-hiding *ngIf="!column.disableHiding && grid.displayDensity==='comfortable'">
18+
<igx-excel-style-hiding *ngIf="!column?.disableHiding && displayDensity==='comfortable'">
1919
</igx-excel-style-hiding>
2020

21-
<igx-excel-style-selecting *ngIf="columnSelectable() && grid.displayDensity==='comfortable'">
21+
<igx-excel-style-selecting *ngIf="columnSelectable() && displayDensity==='comfortable'">
2222
</igx-excel-style-selecting>
2323
</ng-template>
2424

@@ -29,16 +29,15 @@
2929
<igx-excel-style-conditional-filter>
3030
</igx-excel-style-conditional-filter>
3131

32-
<igx-excel-style-search #excelStyleSearch>
32+
<igx-excel-style-search>
3333
</igx-excel-style-search>
3434
</ng-template>
3535

3636
<article #mainDropdown
37-
*ngIf="column"
3837
class="igx-excel-filter__menu"
3938
[ngClass]="{
40-
'igx-excel-filter__menu--cosy': grid.displayDensity === 'cosy',
41-
'igx-excel-filter__menu--compact': grid.displayDensity === 'compact'
39+
'igx-excel-filter__menu--cosy': displayDensity === 'cosy',
40+
'igx-excel-filter__menu--compact': displayDensity === 'compact'
4241
}"
4342
[id]="overlayComponentId"
4443
(keydown)="onKeyDown($event)"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ export class IgxGridExcelStyleFilteringComponent implements OnDestroy {
196196

197197
if (!this.inline) {
198198
let minHeight = 645;
199-
switch (this.grid.displayDensity) {
199+
switch (this.displayDensity) {
200200
case DisplayDensity.cosy: minHeight = 465; break;
201201
case DisplayDensity.compact: minHeight = 330; break;
202202
default: break;
@@ -392,7 +392,7 @@ export class IgxGridExcelStyleFilteringComponent implements OnDestroy {
392392
* @hidden @internal
393393
*/
394394
public columnSelectable() {
395-
return this.grid.columnSelection !== GridSelectionMode.none && this.column.selectable;
395+
return this.grid?.columnSelection !== GridSelectionMode.none && this.column?.selectable;
396396
}
397397

398398
/**

0 commit comments

Comments
 (0)