Merge branch 'master' into PMiteva/combo_case_sensitive_filtering

Lipata · web-flow · commit 765baecf2c81 · 2020-07-28T14:08:04.000+03:00
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/button-group/_button-group-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/button-group/_button-group-theme.scss
@@ -319,4 +319,3 @@
         @include ellipsis();
     }
 }
-
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/grid/_excel-filtering-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/grid/_excel-filtering-theme.scss
@@ -407,6 +407,10 @@
             }
         }
 
+        igx-buttongroup {
+            min-width: 30%;
+        }
+
         [igxButton='icon'] {
             margin-#{$left}: rem(16px);
         }
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss
@@ -1587,15 +1587,16 @@
     }
 
     %igx-grid__th--active {
-        %grid-cell-header,
+        @extend %grid-cell--active;
+
         %igx-grid__th--selected,
         %igx-grid__th--selectable {
-            @extend %grid-cell--active
+            @extend %grid-cell--active;
         }
     }
 
     %igx-grid-summary--active {
-        @extend %grid-cell--active
+        @extend %grid-cell--active;
     }
 
     %igx-grid__th--sortable {
diff --git a/projects/igniteui-angular/src/lib/core/styles/themes/schemas/dark/_grid.scss b/projects/igniteui-angular/src/lib/core/styles/themes/schemas/dark/_grid.scss
@@ -443,6 +443,9 @@ $_dark-indigo-grid: extend(
 
         cell-selected-background: (
             igx-color: ('grays', 200),
+            to-opaque: (
+                igx-color: 'surface',
+            )
         ),
 
         cell-selected-text-color: (
diff --git a/projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_grid.scss b/projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_grid.scss
@@ -688,7 +688,8 @@ $_indigo-grid: extend(
 
         cell-selected-background: (
             igx-color: ('primary', 50),
-            rgba: .5
+            rgba: .5,
+            to-opaque: #fff
         ),
 
         cell-active-border-color: (
diff --git a/projects/igniteui-angular/src/lib/grids/common/pipes.ts b/projects/igniteui-angular/src/lib/grids/common/pipes.ts
@@ -265,7 +265,7 @@ export class IgxStringReplacePipe implements PipeTransform {
 @Pipe({ name: 'transactionState' })
 export class IgxGridTransactionStatePipe implements PipeTransform {
 
-    transform(row_id: any, field: string, rowEditable: boolean, transactions: any, _: any) {
+    transform(row_id: any, field: string, rowEditable: boolean, transactions: any, _: any, __: any) {
         if (rowEditable) {
             const rowCurrentState = transactions.getAggregatedValue(row_id, false);
             if (rowCurrentState) {
diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-row.component.html b/projects/igniteui-angular/src/lib/grids/grid/grid-row.component.html
@@ -88,7 +88,7 @@
 <ng-template #cellTemplate let-col>
         <igx-grid-cell
         class="igx-grid__td igx-grid__td--fw"
-        [class.igx-grid__td--edited]="rowID | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger"
+        [class.igx-grid__td--edited]="rowID | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger:grid.crudService.cell"
         [attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"
         [class.igx-grid__td--pinned]="col.pinned"
         [class.igx-grid__td--number]="col.dataType === 'number'"
@@ -124,7 +124,7 @@
         [class.igx-grid__td--pinned]="col.pinned"
         [attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"
         class="igx-grid__td igx-grid__td--fw igx-grid__td--tree-cell"
-        [class.igx-grid__td--edited]="rowID | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger"
+        [class.igx-grid__td--edited]="rowID | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger:grid.crudService.cell"
         [class.igx-grid__td--number]="col.dataType === 'number' && col.visibleIndex !== 0"
         [ngClass]="col.cellClasses | igxCellStyleClasses:rowData[col.field]:rowData:col.field:viewIndex:grid.pipeTrigger"
         [ngStyle]="col.cellStyles | igxCellStyles:rowData[col.field]:rowData:col.field:viewIndex:grid.pipeTrigger"
@@ -154,7 +154,7 @@
 <ng-template #mrlCellTemplate let-col>
     <igx-grid-cell
         class="igx-grid__td igx-grid__td--fw"
-        [class.igx-grid__td--edited]="rowID | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger"
+        [class.igx-grid__td--edited]="rowID | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger:grid.crudService.cell"
         [attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"
         [class.igx-grid__td--pinned]="col.pinned"
         [class.igx-grid__td--number]="col.dataType === 'number'"
@@ -190,7 +190,7 @@
 <ng-template #mrlExpandableCellTemplate let-col>
     <igx-expandable-grid-cell
         class="igx-grid__td igx-grid__td--fw igx-grid__td--tree-cell"
-        [class.igx-grid__td--edited]="rowID | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger"
+        [class.igx-grid__td--edited]="rowID | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger:grid.crudService.cell"
         [attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"
         [class.igx-grid__td--pinned]="col.pinned"
         [class.igx-grid__td--number]="col.dataType === 'number' && col.visibleIndex !== 0"
diff --git a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-row.component.html b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-row.component.html
@@ -40,7 +40,7 @@
 <ng-template igxGridFor let-col [igxGridForOf]="unpinnedColumns | igxNotGrouped" [igxForScrollContainer]="grid.parentVirtDir" let-colIndex="index" [igxForSizePropName]='"calcPixelWidth"' [igxForScrollOrientation]="'horizontal'" [igxForContainerSize]='grid.unpinnedWidth' [igxForTrackBy]='grid.trackColumnChanges' #igxDirRef>
     <igx-hierarchical-grid-cell
         class="igx-grid__td igx-grid__td--fw"
-        [class.igx-grid__td--edited]="rowID | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger"
+        [class.igx-grid__td--edited]="rowID | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger:grid.crudService.cell"
         [attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"
         [class.igx-grid__td--number]="col.dataType === 'number'"
         [class.igx-grid__td--bool]="col.dataType === 'boolean'"
@@ -87,7 +87,7 @@
 <ng-template #pinnedCellsTemplate let-col>
     <igx-hierarchical-grid-cell *ngFor="let col of pinnedColumns | igxNotGrouped"
         class="igx-grid__td igx-grid__td--fw igx-grid__td--pinned"
-        [class.igx-grid__td--edited]="rowID | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger"
+        [class.igx-grid__td--edited]="rowID | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger:grid.crudService.cell"
         [attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"
         [class.igx-grid__td--number]="col.dataType === 'number'"
         [ngClass]="col.cellClasses | igxCellStyleClasses:rowData[col.field]:rowData:col.field:viewIndex:grid.pipeTrigger"
diff --git a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-row.component.html b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-row.component.html
@@ -18,7 +18,7 @@
     <ng-template #cellTemplate>
         <igx-grid-cell
             class="igx-grid__td igx-grid__td--fw"
-            [class.igx-grid__td--edited]="rowID | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger"
+            [class.igx-grid__td--edited]="rowID | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger:grid.crudService.cell"
             [attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"
             [class.igx-grid__td--number]="col.dataType === 'number'"
             [class.igx-grid__td--bool]="col.dataType === 'boolean'"
@@ -47,7 +47,7 @@
     <ng-template #treeCellTemplate>
         <igx-tree-grid-cell
             class="igx-grid__td igx-grid__td--fw igx-grid__td--tree-cell"
-            [class.igx-grid__td--edited]="rowID | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger"
+            [class.igx-grid__td--edited]="rowID | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger:grid.crudService.cell"
             [attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"
             [class.igx-grid__td--number]="col.dataType === 'number' && col.visibleIndex !== 0"
             [ngClass]="col.cellClasses | igxCellStyleClasses:rowData[col.field]:rowData:col.field:viewIndex:grid.pipeTrigger"
@@ -100,7 +100,7 @@
         <ng-template #cellTemplate>
             <igx-grid-cell
                 class="igx-grid__td igx-grid__td--fw igx-grid__td--pinned"
-                [class.igx-grid__td--edited]="rowID | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger"
+                [class.igx-grid__td--edited]="rowID | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger:grid.crudService.cell"
                 [attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"
                 [class.igx-grid__td--number]="col.dataType === 'number'"
                 [ngClass]="col.cellClasses | igxCellStyleClasses:rowData[col.field]:rowData:col.field:viewIndex:grid.pipeTrigger"
@@ -131,7 +131,7 @@
         <ng-template #treeCellTemplate>
             <igx-tree-grid-cell
                 class="igx-grid__td igx-grid__td--fw igx-grid__td--tree-cell igx-grid__td--pinned"
-                [class.igx-grid__td--edited]="rowID | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger"
+                [class.igx-grid__td--edited]="rowID | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger:grid.crudService.cell"
                 [attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"
                 [class.igx-grid__td--number]="col.dataType === 'number' && col.visibleIndex !== 0"
                 [ngClass]="col.cellClasses | igxCellStyleClasses:rowData[col.field]:rowData:col.field:viewIndex:grid.pipeTrigger"

Original file line number	Diff line number	Diff line change
`@@ -319,4 +319,3 @@`
`319`	`319`	`@include ellipsis();`
`320`	`320`	`}`
`321`	`321`	`}`
`322`		`-`
Original file line number	Diff line number	Diff line change
`@@ -407,6 +407,10 @@`
`407`	`407`	`}`
`408`	`408`	`}`
`409`	`409`
	`410`	`+ igx-buttongroup {`
	`411`	`+ min-width: 30%;`
	`412`	`+ }`
	`413`	`+`
`410`	`414`	`[igxButton='icon'] {`
`411`	`415`	`margin-#{$left}: rem(16px);`
`412`	`416`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1587,15 +1587,16 @@`
`1587`	`1587`	`}`
`1588`	`1588`
`1589`	`1589`	`%igx-grid__th--active {`
`1590`		`- %grid-cell-header,`
	`1590`	`+ @extend %grid-cell--active;`
	`1591`	`+`
`1591`	`1592`	`%igx-grid__th--selected,`
`1592`	`1593`	`%igx-grid__th--selectable {`
`1593`		`- @extend %grid-cell--active`
	`1594`	`+ @extend %grid-cell--active;`
`1594`	`1595`	`}`
`1595`	`1596`	`}`
`1596`	`1597`
`1597`	`1598`	`%igx-grid-summary--active {`
`1598`		`- @extend %grid-cell--active`
	`1599`	`+ @extend %grid-cell--active;`
`1599`	`1600`	`}`
`1600`	`1601`
`1601`	`1602`	`%igx-grid__th--sortable {`