Merge branch 'master' into mkirova/fix-16322-20.1.x

Author: mddragnev

.github/workflows/nodejs.yml

@@ -2,6 +2,8 @@
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
 
 name: Node.js CI
+permissions:
+  contents: read
 
 on:
   push:
@@ -16,7 +18,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20.x, 22.17.1]
+        node-version: [20.x, 22.x]
 
     steps:
       - name: Checkout
@@ -50,7 +52,7 @@ jobs:
             npm run test:schematics
             npm run test:i18n
         env:
-            NODE_OPTIONS: --max_old_space_size=4096
+            NODE_OPTIONS: --max_old_space_size=4096 ${{ matrix.node-version == '22.x' && '--no-experimental-strip-types' || '' }}
             TZ: America/New_York
       - name: Build i18n & validate output
         run: |

.github/workflows/npm-publish.yml

@@ -1,4 +1,6 @@
 name: Npm.js deploy
+permissions:
+  contents: read
 
 on:
   release:

.github/workflows/stale.yml

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

ROADMAP.md

@@ -2,17 +2,21 @@
 
 # Current Milestone
 
-## Milestone 38, version 20.1 (Due by Sep, 2025)
-1. Grid cell merging feature [#3514](https://github.com/IgniteUI/igniteui-angular/issues/3514)
-2. “Clear Selection” button in Combo component is keyboard accessible [#15841](https://github.com/IgniteUI/igniteui-angular/issues/15841)
-3. Selecting a slide by index in the Carousel component [#16046](https://github.com/IgniteUI/igniteui-angular/issues/16046)
+## Milestone 40, version 20.1 (Due by Nov, 2025)
+1. Support for Angular 21
+2. AI Chat UI component [#16094](https://github.com/IgniteUI/igniteui-angular/issues/16094)
 
 ## Going down the road
 
-1. AI Chat UI component [#16094](https://github.com/IgniteUI/igniteui-angular/issues/16094)
+1. Grids performance
 
 # Previous Milestone
 
+## Milestone 39, version 20.1 (Released Sep  25th, 2025)
+1. **[DONE]** Grid cell merging feature [#3514](https://github.com/IgniteUI/igniteui-angular/issues/3514)
+2. **[DONE]** “Clear Selection” button in Combo component is keyboard accessible [#15841](https://github.com/IgniteUI/igniteui-angular/issues/15841)
+3. **[DONE]** Selecting a slide by index in the Carousel component [#16046](https://github.com/IgniteUI/igniteui-angular/issues/16046)
+
 ## Milestone 38, version 20.0 (Released Jun 09th, 2025)
 1. **[DONE]** Support of Angular 20.0
 

package-lock.json

@@ -75,7 +75,7 @@
     "@types/source-map": "0.5.2",
     "express": "^5.1.0",
     "fflate": "^0.8.1",
-    "igniteui-theming": "^21.0.2",
+    "igniteui-theming": "^22.0.0",
     "igniteui-trial-watermark": "^3.1.0",
     "lodash-es": "^4.17.21",
     "rxjs": "^7.8.2",

package.json

@@ -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, DefaultTreeGridMergeStrategy } from 'projects/igniteui-angular/src/lib/data-operations/merge-strategy';
+import { ByLevelTreeGridMergeStrategy, DefaultMergeStrategy, 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,
+    DefaultMergeStrategy as IgcDefaultMergeStrategy,
     DefaultTreeGridMergeStrategy as IgcDefaultTreeGridMergeStrategy,
     ByLevelTreeGridMergeStrategy as IgcByLevelTreeGridMergeStrategy,
 

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

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

projects/igniteui-angular/package.json

@@ -2,64 +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>
-////
-
-/// If only background color is specified, text/icon color will be assigned automatically to a contrasting color.
-/// @param {Map} $schema [$light-material-schema] - The schema used as basis for styling the component.
-///
-/// @param {Color} $icon-color [null] - The color used for the actions icons.
-/// @param {Color} $background [null] - The color used for the action strip component content background.
-/// @param {Color} $actions-background [null] - The color used for the actions background.
-/// @param {Color} $delete-action [null] - The color used for the delete icon in action strip component.
-/// @param {List} $actions-border-radius [null] - The border radius used for actions container inside action strip component.
-///
-/// @example scss Change the background and icon colors in action strip
-///   $my-action-strip-theme: action-strip-theme($background: black);
-///   // Pass the theme to the css-vars() mixin
-///   @include css-vars($my-action-strip-theme);
-@function action-strip-theme(
-    $schema: $light-material-schema,
-
-    $background: null,
-    $actions-background: null,
-    $icon-color: null,
-    $delete-action: null,
-    $actions-border-radius: null,
-) {
-    $name: 'igx-action-strip';
-    $action-strip-schema: ();
-
-    @if map.has-key($schema, 'action-strip') {
-        $action-strip-schema: map.get($schema, 'action-strip');
-    } @else {
-        $action-strip-schema: $schema;
-    }
-
-    $theme: digest-schema($action-strip-schema);
-
-    @if not($icon-color) and $actions-background {
-        $icon-color: adaptive-contrast(var(--actions-background));
-    }
-
-    @if not($actions-border-radius) {
-        $actions-border-radius: map.get($theme, 'actions-border-radius');
-    }
-
-    @return extend($theme, (
-        name: $name,
-        background: $background,
-        actions-background: $actions-background,
-        icon-color: $icon-color,
-        delete-action: $delete-action,
-        actions-border-radius: $actions-border-radius,
-    ));
-}
-
 /// @deprecated Use the `css-vars` mixin instead.
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.

projects/igniteui-angular/src/lib/core/styles/components/action-strip/_action-strip-theme.scss

@@ -247,7 +247,6 @@
             background: var-get($theme, 'indicator-dot-color');
 
             @if $variant != 'indigo' {
-                @include animation('scale-out-center' .15s $ease-out-quad forwards);
                 inset: rem(1px);
             } @else {
                 width: rem(8px);
@@ -261,11 +260,11 @@
         &:hover {
             border-color: var-get($theme, 'indicator-active-border-color');
 
-            @if $variant == 'indigo' {
-                &::after {
-                    background: var-get($theme, 'indicator-hover-dot-color');
-                }
+            &::after {
+                background: var-get($theme, 'indicator-hover-dot-color');
+            }
 
+            @if $variant == 'indigo' {
                 &::before {
                     position: absolute;
                     content: '';
@@ -290,7 +289,7 @@
                 content: '';
                 width: inherit;
                 height: inherit;
-                border: rem(2px) solid var-get($theme, 'indicator-active-dot-color');
+                border: rem(2px) solid var-get($theme, 'indicator-active-border-color');
                 inset-inline-start: 0;
                 top: 0;
                 border-radius: border-radius(50%);
@@ -304,12 +303,14 @@
             }
         }
 
-        @if $variant == 'indigo' {
-            &:hover {
-                &::after {
-                    background: var-get($theme, 'indicator-active-hover-dot-color');
-                }
+        &:hover {
+            border-color: var-get($theme, 'indicator-active-hover-dot-color');
 
+            &::after {
+                background: var-get($theme, 'indicator-active-hover-dot-color');
+            }
+
+            @if $variant == 'indigo' {
                 &::before {
                     border-color: var-get($theme, 'indicator-active-hover-dot-color');
                 }