Skip to content

Commit 5392b6a

Browse files
committed
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular into ddincheva/copyBugFixs
2 parents f725049 + 6e4ec33 commit 5392b6a

25 files changed

+131
-51
lines changed

CHANGELOG.md

Lines changed: 7 additions & 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`
1919
- Added `onScroll` event, which is emitted when the grid is scrolled vertically or horizontally.
20+
- 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.
2021
- `igxTreeGrid`
2122
- Removed `onDataPreLoad` event as it is specific for remote virtualization implementation, which is not supported for the `igxTreeGrid`. A more generic `onScroll` event is exposed and can be used instead.
2223
- `IgxTimePicker`
@@ -96,6 +97,12 @@ The following example shows how you can use the Indigo theme:
9697
- `IgxSelect` support for `igxHint` directive added.
9798
- Allows the user to add `igxHint` to be displayed bellow the input element.
9899

100+
## 9.1.9
101+
102+
### New Features
103+
- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
104+
- Expose a setter for grid's `outlet` property, which can be used to set the outlet used to attach the grid's overlays to.
105+
99106
## 9.1.4
100107

101108
### New Features

projects/igniteui-angular/src/lib/core/styles/components/button-group/_button-group-theme.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,4 +319,3 @@
319319
@include ellipsis();
320320
}
321321
}
322-

projects/igniteui-angular/src/lib/core/styles/components/grid/_excel-filtering-theme.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,10 @@
407407
}
408408
}
409409

410+
igx-buttongroup {
411+
min-width: 30%;
412+
}
413+
410414
[igxButton='icon'] {
411415
margin-#{$left}: rem(16px);
412416
}

projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-component.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,14 @@
325325
@extend %grid-cell--cross-selected !optional;
326326
}
327327

328+
@include e(td, $m: bool) {
329+
@extend %igx-grid__td--bool !optional;
330+
}
331+
332+
@include e(td, $m: bool-true) {
333+
@extend %igx-grid__td--bool-true !optional;
334+
}
335+
328336
@include e(tr, $mods: (selected, filtered)) {
329337
@extend %grid-row--selected--filtered !optional;
330338
}

projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,6 +1139,23 @@
11391139
bottom: 0;
11401140
}
11411141

1142+
%igx-grid__td--bool {
1143+
justify-content: center;
1144+
1145+
igx-icon {
1146+
height: rem(18px);
1147+
width: rem(18px);
1148+
font-size: rem(18px);
1149+
color: igx-color($palette, 'grays', 500);
1150+
}
1151+
}
1152+
1153+
%igx-grid__td--bool-true {
1154+
igx-icon {
1155+
color: igx-color($palette, 'grays', 700);
1156+
}
1157+
}
1158+
11421159
%igx-grid__tr--edit {
11431160
border-bottom: 1px solid --var($theme, 'edit-mode-color');
11441161
position: relative;
@@ -1570,15 +1587,16 @@
15701587
}
15711588

15721589
%igx-grid__th--active {
1573-
%grid-cell-header,
1590+
@extend %grid-cell--active;
1591+
15741592
%igx-grid__th--selected,
15751593
%igx-grid__th--selectable {
1576-
@extend %grid-cell--active
1594+
@extend %grid-cell--active;
15771595
}
15781596
}
15791597

15801598
%igx-grid-summary--active {
1581-
@extend %grid-cell--active
1599+
@extend %grid-cell--active;
15821600
}
15831601

15841602
%igx-grid__th--sortable {

projects/igniteui-angular/src/lib/core/styles/themes/schemas/dark/_grid.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,9 @@ $_dark-indigo-grid: extend(
443443

444444
cell-selected-background: (
445445
igx-color: ('grays', 200),
446+
to-opaque: (
447+
igx-color: 'surface',
448+
)
446449
),
447450

448451
cell-selected-text-color: (

projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_grid.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,8 @@ $_indigo-grid: extend(
688688

689689
cell-selected-background: (
690690
igx-color: ('primary', 50),
691-
rgba: .5
691+
rgba: .5,
692+
to-opaque: #fff
692693
),
693694

694695
cell-active-border-color: (

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,15 @@
1010
[row]="rowData"
1111
[column]="this.column.field"
1212
[containerClass]="'igx-grid__td-text'"
13-
[metadata]="searchMetadata">{{ formatter ? (value | columnFormatter:formatter) : column.dataType === 'number' ? (value | igxdecimal:grid.locale) : column.dataType === 'date' ? (value | igxdate: grid.locale) : value }}</div>
13+
[metadata]="searchMetadata">{{ formatter ? (value | columnFormatter:formatter) :
14+
column.dataType === 'number' ?
15+
(value | igxdecimal:grid.locale) :
16+
column.dataType === 'date' ?
17+
(value | igxdate: grid.locale) :
18+
column.dataType === 'boolean' ? "" :
19+
value
20+
}}</div>
21+
<igx-icon *ngIf="column.dataType === 'boolean'">{{value ? 'check' : 'close'}}</igx-icon>
1422
</ng-template>
1523
<ng-template #inlineEditor let-cell="cell">
1624
<ng-container *ngIf="column.dataType === 'string'">
@@ -28,7 +36,7 @@
2836
[igxFocus]="true" [disableRipple]="true"></igx-checkbox>
2937
</ng-container>
3038
<ng-container *ngIf="column.dataType === 'date'">
31-
<igx-date-picker [style.width.%]="100" [outlet]="grid.outletDirective" mode="dropdown"
39+
<igx-date-picker [style.width.%]="100" [outlet]="grid.outlet" mode="dropdown"
3240
[locale]="grid.locale" [(value)]="editValue" [igxFocus]="true" [labelVisibility]="false">
3341
</igx-date-picker>
3442
</ng-container>

projects/igniteui-angular/src/lib/grids/cell.component.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,11 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
287287
return this.editMode || this.cellTemplate ? '' : this.value;
288288
}
289289

290+
@HostBinding('class.igx-grid__td--bool-true')
291+
public get booleanClass() {
292+
return this.column.dataType === 'boolean' && this.value;
293+
}
294+
290295
/**
291296
* Returns a reference to the nativeElement of the cell.
292297
* ```typescript

projects/igniteui-angular/src/lib/grids/common/grid.interface.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export interface GridType extends IGridDataBindable {
3030
selectionService: any;
3131
navigation: any;
3232
filteringService: any;
33-
outletDirective: any;
33+
outlet: any;
3434

3535
calcHeight: number;
3636

0 commit comments

Comments
 (0)