Mass merging 20.1.x to master

package.json

@@ -75,7 +75,7 @@
     "@types/source-map": "0.5.2",
     "express": "^5.1.0",
     "fflate": "^0.8.1",
-    "igniteui-theming": "^20.0.0",
+    "igniteui-theming": "^21.0.2",
     "igniteui-trial-watermark": "^3.1.0",
     "lodash-es": "^4.17.21",
     "rxjs": "^7.8.2",
@@ -120,7 +120,7 @@
     "hammerjs": "^2.0.8",
     "ig-typedoc-theme": "^6.0.0",
     "igniteui-dockmanager": "^1.17.0",
-    "igniteui-sassdoc-theme": "^2.0.2",
+    "igniteui-sassdoc-theme": "^2.1.0",
     "igniteui-webcomponents": "6.2.1",
     "jasmine": "^5.6.0",
     "jasmine-core": "^5.6.0",

projects/igniteui-angular-elements/src/app/custom-strategy.spec.ts

@@ -49,14 +49,14 @@ describe('Elements: ', () => {
             gridEl.appendChild(columnEl);
 
             // TODO: Better way to wait - potentially expose the queue or observable for update on the strategy
-            await firstValueFrom(timer(10 /* SCHEDULE_DELAY */ * 2));
+            await firstValueFrom(timer(10 /* SCHEDULE_DELAY */ * 4));
 
             const gridComponent = (await gridEl.ngElementStrategy[ComponentRefKey]).instance as IgxGridComponent;
             const columnComponent = (await columnEl.ngElementStrategy[ComponentRefKey]).instance as IgxColumnComponent;
             expect(gridComponent.columnList.toArray()).toContain(columnComponent);
 
             columnEl.remove();
-            await firstValueFrom(timer(10 /* SCHEDULE_DELAY: DESTROY + QUERY */ * 3));
+            await firstValueFrom(timer(10 /* SCHEDULE_DELAY: DESTROY + QUERY */ * 4));
             expect(gridComponent.columnList.toArray()).toEqual([]);
         });
 

projects/igniteui-angular-elements/src/public_api.ts

@@ -12,7 +12,7 @@ import { IgxPivotDateDimension } from 'projects/igniteui-angular/src/lib/grids/p
 import { PivotDimensionType } from 'projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.interface';
 import { IgxDateSummaryOperand, IgxNumberSummaryOperand, IgxSummaryOperand, IgxTimeSummaryOperand } from 'projects/igniteui-angular/src/lib/grids/summaries/grid-summary';
 import { HorizontalAlignment, VerticalAlignment } from 'projects/igniteui-angular/src/lib/services/overlay/utilities';
