Skip to content

Commit eddf43d

Browse files
committed
almost there
1 parent b71cbd1 commit eddf43d

File tree

5 files changed

+21
-19
lines changed

5 files changed

+21
-19
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@
119119
/src/dev-app/card/** @jelbourn
120120
/src/dev-app/checkbox/** @jelbourn @devversion
121121
/src/dev-app/chips/** @jelbourn
122+
/src/dev-app/column-resize/** @kseamon @andrewseguin
122123
/src/dev-app/connected-overlay/** @jelbourn @crisbeto
123124
/src/dev-app/dataset/** @andrewseguin
124125
/src/dev-app/datepicker/** @mmalerba

src/cdk-experimental/column-resize/column-resize.ts

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const TABLE_PROVIDERS = [...PROVIDERS, TABLE_LAYOUT_FIXED_RESIZE_STRATEGY_PROVID
2626
const FLEX_PROVIDERS = [...PROVIDERS, FLEX_RESIZE_STRATEGY_PROVIDER];
2727
const HOST_BINDINGS = {
2828
'[class]': 'getIdClass()',
29-
'[class.column-resize-rtl]': 'directionality.value === "rtl"',
29+
'[class.cdk-column-resize-rtl]': 'directionality.value === "rtl"',
3030
};
3131

3232
let idSequence = 0;
@@ -68,11 +68,7 @@ export abstract class ColumnResize implements AfterViewInit, OnDestroy {
6868
}
6969

7070
getIdClass() {
71-
return `column-resize-${this.id}`;
72-
}
73-
74-
getWithResizedColumnClass() {
75-
return 'with-resized-column';
71+
return `cdk-column-resize-${this.id}`;
7672
}
7773

7874
private _listenForRowHoverEvents() {
@@ -101,7 +97,7 @@ export abstract class ColumnResize implements AfterViewInit, OnDestroy {
10197
takeUntil(this.destroyed),
10298
take(1),
10399
).subscribe(() => {
104-
this.elementRef.nativeElement!.classList.add(this.getWithResizedColumnClass());
100+
this.elementRef.nativeElement!.classList.add(WITH_RESIZED_COLUMN_CLASS);
105101
});
106102
}
107103

@@ -112,10 +108,10 @@ export abstract class ColumnResize implements AfterViewInit, OnDestroy {
112108
pairwise(),
113109
).subscribe(([previousRow, hoveredRow]) => {
114110
if (hoveredRow) {
115-
hoveredRow.classList.add('hover-or-active');
111+
hoveredRow.classList.add(HOVER_OR_ACTIVE_CLASS);
116112
}
117113
if (previousRow) {
118-
previousRow.classList.remove('hover-or-active');
114+
previousRow.classList.remove(HOVER_OR_ACTIVE_CLASS);
119115
}
120116
});
121117
}
@@ -196,3 +192,6 @@ export class CdkColumnResizeFlex extends ColumnResize {
196192
super();
197193
}
198194
}
195+
196+
const HOVER_OR_ACTIVE_CLASS = 'cdk-column-resize-hover-or-active';
197+
const WITH_RESIZED_COLUMN_CLASS = 'cdk-column-resize-with-resized-column';

src/cdk-experimental/column-resize/resizable.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export abstract class Resizable<HandleComponent extends ResizeOverlayHandle>
114114
takeUntilDestroyed,
115115
filter(columnSize => columnSize.columnId === this.columnDef.name),
116116
).subscribe(({size, completeImmediately}) => {
117-
this.elementRef.nativeElement!.classList.add('resizable-overlay-thumb-active');
117+
this.elementRef.nativeElement!.classList.add(OVERLAY_ACTIVE_CLASS);
118118
this._applySize(size);
119119

120120
if (completeImmediately) {
@@ -131,7 +131,7 @@ export abstract class Resizable<HandleComponent extends ResizeOverlayHandle>
131131
this.resizeNotifier.resizeCanceled,
132132
this.resizeNotifier.resizeCompleted,
133133
).pipe(takeUntilDestroyed).subscribe(columnSize => {
134-
this.elementRef.nativeElement!.classList.remove('resizable-overlay-thumb-active');
134+
this.elementRef.nativeElement!.classList.remove(OVERLAY_ACTIVE_CLASS);
135135

136136
if (this.overlayRef && this.overlayRef.hasAttached()) {
137137
this._updateOverlayHandleHeight();
@@ -178,3 +178,5 @@ export abstract class Resizable<HandleComponent extends ResizeOverlayHandle>
178178
this.elementRef.nativeElement!.appendChild(this.inlineHandle);
179179
}
180180
}
181+
182+
const OVERLAY_ACTIVE_CLASS = 'cdk-resizable-overlay-thumb-active';

src/material-experimental/column-resize/_column-resize.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
$resizable-active-divider: mat-color($primary, 500);
1313

1414
// Required for resizing to work properly.
15-
table.with-resized-column {
15+
table.cdk-column-resize-with-resized-column {
1616
table-layout: fixed;
1717
}
1818

@@ -39,29 +39,29 @@
3939
right: 0;
4040
}
4141

42-
.column-resize-rtl .mat-header-cell:not(.mat-resizable)::after,
43-
.column-resize-rtl .mat-resizable-handle {
42+
.mat-column-resize-rtl .mat-header-cell:not(.mat-resizable)::after,
43+
.mat-column-resize-rtl .mat-resizable-handle {
4444
left: 0;
4545
right: auto;
4646
}
4747

48-
.mat-header-row.hover-or-active {
48+
.mat-header-row.cdk-column-resize-hover-or-active {
4949
.mat-header-cell:not(.mat-resizable)::after {
5050
background: $non-resizable-hover-divider;
5151
}
52-
52+
5353
.mat-resizable-handle {
5454
background: $resizable-hover-divider;
5555
}
5656
}
5757

58-
.mat-resizable.resizable-overlay-thumb-active > .mat-resizable-handle {
58+
.mat-resizable.cdk-resizable-overlay-thumb-active > .mat-resizable-handle {
5959
opacity: 0;
6060
transition: none;
6161
}
6262

6363
.mat-resizable-handle:focus,
64-
.mat-header-row.hover-or-active .mat-resizable-handle:focus {
64+
.mat-header-row.cdk-column-resize-hover-or-active .mat-resizable-handle:focus {
6565
background: $resizable-active-divider;
6666
outline: none;
6767
}

src/material-experimental/column-resize/column-resize.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const TABLE_PROVIDERS = [...PROVIDERS, TABLE_LAYOUT_FIXED_RESIZE_STRATEGY_PROVID
2525
const FLEX_PROVIDERS = [...PROVIDERS, FLEX_RESIZE_STRATEGY_PROVIDER];
2626
const HOST_BINDINGS = {
2727
'[class]': 'getIdClass()',
28-
'[class.column-resize-rtl]': 'directionality.value === "rtl"',
28+
'[class.mat-column-resize-rtl]': 'directionality.value === "rtl"',
2929
};
3030

3131
export abstract class AbstractMatColumnResize extends ColumnResize {

0 commit comments

Comments
 (0)