Merge branch 'master' into apetrov/set-tick-width-property

Author: adrianptrv

.github/workflows/stale.yml

@@ -7,6 +7,11 @@ on:
 jobs:
   stale:
 
+    permissions:
+      contents: read
+      issues: write
+      pull-requests: write
+
     runs-on: ubuntu-latest
 
     steps:

package-lock.json

@@ -59,40 +59,40 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^20.3.0",
-    "@angular/common": "^20.3.0",
-    "@angular/compiler": "^20.3.0",
-    "@angular/core": "^20.3.0",
-    "@angular/elements": "^20.3.0",
-    "@angular/forms": "^20.3.0",
-    "@angular/platform-browser": "^20.3.0",
-    "@angular/platform-browser-dynamic": "^20.3.0",
-    "@angular/platform-server": "^20.3.0",
-    "@angular/router": "^20.3.0",
-    "@angular/ssr": "^20.3.1",
+    "@angular/animations": "^20.3.6",
+    "@angular/common": "^20.3.6",
+    "@angular/compiler": "^20.3.6",
+    "@angular/core": "^20.3.6",
+    "@angular/elements": "^20.3.6",
+    "@angular/forms": "^20.3.6",
+    "@angular/platform-browser": "^20.3.6",
+    "@angular/platform-browser-dynamic": "^20.3.6",
+    "@angular/platform-server": "^20.3.6",
+    "@angular/router": "^20.3.6",
+    "@angular/ssr": "^20.3.6",
     "@igniteui/material-icons-extended": "^3.1.0",
     "@lit-labs/ssr-dom-shim": "^1.3.0",
     "@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",
     "tslib": "^2.3.0",
     "zone.js": "~0.15.0"
   },
   "devDependencies": {
-    "@angular-devkit/schematics": "^20.3.1",
-    "@angular-eslint/builder": "^20.3.0",
-    "@angular-eslint/eslint-plugin": "^20.3.0",
-    "@angular-eslint/eslint-plugin-template": "^20.3.0",
-    "@angular-eslint/schematics": "^20.3.0",
-    "@angular-eslint/template-parser": "^20.3.0",
-    "@angular/build": "^20.3.1",
-    "@angular/cli": "^20.3.1",
-    "@angular/compiler-cli": "^20.3.0",
-    "@angular/language-service": "^20.3.0",
+    "@angular-devkit/schematics": "^20.3.6",
+    "@angular-eslint/builder": "^20.4.0",
+    "@angular-eslint/eslint-plugin": "^20.4.0",
+    "@angular-eslint/eslint-plugin-template": "^20.4.0",
+    "@angular-eslint/schematics": "^20.4.0",
+    "@angular-eslint/template-parser": "^20.4.0",
+    "@angular/build": "^20.3.6",
+    "@angular/cli": "^20.3.6",
+    "@angular/compiler-cli": "^20.3.6",
+    "@angular/language-service": "^20.3.6",
     "@angularclass/hmr": "^3.0.0",
     "@microsoft/signalr": "^7.0.12",
     "@types/estree": "^1.0.0",
@@ -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",

package.json

@@ -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/app/custom-strategy.spec.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/public_api.ts

@@ -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-elements/src/themes/_util.scss

@@ -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/package.json

@@ -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/avatar/_avatar-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/badge/_badge-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 {