Skip to content

Commit 0f98b9d

Browse files
Volen99Volen99
committed
fix(grid): fix unnecessary empty div #8978 
1 parent 2b4497d commit 0f98b9d

File tree

3 files changed

+15
-22
lines changed

3 files changed

+15
-22
lines changed

‎projects/igniteui-angular/src/lib/grids/cell.component.html

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
>
99
</ng-template>
1010
<ng-template #defaultCell>
11-
<div
11+
<div *ngIf="column.dataType !== 'boolean' || (column.dataType === 'boolean' && this.formatter)"
1212
igxTextHighlight
1313
class="igx-grid__td-text"
1414
style="pointer-events: none;"
@@ -26,8 +26,6 @@
2626
? (value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale)
2727
: column.dataType === 'percent'
2828
? (value | percent:column.pipeArgs.digitsInfo:grid.locale)
29-
: column.dataType === 'boolean'
30-
? ''
3129
: value
3230
"
3331
[row]="rowData"
@@ -45,8 +43,6 @@
4543
? (value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale)
4644
: column.dataType === 'percent'
4745
? (value | percent:column.pipeArgs.digitsInfo:grid.locale)
48-
: column.dataType === 'boolean'
49-
? ''
5046
: value
5147
}}</div>
5248
<igx-icon
@@ -56,16 +52,16 @@
5652
>
5753
</ng-template>
5854
<ng-template #addRowCell let-cell="cell">
59-
<div igxTextHighlight class="igx-grid__td-text" style="pointer-events: none"
55+
<div *ngIf="column.dataType !== 'boolean' || (column.dataType === 'boolean' && this.formatter)"
56+
igxTextHighlight class="igx-grid__td-text" style="pointer-events: none"
6057
[cssClass]="highlightClass"
6158
[activeCssClass]="activeHighlightClass"
6259
[groupName]="gridID"
6360
[value]="formatter ? (value | columnFormatter:formatter:rowData) : column.dataType === 'number' ?
6461
(value | number:column.pipeArgs.digitsInfo:grid.locale) : (column.dataType === 'date' || column.dataType === 'time' || column.dataType === 'dateTime') ?
6562
(value | date:column.pipeArgs.format:column.pipeArgs.timezone:grid.locale) : column.dataType === 'currency' ?
6663
(value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'percent' ?
67-
(value | percent:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'boolean' ?
68-
'' : value"
64+
(value | percent:column.pipeArgs.digitsInfo:grid.locale) : value"
6965
[row]="rowData"
7066
[column]="this.column.field"
7167
[containerClass]="'igx-grid__td-text'"

‎projects/igniteui-angular/src/lib/grids/grid/expandable-cell.component.html

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<igx-chip *ngIf="displayPinnedChip" class="igx-grid__td--pinned-chip" [disabled]="true" [displayDensity]="'compact'">{{ grid.resourceStrings.igx_grid_pinned_row_indicator }}</igx-chip>
33
</ng-template>
44
<ng-template #defaultCell>
5-
<div igxTextHighlight class="igx-grid__td-text" style="pointer-events: none"
5+
<div *ngIf="column.dataType !== 'boolean' || (column.dataType === 'boolean' && this.formatter)"
6+
igxTextHighlight class="igx-grid__td-text" style="pointer-events: none"
67
[cssClass]="highlightClass"
78
[activeCssClass]="activeHighlightClass"
89
[groupName]="gridID"
@@ -15,8 +16,6 @@
1516
? (value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale)
1617
: column.dataType === 'percent'
1718
? (value | percent:column.pipeArgs.digitsInfo:grid.locale)
18-
: column.dataType === 'boolean'
19-
? ''
2019
: value"
2120
[row]="rowData"
2221
[column]="this.column.field"
@@ -25,8 +24,7 @@
2524
? (value | number:column.pipeArgs.digitsInfo:grid.locale) : (column.dataType === 'date' || column.dataType === 'time' || column.dataType === 'dateTime')
2625
? (value | date:column.pipeArgs.format:column.pipeArgs.timezone:grid.locale) : column.dataType === 'currency'
2726
? (value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'percent'
28-
? (value | percent:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'boolean'
29-
? '' : value}}</div>
27+
? (value | percent:column.pipeArgs.digitsInfo:grid.locale) : value}}</div>
3028

