Skip to content

fix(cdk/table): Measure column width for sticky columns after new data ha… #23885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 10, 2022
Merged

fix(cdk/table): Measure column width for sticky columns after new data ha… #23885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions src/cdk/table/table.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import {
IterableChangeRecord,
IterableDiffer,
IterableDiffers,
NgZone,
OnDestroy,
OnInit,
Optional,
Expand All @@ -60,7 +61,7 @@ import {
Subject,
Subscription,
} from 'rxjs';
import {takeUntil} from 'rxjs/operators';
import {take, takeUntil} from 'rxjs/operators';
import {CdkColumnDef} from './cell';
import {_CoalescedStyleScheduler, _COALESCED_STYLE_SCHEDULER} from './coalesced-style-scheduler';
import {
Expand Down Expand Up @@ -525,6 +526,12 @@ export class CdkTable<T> implements AfterContentChecked, CollectionViewer, OnDes
@SkipSelf()
@Inject(STICKY_POSITIONING_LISTENER)
protected readonly _stickyPositioningListener: StickyPositioningListener,
/**
* @deprecated `_ngZone` parameter to become required.
* @breaking-change 14.0.0
*/
@Optional()
protected readonly _ngZone: NgZone,
) {
if (!role) {
this._elementRef.nativeElement.setAttribute('role', 'table');
Expand Down Expand Up @@ -666,7 +673,16 @@ export class CdkTable<T> implements AfterContentChecked, CollectionViewer, OnDes
});

this._updateNoDataRow();
this.updateStickyColumnStyles();

// Allow the new row data to render before measuring it.
// @breaking-change 14.0.0 Remove undefined check once _ngZone is required.
if (this._ngZone && NgZone.isInAngularZone()) {
this._ngZone.onStable.pipe(take(1), takeUntil(this._onDestroy)).subscribe(() => {
this.updateStickyColumnStyles();
});
} else {
this.updateStickyColumnStyles();
}

this.contentChanged.next();
}
Expand Down
7 changes: 5 additions & 2 deletions tools/public_api_guard/cdk/table.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,8 @@ export class CdkRowDef<T> extends BaseRowDef {
// @public
export class CdkTable<T> implements AfterContentChecked, CollectionViewer, OnDestroy, OnInit {
constructor(_differs: IterableDiffers, _changeDetectorRef: ChangeDetectorRef, _elementRef: ElementRef, role: string, _dir: Directionality, _document: any, _platform: Platform, _viewRepeater: _ViewRepeater<T, RenderRow<T>, RowContext<T>>, _coalescedStyleScheduler: _CoalescedStyleScheduler, _viewportRuler: ViewportRuler,
_stickyPositioningListener: StickyPositioningListener);
_stickyPositioningListener: StickyPositioningListener,
_ngZone: NgZone);
addColumnDef(columnDef: CdkColumnDef): void;
addFooterRowDef(footerRowDef: CdkFooterRowDef): void;
addHeaderRowDef(headerRowDef: CdkHeaderRowDef): void;
Expand Down Expand Up @@ -344,6 +345,8 @@ export class CdkTable<T> implements AfterContentChecked, CollectionViewer, OnDes
ngOnDestroy(): void;
// (undocumented)
ngOnInit(): void;
// @deprecated (undocumented)
protected readonly _ngZone: NgZone;
_noDataRow: CdkNoDataRow;
// (undocumented)
_noDataRowOutlet: NoDataRowOutlet;
Expand Down Expand Up @@ -372,7 +375,7 @@ export class CdkTable<T> implements AfterContentChecked, CollectionViewer, OnDes
// (undocumented)
static ɵcmp: i0.ɵɵComponentDeclaration<CdkTable<any>, "cdk-table, table[cdk-table]", ["cdkTable"], { "trackBy": "trackBy"; "dataSource": "dataSource"; "multiTemplateDataRows": "multiTemplateDataRows"; "fixedLayout": "fixedLayout"; }, { "contentChanged": "contentChanged"; }, ["_noDataRow", "_contentColumnDefs", "_contentRowDefs", "_contentHeaderRowDefs", "_contentFooterRowDefs"], ["caption", "colgroup, col"]>;
// (undocumented)
static ɵfac: i0.ɵɵFactoryDeclaration<CdkTable<any>, [null, null, null, { attribute: "role"; }, { optional: true; }, null, null, null, null, null, { optional: true; skipSelf: true; }]>;
static ɵfac: i0.ɵɵFactoryDeclaration<CdkTable<any>, [null, null, null, { attribute: "role"; }, { optional: true; }, null, null, null, null, null, { optional: true; skipSelf: true; }, { optional: true; }]>;
}

// @public (undocumented)
Expand Down