Merge branch 'master' into ikitanov/fix-16091

Author: ChronosSF

README.md

@@ -337,7 +337,7 @@ In order for us to verify your eligibility for free usage, please [register for
 
 To acquire a license for commercial usage, please [register for trial](https://Infragistics.com/Angular) and refer to the purchasing options in the pricing section on the product page.
 
-© Copyright 2020 INFRAGISTICS. All Rights Reserved.
+© Copyright 2025 INFRAGISTICS. All Rights Reserved.
 The Infragistics Ultimate license & copyright applies to this distribution.
 For information on that license, please go to our website [https://www.infragistics.com/legal/license](https://www.infragistics.com/legal/license).
 

package-lock.json

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

package.json

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

projects/igniteui-angular/package.json

@@ -132,7 +132,7 @@
 
         @if $variant != 'material' {
             %switch-thumb {
-                background: var-get($theme, 'border-hover-color');
+                background: var-get($theme, 'thumb-off-hover-color');
             }
 
             %switch-thumb--x {

projects/igniteui-angular/src/lib/core/styles/components/switch/_switch-theme.scss

@@ -7,6 +7,7 @@
 
 // Used to configure color accessibility for charts
 @use 'igniteui-theming/sass/color/functions' as color;
+@use 'igniteui-theming/sass/themes/mixins' as theming;
 
 // Common components
 @use '../components/_common/igx-control';
@@ -113,6 +114,8 @@
         }
     }
 
+    @include theming.spacing();
+
     @property --_progress-integer {
         syntax: '<integer>';
         initial-value: 0;

projects/igniteui-angular/src/lib/core/styles/themes/_core.scss

@@ -84,18 +84,6 @@
         --ig-size-small: 1;
         --ig-size-medium: 2;
         --ig-size-large: 3;
-
-        --ig-spacing-small: 1;
-        --ig-spacing-medium: 1;
-        --ig-spacing-large: 1;
-
-        --ig-spacing-inline-small: 1;
-        --ig-spacing-inline-medium: 1;
-        --ig-spacing-inline-large: 1;
-
-        --ig-spacing-block-small: 1;
-        --ig-spacing-block-medium: 1;
-        --ig-spacing-block-large: 1;
     }
 
     @if not(list.index($exclude, 'palette')) {

projects/igniteui-angular/src/lib/core/styles/themes/generators/_base.scss

@@ -2,7 +2,7 @@ import { DebugElement } from '@angular/core';
 import { fakeAsync, TestBed, tick, flush, waitForAsync, ComponentFixture } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { IgxTooltipSingleTargetComponent, IgxTooltipMultipleTargetsComponent, IgxTooltipPlainStringComponent, IgxTooltipWithToggleActionComponent } from '../../test-utils/tooltip-components.spec';
+import { IgxTooltipSingleTargetComponent, IgxTooltipMultipleTargetsComponent, IgxTooltipPlainStringComponent, IgxTooltipWithToggleActionComponent, IgxTooltipMultipleTooltipsComponent } from '../../test-utils/tooltip-components.spec';
 import { UIInteractions } from '../../test-utils/ui-interactions.spec';
 import { HorizontalAlignment, VerticalAlignment, AutoPositionStrategy } from '../../services/public_api';
 import { IgxTooltipDirective } from './tooltip.directive';
@@ -621,6 +621,36 @@ describe('IgxTooltip', () => {
         }));
     });
 
+    describe('Multiple tooltips', () => {
+        let targetOne: IgxTooltipTargetDirective;
+
+        let tooltipOne: IgxTooltipDirective;
+        let tooltipTwo: IgxTooltipDirective;
+
+        beforeEach(waitForAsync(() => {
+            fix = TestBed.createComponent(IgxTooltipMultipleTooltipsComponent);
+            fix.detectChanges();
+            targetOne = fix.componentInstance.targetOne;
+            tooltipOne = fix.componentInstance.tooltipOne;
+            tooltipTwo = fix.componentInstance.tooltipTwo;
+        }));
+
+        it('should not add multiple document:touchstart event listeners when having multiple igxTooltip instances - #16100', fakeAsync(() => {
+            spyOn<any>(tooltipOne, 'onDocumentTouchStart').and.callThrough();
+            spyOn<any>(tooltipTwo, 'onDocumentTouchStart').and.callThrough();
+
+            touchElement(targetOne);
+            tick(500);
+
+            const dummyDiv = fix.debugElement.query(By.css('.dummyDiv'));
+            touchElement(dummyDiv);
+            flush();
+
+            expect(tooltipOne['onDocumentTouchStart']).toHaveBeenCalledTimes(1);
+            expect(tooltipTwo['onDocumentTouchStart']).not.toHaveBeenCalled();
+        }));
+    });
+
     describe('Tooltip integration', () => {
         beforeEach(waitForAsync(() => {
             fix = TestBed.createComponent(IgxTooltipWithToggleActionComponent);

projects/igniteui-angular/src/lib/directives/tooltip/tooltip.directive.spec.ts

@@ -122,10 +122,10 @@ export class IgxTooltipDirective extends IgxToggleDirective implements OnDestroy
         super(elementRef, cdr, overlayService, navigationService);
 
         this.onDocumentTouchStart = this.onDocumentTouchStart.bind(this);
-        this.overlayService.opening.pipe(takeUntil(this._destroy$)).subscribe(() => {
+        this.opening.pipe(takeUntil(this._destroy$)).subscribe(() => {
             this._document.addEventListener('touchstart', this.onDocumentTouchStart, { passive: true });
         });
-        this.overlayService.closed.pipe(takeUntil(this._destroy$)).subscribe(() => {
+        this.closed.pipe(takeUntil(this._destroy$)).subscribe(() => {
             this._document.removeEventListener('touchstart', this.onDocumentTouchStart);
         });
     }

projects/igniteui-angular/src/lib/directives/tooltip/tooltip.directive.ts

@@ -519,11 +519,7 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy, CellT
     /** @hidden @internal */
     @HostBinding('attr.aria-describedby')
     public get ariaDescribeBy() {
-        let describeBy = (this.gridID + '_' + this.column.field).replace('.', '_');
-        if (this.isInvalid) {
-            describeBy += ' ' + this.ariaErrorMessage;
-        }
-        return describeBy;
+        return this.isInvalid ? this.ariaErrorMessage : null;
     }
 
     /** @hidden @internal */
@@ -707,6 +703,17 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy, CellT
         }
     }
 
+    @HostBinding('attr.aria-rowindex')
+    protected get ariaRowIndex(): number {
+        // +2 because aria-rowindex is 1-based and the first row is the header
+        return this.rowIndex + 2;
+    }
+
+    @HostBinding('attr.aria-colindex')
+    protected get ariaColIndex(): number {
+        return this.column.index + 1;
+    }
+
     @ViewChild('defaultCell', { read: TemplateRef, static: true })
     protected defaultCellTemplate: TemplateRef<any>;