Merge remote-tracking branch 'origin/20.0.x' into ttonev/tree-fix-ssr-20.x

Author: tishko0

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

@@ -347,10 +347,10 @@ export class IgxTooltipTargetDirective extends IgxToggleActionDirective implemen
     @HostListener('click')
     public override onClick() {
         if (!this.target.collapsed) {
-            this._hideOnInteraction();
-        } else if (this.target.timeoutId) {
+            this.target.forceClose(this.mergedOverlaySettings);
+        } else if (this.target.toBeShown) {
             clearTimeout(this.target.timeoutId);
-            this.target.timeoutId = null;
+            this.target.toBeShown = false;
         }
     }
 

projects/igniteui-angular/src/lib/grids/grid/column-resizing.spec.ts

@@ -975,65 +975,6 @@ describe('IgxGrid - Deferred Column Resizing #grid', () => {
             expect(Math.abs(resizerRectTop - headerRectTop)).toBeLessThanOrEqual(1);
         }));
     });
-
-    describe('Resizer tests: ', () => {
-        let fixture: ComponentFixture<any>;
-        let grid: IgxGridComponent;
-
-        beforeEach(fakeAsync(() => {
-            fixture = TestBed.createComponent(ResizableColumnsWithToolbarComponent);
-            fixture.detectChanges();
-            grid = fixture.componentInstance.grid;
-        }));
-
-        it('should align the resizer top with the grid header top', fakeAsync(() => {
-            grid.nativeElement.style.marginTop = '40px';
-            fixture.detectChanges();
-            const headers = GridFunctions.getColumnHeaders(fixture);
-            const headerResArea = GridFunctions.getHeaderResizeArea(headers[0]).nativeElement;
-
-            const headerRectTop = headerResArea.getBoundingClientRect().top;
-
-            UIInteractions.simulateMouseEvent('mousedown', headerResArea, 100, 15);
-            tick(200);
-            fixture.detectChanges();
-
-            const resizer = GridFunctions.getResizer(fixture).nativeElement;
-            expect(resizer).toBeDefined();
-
-            const resizerRectTop = resizer.getBoundingClientRect().top;
-            UIInteractions.simulateMouseEvent('mousemove', resizer, 250, 15);
-            UIInteractions.simulateMouseEvent('mouseup', resizer, 250, 15);
-            fixture.detectChanges();
-
-
-            expect(Math.abs(resizerRectTop - headerRectTop)).toBeLessThanOrEqual(1);
-        }));
-
-        it('should align the resizer top with the grid header top when grid is scaled', fakeAsync(() => {
-            grid.nativeElement.style.transform = 'scale(0.6)';
-            fixture.detectChanges();
-
-            const headers = GridFunctions.getColumnHeaders(fixture);
-            const headerResArea = GridFunctions.getHeaderResizeArea(headers[1]).nativeElement;
-            const headerRectTop = headerResArea.getBoundingClientRect().top;
-
-            // Trigger resize to show resizer
-            UIInteractions.simulateMouseEvent('mousedown', headerResArea, 153, 0);
-            tick(200);
-            fixture.detectChanges();
-
-            const resizer = GridFunctions.getResizer(fixture).nativeElement;
-            expect(resizer).toBeDefined();
-
-            const resizerRectTop = resizer.getBoundingClientRect().top;
-
-            UIInteractions.simulateMouseEvent('mouseup', resizer, 200, 5);
-            fixture.detectChanges();
-
-            expect(Math.abs(resizerRectTop - headerRectTop)).toBeLessThanOrEqual(1);
-        }));
-    });
 });
 
 @Component({