Merge branch 'master' into grid-docs

kdinev · web-flow · commit 315a0027033f · 2025-12-02T15:10:31.000+02:00
diff --git a/projects/igniteui-angular/core/src/core/styles/components/button/_button-theme.scss b/projects/igniteui-angular/core/src/core/styles/components/button/_button-theme.scss
@@ -426,6 +426,7 @@
         &:active {
             background: var-get($flat-theme, 'focus-background');
             color: var-get($flat-theme, 'focus-foreground');
+            border-color: var-get($flat-theme, 'focus-border-color');
 
             igx-icon {
                 color: var-get($flat-theme, 'focus-foreground');
@@ -524,18 +525,20 @@
         color: var-get($outlined-theme, 'focus-visible-foreground');
         border-color: var-get($outlined-theme, 'focus-visible-border-color');
 
-        igx-icon {
-            color: var-get($outlined-theme, 'focus-visible-foreground');
+        @if $variant == 'material'  or $variant == 'bootstrap' {
+            igx-icon {
+                color: var-get($outlined-theme, 'icon-color-hover');
+            }
+        } @else {
+            igx-icon {
+                color: var-get($outlined-theme, 'icon-color');
+            }
         }
 
         @if $variant == 'bootstrap' {
             box-shadow: 0 0 0 rem(4px) var-get($outlined-theme, 'shadow-color');
         } @else if $variant == 'indigo' {
             box-shadow: 0 0 0 rem(3px) var-get($outlined-theme, 'shadow-color');
-
-            igx-icon {
-                color: var-get($outlined-theme, 'icon-color');
-            }
         }
 
         &:hover {
@@ -551,15 +554,10 @@
         &:active {
             background: var-get($outlined-theme, 'focus-background');
             color: var-get($outlined-theme, 'focus-foreground');
+            border-color: var-get($outlined-theme, 'focus-border-color');
 
-            @if $variant == 'material' {
-                border-color: var-get($outlined-theme, 'focus-border-color');
-
-                igx-icon {
-                    color: var-get($outlined-theme, 'focus-foreground');
-                }
-            } @else {
-                border-color: var-get($outlined-theme, 'active-border-color');
+            igx-icon {
+                color: var-get($outlined-theme, 'focus-foreground');
             }
 
             @if $variant == 'indigo' {
@@ -681,6 +679,11 @@
         &:active {
             color: var-get($contained-theme, 'focus-foreground');
             background: var-get($contained-theme, 'focus-background');
+            border-color: var-get($contained-theme, 'focus-border-color');
+
+            igx-icon {
+                color: var-get($contained-theme, 'focus-foreground');
+            }
 
             @if $variant == 'indigo' {
                 igx-icon {
@@ -818,6 +821,11 @@
         &:active {
             background: var-get($fab-theme, 'focus-background');
             color: var-get($fab-theme, 'focus-foreground');
+            border-color: var-get($fab-theme, 'focus-border-color');
+
+            igx-icon {
+                color: var-get($contained-theme, 'focus-foreground');
+            }
 
             @if $variant == 'indigo' {
                 igx-icon {
diff --git a/projects/igniteui-angular/core/src/core/styles/components/grid/_grid-theme.scss b/projects/igniteui-angular/core/src/core/styles/components/grid/_grid-theme.scss
@@ -1010,10 +1010,10 @@
         }
 
         %igx-icon--error {
-            @if $variant == 'fluent' and $theme-variant == 'light' or $variant == 'material' and $theme-variant == 'light' {
-                color: color($color: 'gray', $variant: 600);
-            } @else {
+            @if $variant == 'indigo' or $theme-variant == 'dark' {
                 color: color($color: 'gray', $variant: 500);
+            } @else {
+                color: color($color: 'gray', $variant: 600);
             }
         }
     }
diff --git a/projects/igniteui-angular/grids/grid/src/public_api.ts b/projects/igniteui-angular/grids/grid/src/public_api.ts
@@ -76,7 +76,11 @@ import {
     IgxRowAddTextDirective,
     IgxRowEditActionsDirective,
     IgxRowEditTabStopDirective,
-    IgxRowEditTextDirective
+    IgxRowEditTextDirective,
+    IgxGridActionButtonComponent,
+    IgxGridPinningActionsComponent,
+    IgxGridActionsBaseDirective,
+    IgxGridEditingActionsComponent
 } from "igniteui-angular/grids/core";
 import {
     IgxPaginatorComponent,
@@ -118,6 +122,11 @@ export const IGX_GRID_DIRECTIVES = [
     IgxDragIndicatorIconDirective,
     IgxRowDragGhostDirective,
     IgxGridStateDirective,
+    // IGX_GRID_ACTIONS
+    IgxGridPinningActionsComponent,
+    IgxGridEditingActionsComponent,
+    IgxGridActionsBaseDirective,
+    IgxGridActionButtonComponent,
     // IGX_GRID_HEADERS_DIRECTIVES:
     IgxGridHeaderComponent,
     IgxGridHeaderGroupComponent,
diff --git a/projects/igniteui-angular/grids/hierarchical-grid/src/public_api.ts b/projects/igniteui-angular/grids/hierarchical-grid/src/public_api.ts
@@ -78,7 +78,11 @@ import {
     IgxExcelStyleSearchComponent,
     IgxExcelStyleColumnOperationsTemplateDirective,
     IgxExcelStyleFilterOperationsTemplateDirective,
-    IgxExcelStyleLoadingValuesTemplateDirective
+    IgxExcelStyleLoadingValuesTemplateDirective,
+    IgxGridActionButtonComponent,
+    IgxGridActionsBaseDirective,
+    IgxGridEditingActionsComponent,
+    IgxGridPinningActionsComponent
 } from "igniteui-angular/grids/core";
 import {
     IgxPaginatorComponent,
@@ -111,6 +115,11 @@ export const IGX_HIERARCHICAL_GRID_DIRECTIVES = [
     IgxDragIndicatorIconDirective,
     IgxRowDragGhostDirective,
     IgxGridStateDirective,
+    // IGX_GRID_ACTIONS
+    IgxGridPinningActionsComponent,
+    IgxGridEditingActionsComponent,
+    IgxGridActionsBaseDirective,
+    IgxGridActionButtonComponent,
     // IGX_GRID_HEADERS_DIRECTIVES:
     IgxGridHeaderComponent,
     IgxGridHeaderGroupComponent,
diff --git a/projects/igniteui-angular/grids/pivot-grid/src/public_api.ts b/projects/igniteui-angular/grids/pivot-grid/src/public_api.ts
@@ -68,7 +68,11 @@ import {
     IgxExcelStyleSearchComponent,
     IgxExcelStyleColumnOperationsTemplateDirective,
     IgxExcelStyleFilterOperationsTemplateDirective,
-    IgxExcelStyleLoadingValuesTemplateDirective
+    IgxExcelStyleLoadingValuesTemplateDirective,
+    IgxGridActionButtonComponent,
+    IgxGridActionsBaseDirective,
+    IgxGridEditingActionsComponent,
+    IgxGridPinningActionsComponent
 } from "igniteui-angular/grids/core";
 
 /* NOTE: Pivot grid directives collection for ease-of-use import in standalone components scenario */
@@ -91,6 +95,11 @@ export const IGX_PIVOT_GRID_DIRECTIVES = [
     IgxDragIndicatorIconDirective,
     IgxRowDragGhostDirective,
     IgxGridStateDirective,
+    // IGX_GRID_ACTIONS
+    IgxGridPinningActionsComponent,
+    IgxGridEditingActionsComponent,
+    IgxGridActionsBaseDirective,
+    IgxGridActionButtonComponent,
     // IGX_GRID_HEADERS_DIRECTIVES:
     IgxGridHeaderComponent,
     IgxGridHeaderGroupComponent,
diff --git a/projects/igniteui-angular/grids/tree-grid/src/public_api.ts b/projects/igniteui-angular/grids/tree-grid/src/public_api.ts
@@ -79,7 +79,11 @@ import {
     IgxExcelStyleSearchComponent,
     IgxExcelStyleColumnOperationsTemplateDirective,
     IgxExcelStyleFilterOperationsTemplateDirective,
-    IgxExcelStyleLoadingValuesTemplateDirective
+    IgxExcelStyleLoadingValuesTemplateDirective,
+    IgxGridActionButtonComponent,
+    IgxGridActionsBaseDirective,
+    IgxGridEditingActionsComponent,
+    IgxGridPinningActionsComponent
 } from "igniteui-angular/grids/core";
 import {
     IgxPaginatorComponent,
@@ -113,6 +117,11 @@ export const IGX_TREE_GRID_DIRECTIVES = [
     IgxDragIndicatorIconDirective,
     IgxRowDragGhostDirective,
     IgxGridStateDirective,
+    // IGX_GRID_ACTIONS
+    IgxGridPinningActionsComponent,
+    IgxGridEditingActionsComponent,
+    IgxGridActionsBaseDirective,
+    IgxGridActionButtonComponent,
     // IGX_GRID_HEADERS_DIRECTIVES:
     IgxGridHeaderComponent,
     IgxGridHeaderGroupComponent,

Original file line number	Diff line number	Diff line change
`@@ -1010,10 +1010,10 @@`
`1010`	`1010`	`}`
`1011`	`1011`
`1012`	`1012`	`%igx-icon--error {`
`1013`		`- @if $variant == 'fluent' and $theme-variant == 'light' or $variant == 'material' and $theme-variant == 'light' {`
`1014`		`- color: color($color: 'gray', $variant: 600);`
`1015`		`- } @else {`
	`1013`	`+ @if $variant == 'indigo' or $theme-variant == 'dark' {`
`1016`	`1014`	`color: color($color: 'gray', $variant: 500);`
	`1015`	`+ } @else {`
	`1016`	`+ color: color($color: 'gray', $variant: 600);`
`1017`	`1017`	`}`
`1018`	`1018`	`}`
`1019`	`1019`	`}`