Merge pull request #10638 from IgniteUI/13.0.x

Mass merge from 13.0.x to master

Author: kdinev

projects/igniteui-angular/src/lib/accordion/accordion.component.spec.ts

@@ -166,6 +166,29 @@ describe('Rendering Tests', () => {
             expect(accordion.panelCollapsed.emit).toHaveBeenCalledTimes(5);
         }));
 
+        it(`Should collapse all expanded and not disabled panels except for the last one when setting singleBranchExpand to true`, () => {
+            expect(accordion.panels[0].collapsed).toBeTrue();
+            expect(accordion.panels[1].collapsed).toBeTrue();
+            expect(accordion.panels[2].collapsed).toBeFalse();
+            expect(accordion.panels[3].collapsed).toBeFalse();
+
+            accordion.panels[1].collapsed = false;
+            fix.detectChanges();
+
+            expect(accordion.panels[0].collapsed).toBeTrue();
+            expect(accordion.panels[1].collapsed).toBeFalse();
+            expect(accordion.panels[2].collapsed).toBeFalse();
+            expect(accordion.panels[3].collapsed).toBeFalse();
+
+            accordion.singleBranchExpand = true;
+            fix.detectChanges();
+
+            expect(accordion.panels[0].collapsed).toBeTrue();
+            expect(accordion.panels[1].collapsed).toBeTrue();
+            expect(accordion.panels[2].collapsed).toBeFalse();
+            expect(accordion.panels[3].collapsed).toBeFalse();
+        });
+
         it('Should emit ing and ed events when expand panel state is toggled', fakeAsync(() => {
             spyOn(accordion.panelExpanded, 'emit').and.callThrough();
             spyOn(accordion.panelExpanding, 'emit').and.callThrough();

projects/igniteui-angular/src/lib/accordion/accordion.component.ts

@@ -1,4 +1,4 @@
-import { AfterContentInit, AfterViewInit, Component, ContentChildren, EventEmitter,
+import { AfterContentInit, AfterViewInit, ChangeDetectorRef, Component, ContentChildren, EventEmitter,
     HostBinding, Input, OnDestroy, Output, QueryList } from '@angular/core';
 import { fromEvent, Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
@@ -113,7 +113,16 @@ export class IgxAccordionComponent implements AfterContentInit, AfterViewInit, O
      * ```
      */
     @Input()
-    public singleBranchExpand = false;
+    public get singleBranchExpand(): boolean {
+        return this._singleBranchExpand;
+    }
+
+    public set singleBranchExpand(val: boolean) {
+        this._singleBranchExpand = val;
+        if (val) {
+            this.collapseAllExceptLast();
+        }
+    }
 
     /**
      * Emitted before a panel is expanded.
@@ -200,12 +209,16 @@ export class IgxAccordionComponent implements AfterContentInit, AfterViewInit, O
     private _destroy$ = new Subject<void>();
     private _unsubChildren$ = new Subject<void>();
     private _enabledPanels!: IgxExpansionPanelComponent[];
+    private _singleBranchExpand = false;
 
-    constructor() { }
+    constructor(private cdr: ChangeDetectorRef) { }
 
     /** @hidden @internal **/
     public ngAfterContentInit(): void {
         this.updatePanelsAnimation();
+        if (this.singleBranchExpand) {
+            this.collapseAllExceptLast();
+        }
     }
 
     /** @hidden @internal **/
@@ -256,6 +269,16 @@ export class IgxAccordionComponent implements AfterContentInit, AfterViewInit, O
         this.panels.forEach(panel => panel.collapse());
     }
 
+    private collapseAllExceptLast(): void {
+        const lastExpanded = this.panels?.filter(p => !p.collapsed && !p.header.disabled).pop();
+        this.panels?.forEach((p: IgxExpansionPanelComponent) => {
+            if (p !== lastExpanded && !p.header.disabled) {
+                p.collapsed = true;
+            }
+        });
+        this.cdr.detectChanges();
+    }
+
     private handleKeydown(event: KeyboardEvent, panel: IgxExpansionPanelComponent): void {
         const key = event.key.toLowerCase();
         if (!(ACCORDION_NAVIGATION_KEYS.has(key))) {

projects/igniteui-angular/src/lib/combo/combo.component.spec.ts

@@ -95,7 +95,7 @@ describe('igxCombo', () => {
             get: mockNgControl
         });
         mockSelection.get.and.returnValue(new Set([]));
-        const mockIconService = new IgxIconService(null, null, null);
+        const mockIconService = new IgxIconService(null, null, null, null);
         it('should correctly implement interface methods - ControlValueAccessor ', () => {
             combo = new IgxComboComponent(elementRef, mockCdr, mockSelection as any, mockComboService,
                 mockIconService, null, null, mockInjector);

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

@@ -1117,7 +1117,7 @@
         z-index: 10000;
 
         %igx-grid__hierarchical-expander--empty {
-            border-#{$right}: 1px solid transparent;
+            border-#{$right}: rem(1px) solid var-get($theme, 'header-border-color');
         }
     }
 

projects/igniteui-angular/src/lib/grids/filtering/base/grid-filtering-row.component.ts

@@ -72,7 +72,12 @@ export class IgxGridFilteringRowComponent implements AfterViewInit, OnDestroy {
             this.expression.searchVal = null;
             const index = this.expressionsList.findIndex(item => item.expression === this.expression);
             if (index === 0 && this.expressionsList.length === 1) {
-                this.clearFiltering();
+                this.filteringService.clearFilter(this.column.field);
+
+                if (this.expression.condition.isUnary) {
+                    this.resetExpression();
+                }
+
                 return;
             }
         } else {

projects/igniteui-angular/src/lib/grids/grid/grid-filtering-ui.spec.ts

@@ -2064,6 +2064,33 @@ describe('IgxGrid - Filtering Row UI actions #grid', () => {
             expect(grid.filteredData).toBeNull();
         }));
 
+        it('should not reset expression when input is cleared', fakeAsync(() => {
+            grid.filter('ProductName', 'I', IgxStringFilteringOperand.instance().condition('startsWith'));
+            fix.detectChanges();
+
+            GridFunctions.clickFilterCellChip(fix, 'ProductName');
+
+            grid.filteringRow.onClearClick();
+            tick(100);
+            fix.detectChanges();
+
+            expect(grid.filteringRow.expression.condition.name).toEqual('startsWith');
+        }));
+
+        it('should reset expression when the condition is unary', fakeAsync(() => {
+            GridFunctions.clickFilterCellChip(fix, 'ProductName');
+
+            // iterate over unary conditions
+            // empty
+            GridFunctions.openFilterDDAndSelectCondition(fix, 6);
+
+            grid.filteringRow.onClearClick();
+            tick(100);
+            fix.detectChanges();
+
+            expect(grid.filteringRow.expression.condition.name).toEqual('contains');
+        }));
+
         it('Should filter by cells formatted data when using FormattedValuesFilteringStrategy', fakeAsync(() => {
             const formattedStrategy = new FormattedValuesFilteringStrategy(['Downloads']);
             grid.filterStrategy = formattedStrategy;
@@ -6640,8 +6667,6 @@ const emitFilteringDoneOnInputClear = (fix, grid, filterVal, columnName, conditi
 
     GridFunctions.clickFilterCellChip(fix, columnName);
 
-    // spyOn(grid.filteringDone, 'emit');
-
     grid.filteringRow.onClearClick();
     tick(100);
     fix.detectChanges();

projects/igniteui-angular/src/lib/icon/icon.service.ts

@@ -3,6 +3,7 @@ import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
 import { DOCUMENT } from '@angular/common';
 import { HttpClient } from '@angular/common/http';
 import { Observable, Subject } from 'rxjs';
+import { PlatformUtil } from '../core/utils';
 
 /**
  * Event emitted when a SVG icon is loaded through
@@ -48,14 +49,19 @@ export class IgxIconService {
     private _familyAliases = new Map<string, string>();
     private _cachedSvgIcons = new Map<string, Map<string, SafeHtml>>();
     private _iconLoaded = new Subject<IgxIconLoadedEvent>();
-    private _domParser = new DOMParser();
+    private _domParser: DOMParser;
 
     constructor(
         @Optional() private _sanitizer: DomSanitizer,
         @Optional() private _httpClient: HttpClient,
-        @Optional() @Inject(DOCUMENT) private _document: any
+        @Optional() private _platformUtil: PlatformUtil,
+        @Optional() @Inject(DOCUMENT) private _document: any,
     ) {
         this.iconLoaded = this._iconLoaded.asObservable();
+
+        if(this._platformUtil?.isBrowser) {
+            this._domParser = new DOMParser();
+        }
     }
 
     /**
@@ -188,7 +194,7 @@ export class IgxIconService {
     private cacheSvgIcon(name: string, value: string, family = this._family, stripMeta: boolean) {
         family = !!family ? family : this._family;
 
-        if (name && value) {
+        if (this._platformUtil?.isBrowser && name && value) {
             const doc = this._domParser.parseFromString(value, 'image/svg+xml');
             const svg = doc.querySelector('svg') as SVGElement;