Merge branch '20.0.x' into ganastasov/fix-15808-20.0

Author: georgianastasov

projects/igniteui-angular/src/lib/carousel/carousel-base.ts

@@ -52,8 +52,14 @@ export abstract class IgxCarouselComponentBase implements OnDestroy {
     }
 
     public ngOnDestroy(): void {
-        this.enterAnimationPlayer?.destroy();
-        this.leaveAnimationPlayer?.destroy();
+        if (this.enterAnimationPlayer) {
+            this.enterAnimationPlayer.destroy();
+            this.enterAnimationPlayer = null;
+        }
+        if (this.leaveAnimationPlayer) {
+            this.leaveAnimationPlayer.destroy();
+            this.leaveAnimationPlayer = null;
+        }
     }
 
     /** @hidden */

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

@@ -745,6 +745,17 @@ describe('Carousel', () => {
             expect(carousel.get(1).nativeElement.classList.contains(HelperTestFunctions.ACTIVE_SLIDE_CLASS)).toBeTruthy();
             expect(carousel.get(0).nativeElement.classList.contains(HelperTestFunctions.PREVIOUS_SLIDE_CLASS)).toBeFalsy();
         });
+
+        it('should not throw an error when playing an animation and destroying the component - #15976', () => {
+            expect(() => {
+                carousel.next();
+                carousel.ngOnDestroy();
+                fixture.detectChanges();
+            }).not.toThrow();
+
+            expect(carousel['enterAnimationPlayer']).toBe(null);
+            expect(carousel['leaveAnimationPlayer']).toBe(null);
+        });
     });
 
     describe('Dynamic Slides: ', () => {

projects/igniteui-angular/src/lib/core/styles/components/drop-down/_drop-down-theme.scss

@@ -259,7 +259,7 @@
         -webkit-overflow-scrolling: touch;
         position: relative;
 
-        igx-display-container {
+        .igx-display-container--scrollbar {
             padding-inline-end: var(--vhelper-scrollbar-size);
         }
     }

projects/igniteui-angular/src/lib/core/styles/components/query-builder/_query-builder-theme.scss

@@ -131,6 +131,14 @@
     %advanced-filter {
         @include sizable();
 
+        --_tree-scrollbar-gutter: #{rem(16px)};
+
+        @if $variant == 'bootstrap' {
+            --query-builder-outer-padding: #{rem(16px)};
+        } @else {
+            --query-builder-outer-padding: #{rem(24px)};
+        }
+
         width: auto;
         min-width: rem(660px);
         background-color: var-get($theme, 'background');
@@ -139,11 +147,19 @@
         overflow: hidden;
 
         &:has(:not(igx-query-builder-header)) {
-            padding-block-start: if($variant != 'bootstrap', rem(24px), rem(16px))
+            padding-block-start: var(--query-builder-outer-padding);
+
+            %query-level-0 {
+                padding-block: 0 var(--query-builder-outer-padding);
+            }
         }
 
         &:has(igx-query-builder-header) {
             padding-block-start: 0;
+
+            %query-level-0 {
+                padding-block: if($variant != 'bootstrap', 0, rem(16px)) var(--query-builder-outer-padding);
+            }
         }
 
 	    .igx-chip__ghost {
@@ -162,10 +178,8 @@
     %query-level-0 {
         display: block;
         width: 100%;
-        padding-inline: if($variant != 'bootstrap', rem(24px), rem(16px));
-        padding-block:
-            if($variant != 'bootstrap', 0, rem(16px))
-            if($variant != 'bootstrap', rem(24px), rem(16px));
+
+        padding-inline: var(--query-builder-outer-padding);
 
         > %advanced-filter__main {
             gap: rem(16px);
@@ -176,7 +190,7 @@
                 max-height: rem(570px);
                 overflow-y: auto;
                 overflow-x: hidden;
-                padding-inline-end: rem(16px);
+                padding-inline-end: var(--_tree-scrollbar-gutter);
             }
         }
     }
@@ -247,8 +261,8 @@
         margin-bottom: 0;
         border-block-end: rem(1px) solid var-get($theme, 'header-border');
 
-        padding-inline: if($variant != 'bootstrap', rem(24px), rem(16px));
-        padding-block: if($variant != 'bootstrap', rem(24px), rem(16px)) rem(16px);
+        padding-inline: var(--query-builder-outer-padding);
+        padding-block: var(--query-builder-outer-padding) rem(16px);
     }
 
     %advanced-filter__title {

projects/igniteui-angular/src/lib/directives/for-of/base.helper.component.ts

@@ -7,11 +7,14 @@ import {
     AfterViewInit,
     Inject,
     NgZone,
-    DOCUMENT
+    Renderer2,
+    PLATFORM_ID,
+    inject
 } from '@angular/core';
 import { Subject } from 'rxjs';
 import { takeUntil, throttleTime } from 'rxjs/operators';
 import { resizeObservable, PlatformUtil } from '../../core/utils';
+import { DOCUMENT, isPlatformBrowser } from '@angular/common';
 
 @Directive({
     selector: '[igxVirtualHelperBase]',
@@ -27,13 +30,16 @@ export class VirtualHelperBaseDirective implements OnDestroy, AfterViewInit {
     private _afterViewInit = false;
     private _scrollNativeSize: number;
     private _detached = false;
+    protected renderer = inject(Renderer2);
+    protected platformId = inject(PLATFORM_ID);
+    protected ngZone = inject(NgZone);
 
     constructor(
         public elementRef: ElementRef<HTMLElement>,
         public cdr: ChangeDetectorRef,
         protected _zone: NgZone,
         @Inject(DOCUMENT) public document: any,
-        protected platformUtil: PlatformUtil,
+        protected platformUtil: PlatformUtil
     ) {
         this._scrollNativeSize = this.calculateScrollNativeSize();
     }
@@ -104,6 +110,34 @@ export class VirtualHelperBaseDirective implements OnDestroy, AfterViewInit {
         return this.document.body.contains(this.nativeElement);
     }
 
+    private toggleClass(element: HTMLElement, className: string, shouldHaveClass: boolean): void {
+        if (shouldHaveClass) {
+            this.renderer.addClass(element, className);
+        } else {
+            this.renderer.removeClass(element, className);
+        }
+    }
+
+    private updateScrollbarClass() {
+        if (!isPlatformBrowser(this.platformId)) {
+            return;
+        }
+
+        this.ngZone.runOutsideAngular(() => {
+            requestAnimationFrame(() => {
+            const el = this.nativeElement;
+            const hasScrollbar = el.scrollHeight > el.clientHeight;
+            const prevSibling = el.previousElementSibling as HTMLElement | null;
+            const scrollbarClass = 'igx-display-container--scrollbar';
+
+            if (prevSibling?.tagName.toLowerCase() === 'igx-display-container') {
+                this.toggleClass(prevSibling, scrollbarClass, hasScrollbar);
+            }
+            });
+        });
+    }
+
+
     protected handleMutations(event) {
         const hasSize = !(event[0].contentRect.height === 0 && event[0].contentRect.width === 0);
         if (!hasSize && !this.isAttachedToDom) {
@@ -113,6 +147,8 @@ export class VirtualHelperBaseDirective implements OnDestroy, AfterViewInit {
             // attached back now.
             this.restoreScroll();
         }
+
+        this.updateScrollbarClass();
     }
 
     protected restoreScroll() {}

projects/igniteui-angular/src/lib/directives/for-of/horizontal.virtual.helper.component.ts

@@ -1,5 +1,6 @@
-import { Component, ElementRef, HostBinding, Input, ViewChild, ViewContainerRef, ChangeDetectorRef, Inject, NgZone, DOCUMENT } from '@angular/core';
+import { Component, ElementRef, HostBinding, Input, ViewChild, ViewContainerRef, ChangeDetectorRef, Inject, NgZone } from '@angular/core';
 import { VirtualHelperBaseDirective } from './base.helper.component';
+import { DOCUMENT } from '@angular/common';
 import { PlatformUtil } from '../../core/utils';
 
 /**
@@ -18,7 +19,13 @@ export class HVirtualHelperComponent extends VirtualHelperBaseDirective {
     @HostBinding('class')
     public cssClasses = 'igx-vhelper--horizontal';
 
-    constructor(elementRef: ElementRef, cdr: ChangeDetectorRef, zone: NgZone, @Inject(DOCUMENT) document, platformUtil: PlatformUtil) {
+    constructor(
+        elementRef: ElementRef,
+        cdr: ChangeDetectorRef,
+        zone: NgZone,
+        @Inject(DOCUMENT) document: any,
+        platformUtil: PlatformUtil
+    ) {
         super(elementRef, cdr, zone, document, platformUtil);
     }
 

projects/igniteui-angular/src/lib/directives/for-of/virtual.helper.component.ts

@@ -1,6 +1,7 @@
 import { Component, ElementRef, HostBinding, Input, ViewChild, ViewContainerRef,
-    ChangeDetectorRef, OnDestroy, OnInit, Inject, NgZone, DOCUMENT } from '@angular/core';
+    ChangeDetectorRef, OnDestroy, OnInit, Inject, NgZone} from '@angular/core';
 import { VirtualHelperBaseDirective } from './base.helper.component';
+import { DOCUMENT } from '@angular/common';
 import { PlatformUtil } from '../../core/utils';
 
 @Component({
@@ -20,7 +21,13 @@ export class VirtualHelperComponent extends VirtualHelperBaseDirective implement
     @HostBinding('class')
     public cssClasses = 'igx-vhelper--vertical';
 
-    constructor(elementRef: ElementRef, cdr: ChangeDetectorRef, zone: NgZone, @Inject(DOCUMENT) document, platformUtil: PlatformUtil) {
+    constructor(
+        elementRef: ElementRef,
+        cdr: ChangeDetectorRef,
+        zone: NgZone,
+        @Inject(DOCUMENT) document: any,
+        platformUtil: PlatformUtil,
+    ) {
         super(elementRef, cdr, zone, document, platformUtil);
     }