Merge branch 'master' into mkirkova-fix-15113-master

Author: kacheshmarova

.github/workflows/nodejs.yml

@@ -66,6 +66,8 @@ jobs:
             fi
       - name: Test Elements
         run: npm run test:elements
+      - name: Build Demos
+        run: npm run build
       - name: Bundle Tree-Shake & SSR Test
         run: npm run build:bundletest
       - name: Publish to coveralls.io

angular.json

@@ -38,7 +38,6 @@
             "sourceMap": true,
             "optimization": false,
             "namedChunks": true,
-            "aot": false,
             "stylePreprocessorOptions": {
               "includePaths": [
                 "node_modules"

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

@@ -16,6 +16,7 @@ import { IgxAvatarComponent } from '../../avatar/avatar.component';
 import { IColumnResizeEventArgs, IgxColumnComponent } from '../public_api';
 import { Size } from "../common/enums";
 import { setElementSize } from '../../test-utils/helper-utils.spec';
+import { IgxColumnResizerDirective } from '../resizing/resizer.directive';
 
 describe('IgxGrid - Deferred Column Resizing #grid', () => {
 
@@ -133,6 +134,27 @@ describe('IgxGrid - Deferred Column Resizing #grid', () => {
             expect(grid.columnList.get(1).width).toEqual('70px');
         }));
 
+        it('should calculate correctly resizer position and column width when grid is scaled and zoomed', fakeAsync(() => {
+            grid.nativeElement.style.transform = 'scale(1.2)';
+            grid.nativeElement.style.setProperty('zoom', '1.05');
+            fixture.detectChanges();
+            headerResArea = GridFunctions.getHeaderResizeArea(headers[1]).nativeElement;
+            UIInteractions.simulateMouseEvent('mousedown', headerResArea, 153, 0);
+            tick(200);
+            fixture.detectChanges();
+
+            const resizer = GridFunctions.getResizer(fixture);
+            const resizerDirective = resizer.componentInstance.resizer as IgxColumnResizerDirective;
+            const leftSetterSpy = spyOnProperty(resizerDirective, 'left', 'set').and.callThrough();
+            UIInteractions.simulateMouseEvent('mousemove', resizer.nativeElement, 200, 5);
+            UIInteractions.simulateMouseEvent('mouseup', resizer.nativeElement, 200, 5);
+            fixture.detectChanges();
+
+            expect(leftSetterSpy).toHaveBeenCalled();
+            expect(parseInt(leftSetterSpy.calls.mostRecent().args[0].toFixed(0))).toEqual(200);
+            expect(parseInt(grid.columnList.get(1).headerCell.nativeElement.getBoundingClientRect().width.toFixed(0))).toEqual(173);
+        }));
+
         it('should be able to resize column to the minWidth < defaultMinWidth', fakeAsync(() => {
             const column = grid.getColumnByName('ID');
             column.minWidth = 'a';

projects/igniteui-angular/src/lib/grids/resizing/resizer.component.html

@@ -4,5 +4,5 @@
     [restrictHResizeMax]="colResizingService.restrictResizeMax"
     [restrictHResizeMin]="colResizingService.restrictResizeMin"
     [restrictResizerTop]="restrictResizerTop"
-    (resizeEnd)="colResizingService.resizeColumn($event)">
+    (resizeEnd)="colResizingService.resizeColumn($event, resizer.ratio)">
 </div>

projects/igniteui-angular/src/lib/grids/resizing/resizer.directive.ts

@@ -41,8 +41,13 @@ export class IgxColumnResizerDirective implements OnInit, OnDestroy {
     @Output() public resize = new Subject<any>();
 
     private _left: number;
+    private _ratio: number = 1;
     private _destroy = new Subject<boolean>();
 
+    public get ratio(): number {
+        return this._ratio;
+    }
+
     constructor(
         public element: ElementRef<HTMLElement>,
         @Inject(DOCUMENT) public document,
@@ -56,7 +61,7 @@ export class IgxColumnResizerDirective implements OnInit, OnDestroy {
                 .pipe(
                     takeUntil(this._destroy),
                     takeUntil<MouseEvent>(this.resizeEnd),
-                    map((event) => event.clientX - offset),
+                    map((event) => (event.clientX - offset) / (this._ratio)),
                 ))
         )
             .subscribe((pos) => {
@@ -113,8 +118,12 @@ export class IgxColumnResizerDirective implements OnInit, OnDestroy {
     public onMousedown(event: MouseEvent) {
         event.preventDefault();
         const parent = this.element.nativeElement.parentElement.parentElement;
-
-        this.left = this._left = event.clientX - parent.getBoundingClientRect().left;
+        const parentRectWidth = parent.getBoundingClientRect().width;
+        const parentComputedWidth = parseFloat(window.getComputedStyle(parent).width);
+        if (Math.abs(parentRectWidth - parentComputedWidth) > 1) {
+            this._ratio = parentRectWidth / parentComputedWidth;
+        }
+        this.left = this._left = (event.clientX - parent.getBoundingClientRect().left) / this._ratio;
         this.top = (event.target as HTMLElement).getBoundingClientRect().top - parent.getBoundingClientRect().top;
 
         this.resizeStart.next(event);

projects/igniteui-angular/src/lib/grids/resizing/resizing.service.ts

@@ -35,7 +35,7 @@ export class IgxColumnResizingService {
      * @hidden
      */
     public getColumnHeaderRenderedWidth() {
-        return this.column.headerCell.nativeElement.getBoundingClientRect().width;
+        return parseFloat(window.getComputedStyle(this.column.headerCell.nativeElement).width);
     }
 
     /**
@@ -101,9 +101,9 @@ export class IgxColumnResizingService {
     /**
      * Resizes the column regaridng to the column minWidth and maxWidth.
      */
-    public resizeColumn(event: MouseEvent) {
+    public resizeColumn(event: MouseEvent, ratio: number = 1) {
         this.showResizer = false;
-        const diff = event.clientX - this.startResizePos;
+        const diff = (event.clientX - this.startResizePos) / ratio;
 
         const colWidth = this.column.width;
         const isPercentageWidth = colWidth && typeof colWidth === 'string' && colWidth.indexOf('%') !== -1;

src/app/action-strip/action-strip.sample.html

@@ -32,7 +32,7 @@ <h5>Grid Pinning Action</h5>
         </igx-action-strip>
     </igx-grid>
 </div>
-<button igxButton="outlined" (click)="this.grid1.transactions.commit(this.grid1.data)">Commit</button>
+<button igxButton="outlined" (click)="grid1.transactions.commit(grid1.data)">Commit</button>
 
 <div class="sample-column">
     <h5>Grid Pinning and Editing Actions</h5>

src/app/action-strip/action-strip.sample.ts

@@ -7,7 +7,6 @@ import {
     IgxActionStripComponent,
     IgxActionStripMenuItemDirective,
     IgxButtonDirective,
-    IgxButtonGroupComponent,
     IgxCellTemplateDirective,
     IgxColumnComponent,
     IgxGridComponent,
@@ -65,7 +64,6 @@ class User {
     imports: [
         NgIf,
         NgFor,
-        IgxButtonGroupComponent,
         IgxButtonDirective,
         IgxActionStripComponent,
         IgxIconComponent,

src/app/app.component.ts

@@ -292,7 +292,7 @@ export class AppComponent implements OnInit {
             name: 'Grid Auto Size'
         },
         {
-            link: '/gridDocManager',
+            link: '/gridDockManager',
             icon: 'view_column',
             name: 'Grid in DockManager'
         },

src/app/app.routes.ts

@@ -138,7 +138,7 @@ import { GridValidationSampleComponent } from './grid-validation/grid-validation
 import { GridExportComponent } from './grid-export/grid-export.sample';
 import { DividerComponent } from './divider/divider.component';
 import { MonthPickerSampleComponent } from './month-picker/month-picker.sample';
-import { GridDocManagerSampleComponent } from './docmanager-grid/docmanager-grid.sample';
+import { GridDockManagerSampleComponent } from './dockmanager-grid/dockmanager-grid.sample';
 import { HoundComponent } from './hound/hound.component';
 import { LabelSampleComponent } from "./label/label.sample";
 import { GridRecreateSampleComponent } from './grid-re-create/grid-re-create.sample';
@@ -614,8 +614,8 @@ export const appRoutes: Routes = [
         component: GridAutoSizeSampleComponent
     },
     {
-        path: 'gridDocManager',
-        component: GridDocManagerSampleComponent
+        path: 'gridDockManager',
+        component: GridDockManagerSampleComponent
     },
     {
         path: 'gridFlex',