fix(datagrid): clean up and use different condition for skiping

Author: Daniel Tsanev

projects/angular/clarity.api.md

@@ -1138,8 +1138,6 @@ export class ClrDatagrid<T = any> implements AfterContentInit, AfterViewInit, On
     detailService: DetailService;
     // (undocumented)
     _displayedRows: ViewContainerRef;
-    // (undocumented)
-    el: ElementRef;
     // Warning: (ae-forgotten-export) The symbol "ExpandableRowsCount" needs to be exported by the entry point index.d.ts
     //
     // (undocumented)
@@ -1251,7 +1249,7 @@ export class ClrDatagridCell implements OnInit {
 export class ClrDatagridColumn<T = any> extends DatagridFilterRegistrar<T, ClrDatagridFilterInterface<T>> implements OnDestroy, OnInit, OnChanges {
     // Warning: (ae-forgotten-export) The symbol "Sort" needs to be exported by the entry point index.d.ts
     // Warning: (ae-forgotten-export) The symbol "FiltersProvider" needs to be exported by the entry point index.d.ts
-    constructor(_sort: Sort<T>, filters: FiltersProvider<T>, vcr: ViewContainerRef, detailService: DetailService, changeDetectorRef: ChangeDetectorRef, smartPositionService: ClrPopoverPositionService, smartEventsService: ClrPopoverEventsService, columnsService: ColumnsService);
+    constructor(_sort: Sort<T>, filters: FiltersProvider<T>, vcr: ViewContainerRef, detailService: DetailService, changeDetectorRef: ChangeDetectorRef, smartPositionService: ClrPopoverPositionService, smartEventsService: ClrPopoverEventsService, page: Page);
     // (undocumented)
     get ariaSort(): "none" | "ascending" | "descending";
     // (undocumented)

projects/angular/src/data/datagrid/all.spec.ts

@@ -41,7 +41,6 @@ import DatagridRowSpecs from './datagrid-row.spec';
 import DatagridSpecs from './datagrid.spec';
 import { addHelpers } from './helpers.spec';
 import ColumnResizerServiceSpecs from './providers/column-resizer.service.spec';
-import ColumnsServiceSpec from './providers/columns.service.spec';
 import DisplayModeServiceSpecs from './providers/display-mode.service.spec';
 import FiltersProviderSpecs from './providers/filters.spec';
 import ItemsProviderSpecs from './providers/items.spec';
@@ -73,7 +72,6 @@ describe('Datagrid', function () {
     DisplayModeServiceSpecs();
     TableSizeServiceSpec();
     ColumnResizerServiceSpecs();
-    ColumnsServiceSpec();
   });
 
   describe('Components', function () {

projects/angular/src/data/datagrid/datagrid-column.ts

@@ -34,10 +34,10 @@ import { DatagridStringFilterImpl } from './built-in/filters/datagrid-string-fil
 import { ClrDatagridSortOrder } from './enums/sort-order.enum';
 import { ClrDatagridComparatorInterface } from './interfaces/comparator.interface';
 import { ClrDatagridFilterInterface } from './interfaces/filter.interface';
-import { ColumnsService } from './providers/columns.service';
 import { CustomFilter } from './providers/custom-filter';
 import { DetailService } from './providers/detail.service';
 import { FiltersProvider } from './providers/filters';
+import { Page } from './providers/page';
 import { Sort } from './providers/sort';
 import { DatagridFilterRegistrar } from './utils/datagrid-filter-registrar';
 import { WrappedColumn } from './wrapped-column';
@@ -156,7 +156,7 @@ export class ClrDatagridColumn<T = any>
     private changeDetectorRef: ChangeDetectorRef,
     private smartPositionService: ClrPopoverPositionService,
     private smartEventsService: ClrPopoverEventsService,
-    private columnsService: ColumnsService
+    private page: Page
   ) {
     super(filters);
     this.subscriptions.push(this.listenForSortingChanges());
@@ -384,7 +384,7 @@ export class ClrDatagridColumn<T = any>
   private listenForFilterChanges() {
     return this.filter.changes
       .pipe(
-        skipWhile(() => !!this.columnsService.host?.el?.nativeElement?.style.height),
+        skipWhile(() => this.page.size > 0),
         tap(() => {
           this.smartEventsService.removeScrollListener();
           this.smartPositionService.realign();

projects/angular/src/data/datagrid/datagrid.ts

@@ -142,15 +142,15 @@ export class ClrDatagrid<T = any> implements AfterContentInit, AfterViewInit, On
     private renderer: Renderer2,
     public detailService: DetailService,
     @Inject(DOCUMENT) private document: any,
-    public el: ElementRef,
+    private el: ElementRef,
     private page: Page,
     public commonStrings: ClrCommonStringsService,
     private columnsService: ColumnsService,
     private keyNavigation: KeyNavigationGridController,
     private zone: NgZone
   ) {
     const datagridId = uniqueIdFactory();
-    this.columnsService.host = this;
+
     this.selectAllId = 'clr-dg-select-all-' + datagridId;
     this.detailService.id = datagridId;
   }

projects/angular/src/data/datagrid/providers/columns.service.ts

@@ -7,14 +7,12 @@
 import { Injectable } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 
-import { ClrDatagrid } from '../datagrid';
 import { ALL_COLUMN_CHANGES } from '../enums/column-changes.enum';
 import { ColumnState, ColumnStateDiff } from '../interfaces/column-state.interface';
 
 @Injectable()
 export class ColumnsService {
   columns: BehaviorSubject<ColumnState>[] = [];
-  host: ClrDatagrid;
 
   private _cache: ColumnState[] = [];