3129
<igx-icon
3230
*ngIf="column.dataType === 'boolean' && !this.formatter"
@@ -35,16 +33,16 @@
3533
>
3634
</ng-template>
3735
<ng-template #addRowCell let-cell="cell">
38-
<div igxTextHighlight class="igx-grid__td-text" style="pointer-events: none"
36+
<div *ngIf="column.dataType !== 'boolean' || (column.dataType === 'boolean' && this.formatter)"
37+
igxTextHighlight class="igx-grid__td-text" style="pointer-events: none"
3938
[cssClass]="highlightClass"
4039
[activeCssClass]="activeHighlightClass"
4140
[groupName]="gridID"
4241
[value]="formatter ? (value | columnFormatter:formatter:rowData) : column.dataType === 'number' ?
4342
(value | number:column.pipeArgs.digitsInfo:grid.locale) : (column.dataType === 'date' || column.dataType === 'time' || column.dataType === 'dateTime') ?
4443
(value | date:column.pipeArgs.format:column.pipeArgs.timezone:grid.locale) : column.dataType === 'currency'?
4544
(value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'percent' ?
46-
(value | percent:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'boolean' ?
47-
'' : value"
45+
(value | percent:column.pipeArgs.digitsInfo:grid.locale) : value"
4846
[row]="rowData"
4947
[column]="this.column.field"
5048
[containerClass]="'igx-grid__td-text'"

‎projects/igniteui-angular/src/lib/grids/tree-grid/tree-cell.component.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
>
99
</ng-template>
1010
<ng-template #defaultCell>
11-
<div
11+
<div *ngIf="column.dataType !== 'boolean' || (column.dataType === 'boolean' && this.formatter)"
1212
igxTextHighlight
1313
class="igx-grid__td-text"
1414
style="pointer-events: none;"
@@ -43,8 +43,6 @@
4343
? (value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale)
4444
: column.dataType === 'percent'
4545
? (value | percent:column.pipeArgs.digitsInfo:grid.locale)
46-
: column.dataType === 'boolean'
47-
? ''
4846
: value
4947
}}</div>
5048
<igx-icon
@@ -54,16 +52,17 @@
5452
>
5553
</ng-template>
5654
<ng-template #addRowCell let-cell="cell">
57-
<div igxTextHighlight class="igx-grid__td-text" style="pointer-events: none"
55+
<div *ngIf="column.dataType !== 'boolean' || (column.dataType === 'boolean' && this.formatter)"
56+
igxTextHighlight class="igx-grid__td-text"
57+
style="pointer-events: none"
5858
[cssClass]="highlightClass"
5959
[activeCssClass]="activeHighlightClass"
6060
[groupName]="gridID"
6161
[value]="formatter ? (value | columnFormatter:formatter:rowData) : column.dataType === 'number' ?
6262
(value | number:column.pipeArgs.digitsInfo:grid.locale) : (column.dataType === 'date' || column.dataType === 'time' || column.dataType === 'dateTime') ?
6363
(value | date:column.pipeArgs.format:column.pipeArgs.timezone:grid.locale) : column.dataType === 'currency'?
6464
(value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'percent' ?
65-
(value | percent:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'boolean' ?
66-
'' : value"
65+
(value | percent:column.pipeArgs.digitsInfo:grid.locale) : value"
6766
[row]="rowData"
6867
[column]="this.column.field"
6968
[containerClass]="'igx-grid__td-text'"

0 commit comments

Comments
 (0)