-import { ByLevelTreeGridMergeStrategy } from 'projects/igniteui-angular/src/lib/data-operations/merge-strategy';
+import { ByLevelTreeGridMergeStrategy, DefaultTreeGridMergeStrategy } from 'projects/igniteui-angular/src/lib/data-operations/merge-strategy';
 
 /** Export Public API, TODO: reorganize, Generate all w/ renames? */
 export {
@@ -35,6 +35,7 @@ export {
 
     NoopSortingStrategy as IgcNoopSortingStrategy,
     NoopFilteringStrategy as IgcNoopFilteringStrategy,
+    DefaultTreeGridMergeStrategy as IgcDefaultTreeGridMergeStrategy,
     ByLevelTreeGridMergeStrategy as IgcByLevelTreeGridMergeStrategy,
 
     // Pivot API

projects/igniteui-angular-elements/src/themes/_util.scss

@@ -72,9 +72,8 @@ $elements-selector-prefix: 'igc';
 /// @return {String} - Updated selector(s) with `igc-` prefixed equivalents
 @function updateSelectors($selector) {
     $result: ();
-    $selectors: string.split($selector, ", ");
 
-    @each $sel in $selectors {
+    @each $sel in $selector {
         $result: list.append($result, $sel, comma);
 
         @if string.index($sel, 'igx-') == 1 {

projects/igniteui-angular/package.json

@@ -73,7 +73,7 @@
         "tslib": "^2.3.0",
         "igniteui-trial-watermark": "^3.1.0",
         "lodash-es": "^4.17.21",
-        "igniteui-theming": "^20.0.0",
+        "igniteui-theming": "^21.0.2",
         "@igniteui/material-icons-extended": "^3.1.0"
     },
     "peerDependencies": {

projects/igniteui-angular/src/lib/core/styles/components/avatar/_avatar-theme.scss

@@ -6,7 +6,7 @@
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.
 @mixin avatar($theme) {
-    @include css-vars($theme, 'igx-avatar');
+    @include css-vars($theme);
 
     $variant: map.get($theme, '_meta', 'theme');
 

projects/igniteui-angular/src/lib/core/styles/components/badge/_badge-theme.scss

@@ -5,7 +5,7 @@
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.
 @mixin badge($theme) {
-    @include css-vars($theme, 'igx-badge');
+    @include css-vars($theme);
 
     $variant: map.get($theme, '_meta', 'theme');
 

projects/igniteui-angular/src/lib/core/styles/components/banner/_banner-theme.scss

@@ -5,7 +5,7 @@
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.
 @mixin banner($theme) {
-    @include css-vars($theme, 'igx-banner, .igx-banner');
+    @include css-vars($theme);
     $variant: map.get($theme, '_meta', 'theme');
 
     %igx-banner-host {

projects/igniteui-angular/src/lib/core/styles/components/bottom-nav/_bottom-nav-theme.scss

@@ -6,7 +6,7 @@
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.
 @mixin bottom-nav($theme) {
-    @include css-vars($theme, 'igx-bottom-nav');
+    @include css-vars($theme);
 
     $variant: map.get($theme, '_meta', 'theme');
     $menu-height: rem(56px);

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

@@ -6,7 +6,7 @@
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.
 @mixin button-group($theme) {
-    @include css-vars($theme, 'igx-buttongroup');
+    @include css-vars($theme);
 
     $group-item-border-thickness: rem(1px);
     $group-items-margin: rem(10px, 16px);
@@ -65,11 +65,6 @@
         &[igxButton] {
             border-radius: 0;
             border-color: var-get($theme, 'item-border-color');
-
-            @if $bootstrap-theme {
-                margin: 0 !important;
-                border: none;
-            }
         }
 
         igx-icon {

projects/igniteui-angular/src/lib/core/styles/components/calendar/_calendar-theme.scss

@@ -6,7 +6,7 @@
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.
 @mixin calendar($theme) {
-    @include css-vars($theme, 'igx-calendar, .igx-days-view--standalone, .igx-calendar-view--standalone, .igx-date-picker, .igx-month-picker');
+    @include css-vars($theme);
 
     $variant: map.get($theme, '_meta', 'theme');
     $bootstrap-theme: $variant == 'bootstrap';

projects/igniteui-angular/src/lib/core/styles/components/card/_card-theme.scss

@@ -1,12 +1,11 @@
 @use 'sass:map';
 @use '../../base' as *;
 
-/// Card Component
 /// @deprecated Use the `css-vars` mixin instead.
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.
 @mixin card($theme) {
-    @include css-vars($theme, 'igx-card');
+    @include css-vars($theme);
     $variant: map.get($theme, '_meta', 'theme');
     $not-material-theme: $variant != 'material';
 
@@ -29,10 +28,6 @@
         &:hover {
             box-shadow: none;
         }
-
-        igx-avatar {
-            --ig-size: #{if($variant == 'indigo', 3, 1)};
-        }
     }
 
     %igx-card--elevated {
@@ -93,6 +88,10 @@
             margin-block: auto;
         }
 
+        igx-avatar {
+            --ig-size: #{if($variant == 'indigo', 3, 1)};
+        }
+
         &:empty {
             display: none;
         }
@@ -220,14 +219,9 @@
         display: flex;
         align-items: center;
         order: 1;
-        color: var-get($theme, 'actions-text-color');
         margin-inline-start: auto;
         gap: rem(8px);
 
-        [igxIconButton] {
-            color: var-get($theme, 'actions-text-color');
-        }
-
         &:empty {
             display: none;
         }
@@ -239,15 +233,16 @@
         order: 0;
         gap: rem(8px);
 
-        [igxIconButton] {
-            color: var-get($theme, 'actions-text-color');
-        }
-
         &:empty {
             display: none;
         }
     }
 
+    %igx-card-actions__start,
+    %igx-card-actions__end {
+        color: var-get($theme, 'actions-text-color');
+    }
+
     %igx-card-actions__start--justify,
     %igx-card-actions__end--justify {
         justify-content: space-around;

projects/igniteui-angular/src/lib/core/styles/components/carousel/_carousel-theme.scss

@@ -6,7 +6,7 @@
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.
 @mixin carousel($theme) {
-    @include css-vars($theme, 'igx-carousel');
+    @include css-vars($theme);
     @include scale-in-center();
     @include scale-out-center();
 

projects/igniteui-angular/src/lib/core/styles/components/checkbox/_checkbox-theme.scss

@@ -7,7 +7,7 @@
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.
 @mixin checkbox($theme) {
-    @include css-vars($theme, 'igx-checkbox');
+    @include css-vars($theme);
     $theme-variant: map.get($theme, '_meta', 'variant');
     $variant: map.get($theme, '_meta', 'theme');
     $material-theme: $variant == 'material';

projects/igniteui-angular/src/lib/core/styles/components/chip/_chip-theme.scss

@@ -6,7 +6,7 @@
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.
 @mixin chip($theme) {
-    @include css-vars($theme, 'igx-chip, .igx-chip__ghost');
+    @include css-vars($theme);
     $chip-max-width: 32ch;
 
     $variant: map.get($theme, '_meta', 'theme');

projects/igniteui-angular/src/lib/core/styles/components/column-actions/_column-actions-theme.scss

@@ -5,7 +5,7 @@
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.
 @mixin column-actions($theme) {
-    @include css-vars($theme, 'igx-column-actions');
+    @include css-vars($theme);
     $variant: map.get($theme, '_meta', 'theme');
 
     %column-actions-display {

projects/igniteui-angular/src/lib/core/styles/components/combo/_combo-theme.scss

@@ -5,7 +5,7 @@
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.
 @mixin combo($theme) {
-    @include css-vars($theme, 'igx-combo, igx-simple-combo');
+    @include css-vars($theme);
 
     $variant: map.get($theme, '_meta', 'theme');
 

projects/igniteui-angular/src/lib/core/styles/components/date-picker/_date-picker-theme.scss

@@ -2,13 +2,6 @@
 @use '../../base' as *;
 @use '../../themes/schemas' as *;
 
-////
-/// @group themes
-/// @access public
-/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
-/// @author <a href="https://github.com/desig9stein" target="_blank">Marin Popov</a>
-////
-
 /// @deprecated Use the `css-vars` mixin instead.
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The calendar theme used to style the component.

projects/igniteui-angular/src/lib/core/styles/components/date-range-picker/_date-range-picker-theme.scss

@@ -5,7 +5,7 @@
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.
 @mixin date-range-picker($theme) {
-    @include css-vars($theme, 'igx-date-range-picker');
+    @include css-vars($theme);
 
     %igx-date-range-picker {
         display: flex;

projects/igniteui-angular/src/lib/core/styles/components/divider/_divider-theme.scss

@@ -5,7 +5,7 @@
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.
 @mixin divider($theme) {
-    @include css-vars($theme, 'igx-divider');
+    @include css-vars($theme);
 
     $variant: map.get($theme, '_meta', 'theme');
 

projects/igniteui-angular/src/lib/core/styles/components/dock-manager/_dock-manager-theme.scss

@@ -5,7 +5,7 @@
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.
 @mixin dock-manager($theme) {
-    @include css-vars($theme, 'igc-dockmanager');
+    @include css-vars($theme);
 }
 
 /// Adds typography styles for the dock manager component.

projects/igniteui-angular/src/lib/core/styles/components/expansion-panel/_expansion-panel-theme.scss

@@ -6,7 +6,7 @@
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.
 @mixin expansion-panel($theme) {
-    @include css-vars($theme, 'igx-expansion-panel');
+    @include css-vars($theme);
     $variant: map.get($theme, '_meta', 'theme');
 
     $panel-padding: pad-block(rem(16px)) pad-inline(rem(24px));

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

@@ -5,7 +5,7 @@
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.
 @mixin grid-toolbar($theme) {
-    @include css-vars($theme, 'igx-grid-toolbar, .igx-grid-toolbar__dd-list');
+    @include css-vars($theme);
 
     $variant: map.get($theme, '_meta', 'theme');
     $bootstrap-theme: $variant == 'bootstrap';

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

@@ -4,13 +4,6 @@
 @use '../button-group/button-group-theme' as *;
 @use '../tree/tree-theme' as *;
 
-////
-/// @group themes
-/// @access private
-/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
-/// @author <a href="https://github.com/desig9stein" target="_blank">Marin Popov</a>
-////
-
 /// @deprecated Use the `css-vars` mixin instead.
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The grid theme used to style the component.

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

@@ -18,8 +18,7 @@
 /// @param {Map} $theme - The theme used to style the component.
 /// @requires {mixin} excel-filtering
 @mixin grid($theme) {
-    @include css-vars($theme, 'igx-grid, igx-hierarchical-grid, igx-pivot-grid, igx-tree-grid, igx-advanced-filtering-dialog, igx-grid-excel-style-filtering, .igx-excel-filter__secondary');
-
+    @include css-vars($theme);
     @include scale-in-ver-center();
 
     $variant: map.get($theme, '_meta', 'theme');

projects/igniteui-angular/src/lib/core/styles/components/grid/_pivot-data-selector-theme.scss

@@ -3,12 +3,8 @@
 @use '../../base' as *;
 @use '../../themes/schemas' as *;
 
-////
-/// @group themes
-/// @access public
-/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
-////
-
+/// @deprecated Use the `css-vars` mixin instead.
+/// @see {mixin} css-vars
 /// @param {Map} $schema [$light-material-schema] - The schema used as basis for styling the component.
 @function pivot-data-selector-theme(
     $schema: $light-material-schema,
@@ -28,14 +24,16 @@
 
     @return extend($theme, (
         name: $name,
+        selector: $selector,
     ));
 }
 
 /// @deprecated Use the `css-vars` mixin instead.
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.
 @mixin pivot-data-selector($theme) {
-    @include css-vars($theme, 'igx-pivot-data-selector');
+    @include css-vars($theme);
+
     $variant: map.get($theme, '_meta', 'theme');
 
     $chip-height-material: (

projects/igniteui-angular/src/lib/core/styles/components/icon/_icon-theme.scss

@@ -1,12 +1,12 @@
+// stylelint-disable font-family-no-missing-generic-family-keyword
 @use 'sass:map';
 @use '../../base' as *;
 
-// stylelint-disable font-family-no-missing-generic-family-keyword
 /// @deprecated Use the `css-vars` mixin instead.
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.
 @mixin icon($theme) {
-    @include css-vars($theme, 'igx-icon');
+    @include css-vars($theme);
 
     $size: var-get($theme, 'size');