Skip to content

Commit f0101f4

Browse files
authored
Merge branch '19.2.x' into didimmova/fix-vhelper-dropdown-padding
2 parents b9b4fa6 + ed7f4f3 commit f0101f4

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -737,8 +737,7 @@
737737
igx-time-picker {
738738
position: relative;
739739
height: calc(100% - #{$editing-outline-width * 2});
740-
width: calc(100% - #{$editing-outline-width * 2}) !important;
741-
inset-inline-start: $editing-outline-width;
740+
width: 100% !important;
742741
overflow: hidden;
743742
}
744743

@@ -1514,6 +1513,9 @@
15141513
}
15151514

15161515
%igx-grid__td--bool {
1516+
display: flex;
1517+
flex-grow: 1;
1518+
15171519
igx-icon {
15181520
--component-size: #{if($variant == 'indigo', 2, 1)};
15191521
}
@@ -1783,7 +1785,6 @@
17831785
padding-inline-end: rem(4px) !important;
17841786

17851787
> igx-icon {
1786-
margin-inline-start: auto;
17871788
color: color($color: 'error');
17881789
width: var(--igx-icon-size, rem(18px));
17891790
height: var(--igx-icon-size, rem(18px));
@@ -1889,11 +1890,10 @@
18891890
%igx-grid__td--editing {
18901891
background: var-get($theme, 'cell-editing-background') !important;
18911892
box-shadow: inset 0 0 0 $editing-outline-width var-get($theme, 'edit-mode-color');
1892-
padding: 0 !important;
1893+
padding-inline: rem(4px);
18931894

18941895
&.igx-grid__td--invalid {
18951896
box-shadow: inset 0 0 0 rem(2px) color($color: 'error') !important;
1896-
padding-inline-end: rem(4px) !important;
18971897
}
18981898

18991899
&%grid-cell-number {
@@ -2084,7 +2084,7 @@
20842084

20852085
.sort-icon {
20862086
color: var-get($theme, 'header-selected-text-color');
2087-
2087+
20882088
::after {
20892089
background: var-get($theme, 'header-selected-background');
20902090
}
@@ -2112,15 +2112,15 @@
21122112
&%igx-grid-th--sorted {
21132113
.sort-icon {
21142114
color: var-get($theme, 'header-selected-text-color');
2115-
2115+
21162116
> igx-icon {
21172117
color: inherit;
21182118
}
21192119

21202120
&:focus,
21212121
&:hover {
21222122
color: var-get($theme, 'header-selected-text-color');
2123-
2123+
21242124
> igx-icon {
21252125
color: inherit;
21262126
}
@@ -2177,14 +2177,14 @@
21772177
.sort-icon {
21782178
opacity: 1;
21792179
color: var-get($theme, 'sorted-header-icon-color');
2180-
2180+
21812181
> igx-icon {
21822182
color: inherit;
21832183
}
21842184

21852185
&:hover {
21862186
color: var-get($theme, 'sortable-header-icon-hover-color');
2187-
2187+
21882188
> igx-icon {
21892189
color: inherit;
21902190
}
@@ -2220,6 +2220,7 @@
22202220
%grid-cell-number {
22212221
text-align: $grid-cell-align-num;
22222222
justify-content: flex-end;
2223+
flex-grow: 1;
22232224

22242225
%grid-cell-header-icons {
22252226
justify-content: flex-start;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<div
99
igxTextHighlight class="igx-grid__td-text"
1010
[cssClass]="highlightClass"
11+
[class.igx-grid__td--number]="column.dataType === 'number' || column.dataType === 'percent' || column.dataType === 'currency'"
1112
[activeCssClass]="activeHighlightClass"
1213
[groupName]="gridID"
1314
[value]="formatter ? (value | columnFormatter:formatter:rowData)
@@ -32,11 +33,13 @@
3233
}
3334

3435
@if (column.dataType === 'boolean' && !this.formatter) {
36+
<div [class.igx-grid__td--bool]="column.dataType === 'boolean'">
3537
<igx-icon
3638
family="default"
3739
[name]="value ? 'confirm' : 'close'"
3840
[ngClass]="{ 'igx-icon--success': value, 'igx-icon--error': !value }">
3941
</igx-icon>
42+
</div>
4043
}
4144
@if (column.dataType === 'image') {
4245
<img [src]="value" [alt]="value | igxCellImageAlt" />

projects/igniteui-angular/src/lib/grids/grid/grid-validation.service.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ export class IgxGridValidationService {
3636
owner: this.grid
3737
};
3838
this.grid.formGroupCreated.emit(args);
39+
formGroup.patchValue(data);
3940
this.add(rowId, formGroup);
4041
} else {
4142
// reset to pristine.

0 commit comments

Comments
 (0)