Merge branch 'master' into aahmedov/fix-filterCellClick-14322-master

IgniteUI · Jul 3, 2024 · 1f61b4b · 1f61b4b
2 parents f7ce350 + 42f41aa
commit 1f61b4b
Show file tree

Hide file tree

Showing 27 changed files with 922 additions and 404 deletions.
diff --git a/projects/igniteui-angular/src/lib/combo/combo.common.ts b/projects/igniteui-angular/src/lib/combo/combo.common.ts
@@ -167,7 +167,27 @@ export abstract class IgxComboBaseDirective implements IgxComboBase, AfterViewCh
      */
     @HostBinding('attr.id')
     @Input()
-    public id = `igx-combo-${NEXT_ID++}`;
+    public get id(): string {
+        return this._id;
+    }
+
+    public set id(value: string) {
+        if (!value) {
+            return;
+        }
+        const selection = this.selectionService.get(this._id);
+        this._id = value;
+        if (selection) {
+            this.selectionService.set(this._id, selection);
+        }
+        if (this.dropdown.open) {
+            this.dropdown.close();
+        }
+        if (this.inputGroup?.isFocused) {
+            this.inputGroup.element.nativeElement.blur();
+            this.inputGroup.isFocused = false;
+        }
+    }
 
     /**
      * Sets the style width of the element
@@ -943,6 +963,7 @@ export abstract class IgxComboBaseDirective implements IgxComboBase, AfterViewCh
     protected compareCollator = new Intl.Collator();
     protected computedStyles;
 
+    private _id: string = `igx-combo-${NEXT_ID++}`;
     private _type = null;
     private _dataType = '';
     private _itemHeight = null;

diff --git a/...igniteui-angular/src/lib/core/styles/components/grid-toolbar/_grid-toolbar-component.scss b/...igniteui-angular/src/lib/core/styles/components/grid-toolbar/_grid-toolbar-component.scss
@@ -38,10 +38,6 @@
             @extend %igx-grid-toolbar__progress-bar !optional;
         }
 
-        @include e(adv-filter, $m: 'filtered') {
-            @extend %igx-grid-toolbar__adv-filter--filtered !optional;
-        }
-
         @include e(dropdown){
             @extend %igx-grid-toolbar__dropdown !optional;
         }

diff --git a/...cts/igniteui-angular/src/lib/core/styles/components/grid-toolbar/_grid-toolbar-theme.scss b/...cts/igniteui-angular/src/lib/core/styles/components/grid-toolbar/_grid-toolbar-theme.scss
@@ -250,21 +250,6 @@
         }
     }
 
-    %igx-grid-toolbar__adv-filter--filtered {
-        border-color: color($color: 'secondary') !important;
-
-        @if $bootstrap-theme {
-            border-width: rem(2px);
-            border-color: color($color: 'primary', $variant: 800) !important;
-            color: color($color: 'primary', $variant: 800);
-
-            &:hover,
-            &:focus {
-                background: color($color: 'primary', $variant: 800);
-            }
-        }
-    }
-
     %igx-grid-toolbar__dropdown {
         position: relative;
     }

diff --git a/...ects/igniteui-angular/src/lib/core/styles/components/grid/_excel-filtering-component.scss b/...ects/igniteui-angular/src/lib/core/styles/components/grid/_excel-filtering-component.scss
@@ -110,6 +110,11 @@
             @extend %grid-excel-actions__action !optional;
         }
 
+        @include e(actions-filter, $m: active) {
+            @extend %grid-excel-actions__action !optional;
+            @extend %grid-excel-actions__action--active !optional;
+        }
+
         @include e(actions-clear) {
             @extend %grid-excel-actions__action !optional;
         }

diff --git a/projects/igniteui-angular/src/lib/core/styles/components/grid/_excel-filtering-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/grid/_excel-filtering-theme.scss
@@ -308,6 +308,11 @@
         }
     }
 
+    %grid-excel-actions__action--active {
+        background: color($color: 'gray', $variant: 100);
+        color: var-get($theme, 'excel-filtering-actions-hover-foreground');
+    }
+
     %grid-excel-actions__action--disabled {
         color: var-get($theme, 'excel-filtering-actions-disabled-foreground');
         pointer-events: none;