chore(*): Resolve merge conflict

CHANGELOG.md

@@ -11,10 +11,42 @@ All notable changes for each version of this project will be documented in this
 - `IgxIconModule`:
     - **Breaking change** `igxIconService` is now provided in root (providedIn: 'root') and `IgxIconModule.forRoot()` method is deprecated.
     - **Breaking change** `glyphName` property of the `igxIconComponent` is deprecated.
+- `IgxMask`:
+    - `placeholder` input property is added to allow developers to specify the placeholder attribute of the host input element that the `igxMask` is applied on;
+    - `displayValuePipe` input property is provided that allows developers to additionally transform the value on blur;
+    - `focusedValuePipe` input property is provided that allows developers to additionally transform the value on focus;
 - `IgxTreeGrid`:
+    - Batch editing - an injectable transaction provider accumulates pending changes, which are not directly applied to the grid's data source. Those can later be inspected, manipulated and submitted at once. Changes are collected for individual cells or rows, depending on editing mode, and accumulated per data row/record.
     - You can now export the tree grid both to CSV and Excel.
     - The hierarchy and the records' expanded states would be reflected in the exported Excel worksheet.
 
+## 7.0.3
+### Bug fixes
+
+- ng add igniteui-angular adds igniteui-cli package to both dependencies and devDependencies ([#3254](https://github.com/IgniteUI/igniteui-angular/issues/3254))
+- Group column header is not styled correctly when moving that column ([#3072](https://github.com/IgniteUI/igniteui-angular/issues/3072))
+- igx-grid: Filter row remains after disabling filtering feature ([#3255](https://github.com/IgniteUI/igniteui-angular/issues/3255))
+- [igxGrid] Keyboard navigation between cells and filtering row with MCH ([#3179](https://github.com/IgniteUI/igniteui-angular/issues/3179))
+- Argument $color of red($color) must be a color ([#3190](https://github.com/IgniteUI/igniteui-angular/issues/3190))
+- Shell strings localization ([#3237](https://github.com/IgniteUI/igniteui-angular/issues/3237))
+- Tabbing out of the combo search input not possible ([#3200](https://github.com/IgniteUI/igniteui-angular/issues/3200))
+- Localization (i18n) not available for inputs/buttons on the grid filtering dialog ([#2517](https://github.com/IgniteUI/igniteui-angular/issues/2517))
+- When in the tree grid are pinned columns and scroll horizontal the cells text is over the pinned text #3163
+- Request for update of shell strings in Japanese ([#3163](https://github.com/IgniteUI/igniteui-angular/issues/3163))
+- Refactor(themes): remove get-function calls ([#3327](https://github.com/IgniteUI/igniteui-angular/issues/3327))
+- Fix(grid): recalculate grid body size when changing allowFiltering dynamically ([#3321](https://github.com/IgniteUI/igniteui-angular/issues/3321))
+- Fix - Combo - Hide Search input when !filterable && !allowCustomValues - 7.0.x ([#3314](https://github.com/IgniteUI/igniteui-angular/issues/3314))
+- Fixing column chooser column updating - 7.0.x ([#3235](https://github.com/IgniteUI/igniteui-angular/issues/3235))
+- Disable combo checkbox animations on scroll ([#3303](https://github.com/IgniteUI/igniteui-angular/issues/3303))
+- Added validation if last column collides with grid's scroll. ([#3028](https://github.com/IgniteUI/igniteui-angular/issues/3028)) ([#3100](https://github.com/IgniteUI/igniteui-angular/issues/3100))
+- Use value instead of ngModel to update editValue for checkbox and calendar in igxCell ([#3225](https://github.com/IgniteUI/igniteui-angular/issues/3225))
+- Add @inheritdoc, create ScrollStrategy abstract class and fix method signatures 7.0.x ([#3222](https://github.com/IgniteUI/igniteui-angular/issues/3222))
+- When scroll with the mouse wheel the value in datePicker editor for edited cell is empty ([#2958](https://github.com/IgniteUI/igniteui-angular/issues/2958))
+- igxToolbar should have the option to add custom template ([#2983](https://github.com/IgniteUI/igniteui-angular/issues/2983))
+- fix(grid): mark grid for check inside NgZone when resizing ([#2792](https://github.com/IgniteUI/igniteui-angular/issues/2792)) ([#3277](https://github.com/IgniteUI/igniteui-angular/issues/3277))
+- IgxGridHeaderGroupComponent should have preset min width ([#3071](https://github.com/IgniteUI/igniteui-angular/issues/3071))
+- Tree grid selection ([#3334](https://github.com/IgniteUI/igniteui-angular/issues/3334))
+
 ## 7.0.2
 ### Features
 - `ng add igniteui-angular` support :tada:

projects/igniteui-angular/src/lib/core/selection.ts

@@ -208,7 +208,7 @@ export class IgxSelectionAPIService {
      * @returns If all items are selected.
      */
     public are_all_selected(componentID: string, dataCount: number): boolean {
-        return this.size(componentID) === dataCount;
+        return dataCount > 0 && dataCount === this.size(componentID);
     }
 
     /**

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

@@ -104,14 +104,9 @@
         display: flex;
         flex-direction: column;
         flex: 1 1 0%;
-        border-left: 1px solid --var($theme, 'border-color');
         padding: map-get($summary-padding, 'comfortable');
         background: --var($theme, 'background-color');
         overflow: hidden;
-
-        &:first-of-type {
-            border-left: 0;
-        }
     }
 
     %igx-grid-summary--cosy {
@@ -135,10 +130,6 @@
         border-right: map-get($cell-pin, 'style') map-get($cell-pin, 'color');
     }
 
-    %igx-grid-summary--empty {
-        border-left: 1px solid --var($theme, 'border-color');
-    }
-
     %igx-grid-summary__item {
         display: flex;
         align-items: center;

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

@@ -86,6 +86,15 @@
         }
     }
 
+    @include e(summaries, $m: 'body') {
+        @extend %grid-summaries !optional;
+        @extend %grid-summaries--body !optional;
+
+        igx-display-container {
+            @extend %grid-display-container-tr !optional;
+        }
+    }
+
     @include e(summaries-patch) {
         @extend %grid-summaries-patch !optional;
     }

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

@@ -61,6 +61,11 @@
 /// @param {Color} $filtering-row-background [null] - The background color of the filtering row.
 /// @param {Color} $filtering-row-text-color [null] - The text-color color of the filtering row.
 ///
+/// @param {Color} $body-summaries-background [null] - The background color of the summary groups located the body.
+/// @param {Color} $body-summaries-text-color [null] - The text color of the summary results located the body.
+/// @param {Color} $root-summaries-background [null] - The background color of the summary groups located the footer.
+/// @param {Color} $root-summaries-text-color [null] - The text color of the summary results located the footer.
+///
 /// @requires $default-palette
 /// @requires $light-schema
 /// @requires apply-palette
@@ -139,7 +144,12 @@
     $filtering-header-text-color: null,
     $filtering-row-background: null,
     $filtering-row-text-color: null,
-    $tree-filtered-text-color: null
+    $tree-filtered-text-color: null,
+
+    $body-summaries-background: null,
+    $body-summaries-text-color: null,
+    $root-summaries-background: null,
+    $root-summaries-text-color: null
 ) {
     $name: 'igx-grid';
     $theme: apply-palette(map-get($schema, $name), $palette);
@@ -283,6 +293,14 @@
         $filtering-row-text-color: text-contrast(hexrgba($filtering-row-background));
     }
 
+    @if not($body-summaries-text-color) and $body-summaries-background {
+        $body-summaries-text-color: text-contrast($body-summaries-background);
+    }
+
+    @if not($root-summaries-text-color) and $root-summaries-background {
+        $root-summaries-text-color: text-contrast($root-summaries-background);
+    }
+
     @return extend($theme, (
         name: $name,
         palette: $palette,
@@ -358,7 +376,12 @@
 
         tree-filtered-text-color: $tree-filtered-text-color,
         tree-selected-filtered-row-text-color: $tree-selected-filtered-row-text-color,
-        tree-selected-filtered-cell-text-color: $tree-selected-filtered-cell-text-color
+        tree-selected-filtered-cell-text-color: $tree-selected-filtered-cell-text-color,
+
+        body-summaries-background: $body-summaries-background,
+        body-summaries-text-color: $body-summaries-text-color,
+        root-summaries-background: $root-summaries-background,
+        root-summaries-text-color: $root-summaries-text-color
     ));
 }
 
@@ -614,7 +637,7 @@
     }
 
     %grid-scroll-start {
-        background: igx-color($palette, 'grays', 200);
+        background: --var($theme, 'header-background');
     }
 
     %grid-scroll-main {
@@ -1023,13 +1046,33 @@
 
     %grid-summaries {
         display: flex;
-        background: inherit;
+        background: --var($theme, 'root-summaries-background');
+
+        // %igx-grid-summary__label,
+        %igx-grid-summary__result {
+            color: --var($theme, 'root-summaries-text-color');
+        }
+    }
+
+    %grid-summaries--body {
+        background: --var($theme, 'body-summaries-background');
+        border-bottom: 1px dashed --var($theme, 'row-border-color');
+
+        &:last-of-type {
+            border-bottom: none;
+        }
+
+        // %igx-grid-summary__label,
+        %igx-grid-summary__result {
+            color: --var($theme, 'body-summaries-text-color');
+        }
     }
 
     %grid-summaries-patch {
         background: inherit;
         position: relative;
         z-index: 1;
+        border-right: 1px solid --var($theme, 'header-border-color');
     }
 
     // Column moving

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

@@ -22,6 +22,10 @@
 /// @prop {Map} group-row-selected-background [igx-color: ('grays', 200), hexrgba: #222] - The drop area background on drop color.
 /// @prop {Color} filtering-header-background [#222] - The background color of the filtered column header.
 /// @prop {Color} filtering-row-background [#222] - The background color of the filtering row.
+/// @prop {Map} body-summaries-background [igx-color: ('grays', 300), hexrgba: #222] - The background color of the summary groups located the body.
+/// @prop {Map} body-summaries-text-color [igx-color: ('grays', 300), hexrgba: #222, text-contrast: ()] - The text color of the summary groups located the body.
+/// @prop {Map} root-summaries-background [igx-color: ('grays', 100), hexrgba: #222] - The background color of the summary groups located the footer.
+/// @prop {Map} root-summaries-text-color [igx-color: ('grays', 100), hexrgba: #222, text-contrast: ()] - The text color of the summary groups located the footer.
 /// @requires extend
 /// @requires $_light-grid
 /// @see $default-palette
@@ -75,5 +79,27 @@ $_dark-grid: extend($_light-grid, (
 
     filtering-row-background: #222,
 
-    cell-selected-text-color: #fff
+    cell-selected-text-color: #fff,
+
+    body-summaries-background: (
+        igx-color: ('grays', 100),
+        hexrgba: #222
+    ),
+
+    body-summaries-text-color: (
+        igx-color: ('grays', 100),
+        hexrgba: #222,
+        text-contrast: ()
+    ),
+
+    root-summaries-background: (
+        igx-color: ('grays', 300),
+        hexrgba: #222
+    ),
+
+    root-summaries-text-color: (
+        igx-color: ('grays', 300),
+        hexrgba: #222,
+        text-contrast: ()
+    )
 ));

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

@@ -54,6 +54,10 @@
 /// @prop {Map} filtering-header-text-color [igx-color: ('grays', 800)] - The text color color of the filtered column header.
 /// @prop {Color} filtering-row-background [#fff] - The background color of the filtering row.
 /// @prop {Map} filtering-row-text-color [igx-color: ('grays', 800)] - The text-color color of the filtering row.
+/// @prop {Map} body-summaries-background [igx-color: ('grays', 300), hexrgba: #fff] - The background color of the summary groups located the body.
+/// @prop {Map} body-summaries-text-color [igx-color: ('grays', 300), hexrgba: #fff, text-contrast: ()] - The text color of the summary groups located the body.
+/// @prop {Map} root-summaries-background [igx-color: ('grays', 100), hexrgba: #fff] - The background color of the summary groups located the footer.
+/// @prop {Map} root-summaries-text-color [igx--color: ('grays', 100), hexrgba: #fff, text-contrast: ()] - The text color of the summary groups located the footer.
 /// @see $default-palette
 $_light-grid: (
     header-background: (
@@ -239,5 +243,27 @@ $_light-grid: (
 
     tree-filtered-text-color: (
         igx-color: ('grays', 500)
+    ),
+
+    body-summaries-background: (
+        igx-color: ('grays', 100),
+        hexrgba: #fff
+    ),
+
+    body-summaries-text-color: (
+        igx-color: ('grays', 100),
+        hexrgba: #fff,
+        text-contrast: ()
+    ),
+
+    root-summaries-background: (
+        igx-color: ('grays', 300),
+        hexrgba: #fff
+    ),
+
+    root-summaries-text-color: (
+        igx-color: ('grays', 300),
+        hexrgba: #fff,
+        text-contrast: ()
     )
 );

projects/igniteui-angular/src/lib/core/utils.ts

@@ -24,13 +24,11 @@ export function cloneHierarchicalArray(array: any[], childDataKey: any): any[] {
     }
 
     for (const item of array) {
+        const clonedItem = cloneValue(item);
         if (Array.isArray(item[childDataKey])) {
-            const clonedItem = cloneValue(item);
             clonedItem[childDataKey] = cloneHierarchicalArray(clonedItem[childDataKey], childDataKey);
-            result.push(clonedItem);
-        } else {
-            result.push(item);
         }
+        result.push(clonedItem);
     }
     return result;
 }