Skip to content

Commit 570c0f5

Browse files
authored
chore: css var add columns count (#1250)
1 parent 3e17362 commit 570c0f5

File tree

4 files changed

+33
-1
lines changed

4 files changed

+33
-1
lines changed

src/Table.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,12 @@ function Table<RecordType extends DefaultRecordType>(
778778
[`${prefixCls}-has-fix-start`]: flattenColumns[0]?.fixed,
779779
[`${prefixCls}-has-fix-end`]: flattenColumns[flattenColumns.length - 1]?.fixed === 'end',
780780
})}
781-
style={style}
781+
style={
782+
{
783+
...style,
784+
'--columns-count': flattenColumns.length,
785+
} as React.CSSProperties
786+
}
782787
id={id}
783788
ref={fullTableRef}
784789
{...dataProps}

tests/__snapshots__/ExpandRow.spec.jsx.snap

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
exports[`Table.Expand > childrenColumnName 1`] = `
44
<div
55
class="rc-table"
6+
style="--columns-count: 2;"
67
>
78
<div
89
class="rc-table-container"
@@ -108,6 +109,7 @@ exports[`Table.Expand > childrenColumnName 1`] = `
108109
exports[`Table.Expand > does not crash if scroll is not set 1`] = `
109110
<div
110111
class="rc-table rc-table-fix-start-shadow rc-table-fix-end-shadow rc-table-scroll-horizontal"
112+
style="--columns-count: 3;"
111113
>
112114
<div
113115
class="rc-table-container"
@@ -230,6 +232,7 @@ exports[`Table.Expand > does not crash if scroll is not set 1`] = `
230232
exports[`Table.Expand > does not crash if scroll is not set 2`] = `
231233
<div
232234
class="rc-table rc-table-fix-start-shadow rc-table-fix-end-shadow rc-table-scroll-horizontal"
235+
style="--columns-count: 3;"
233236
>
234237
<div
235238
class="rc-table-container"
@@ -352,6 +355,7 @@ exports[`Table.Expand > does not crash if scroll is not set 2`] = `
352355
exports[`Table.Expand > not use nest when children is invalidate 1`] = `
353356
<div
354357
class="rc-table"
358+
style="--columns-count: 2;"
355359
>
356360
<div
357361
class="rc-table-container"
@@ -439,6 +443,7 @@ exports[`Table.Expand > not use nest when children is invalidate 1`] = `
439443
exports[`Table.Expand > renders fixed column correctly > work 1`] = `
440444
<div
441445
class="rc-table rc-table-fix-start-shadow rc-table-fix-end-shadow rc-table-fixed-column rc-table-scroll-horizontal rc-table-has-fix-start rc-table-has-fix-end"
446+
style="--columns-count: 4;"
442447
>
443448
<div
444449
class="rc-table-container"
@@ -634,6 +639,7 @@ exports[`Table.Expand > renders fixed column correctly > work 1`] = `
634639
exports[`Table.Expand > renders tree row correctly 1`] = `
635640
<div
636641
class="rc-table"
642+
style="--columns-count: 2;"
637643
>
638644
<div
639645
class="rc-table-container"
@@ -739,6 +745,7 @@ exports[`Table.Expand > renders tree row correctly 1`] = `
739745
exports[`Table.Expand > renders tree row correctly with different children 1`] = `
740746
<div
741747
class="rc-table"
748+
style="--columns-count: 2;"
742749
>
743750
<div
744751
class="rc-table-container"
@@ -907,6 +914,7 @@ exports[`Table.Expand > renders tree row correctly with different children 1`] =
907914
exports[`Table.Expand > work in expandable fix 1`] = `
908915
<div
909916
class="rc-table rc-table-fix-start-shadow rc-table-fix-end-shadow rc-table-scroll-horizontal"
917+
style="--columns-count: 3;"
910918
>
911919
<div
912920
class="rc-table-container"
@@ -1029,6 +1037,7 @@ exports[`Table.Expand > work in expandable fix 1`] = `
10291037
exports[`Table.Expand > work in expandable fix 2`] = `
10301038
<div
10311039
class="rc-table rc-table-fix-start-shadow rc-table-fix-end-shadow rc-table-fixed-column rc-table-scroll-horizontal"
1040+
style="--columns-count: 4;"
10321041
>
10331042
<div
10341043
class="rc-table-container"

tests/__snapshots__/FixedColumn.spec.tsx.snap

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
exports[`Table.FixedColumn > fixed column renders correctly RTL 1`] = `
44
<div
55
class="rc-table rc-table-rtl rc-table-fix-start-shadow rc-table-fix-end-shadow rc-table-fixed-column rc-table-scroll-horizontal rc-table-has-fix-start rc-table-has-fix-end"
6+
style="--columns-count: 12;"
67
>
78
<div
89
class="rc-table-container"
@@ -794,6 +795,7 @@ exports[`Table.FixedColumn > renders correctly > all column has width should use
794795
exports[`Table.FixedColumn > renders correctly > scrollX - with data 1`] = `
795796
<div
796797
class="rc-table rc-table-fix-start-shadow rc-table-fix-end-shadow rc-table-fixed-column rc-table-scroll-horizontal rc-table-has-fix-start rc-table-has-fix-end"
798+
style="--columns-count: 12;"
797799
>
798800
<div
799801
class="rc-table-container"
@@ -1583,6 +1585,7 @@ exports[`Table.FixedColumn > renders correctly > scrollX - with data 1`] = `
15831585
exports[`Table.FixedColumn > renders correctly > scrollX - without data 1`] = `
15841586
<div
15851587
class="rc-table rc-table-fix-start-shadow rc-table-fix-end-shadow rc-table-fixed-column rc-table-scroll-horizontal rc-table-has-fix-start rc-table-has-fix-end"
1588+
style="--columns-count: 12;"
15861589
>
15871590
<div
15881591
class="rc-table-container"
@@ -1842,6 +1845,7 @@ exports[`Table.FixedColumn > renders correctly > scrollX - without data 1`] = `
18421845
exports[`Table.FixedColumn > renders correctly > scrollXY - with data 1`] = `
18431846
<div
18441847
class="rc-table rc-table-fix-start-shadow rc-table-fix-end-shadow rc-table-fixed-header rc-table-fixed-column rc-table-scroll-horizontal rc-table-has-fix-start rc-table-has-fix-end"
1848+
style="--columns-count: 12;"
18451849
>
18461850
<div
18471851
class="rc-table-container"
@@ -2685,6 +2689,7 @@ exports[`Table.FixedColumn > renders correctly > scrollXY - with data 1`] = `
26852689
exports[`Table.FixedColumn > renders correctly > scrollXY - without data 1`] = `
26862690
<div
26872691
class="rc-table rc-table-fix-start-shadow rc-table-fix-end-shadow rc-table-fixed-header rc-table-fixed-column rc-table-scroll-horizontal rc-table-has-fix-start rc-table-has-fix-end"
2692+
style="--columns-count: 12;"
26882693
>
26892694
<div
26902695
class="rc-table-container"

tests/__snapshots__/Table.spec.jsx.snap

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ exports[`Table.Basic > columns support JSX condition 1`] = `
1111
exports[`Table.Basic > custom components > renders correctly 1`] = `
1212
<div
1313
class="rc-table"
14+
style="--columns-count: 1;"
1415
>
1516
<div
1617
class="rc-table-container"
@@ -77,6 +78,7 @@ exports[`Table.Basic > custom components > renders correctly 1`] = `
7778
exports[`Table.Basic > custom components > renders fixed column and header correctly 1`] = `
7879
<div
7980
class="rc-table rc-table-fix-start-shadow rc-table-fix-end-shadow rc-table-fixed-header rc-table-fixed-column rc-table-scroll-horizontal rc-table-has-fix-start rc-table-has-fix-end"
81+
style="--columns-count: 3;"
8082
>
8183
<div
8284
class="rc-table-container"
@@ -210,6 +212,7 @@ exports[`Table.Basic > custom components > renders fixed column and header corre
210212
exports[`Table.Basic > custom components > scroll content > with scroll 1`] = `
211213
<div
212214
class="rc-table rc-table-fix-start-shadow rc-table-fix-end-shadow rc-table-fixed-header rc-table-scroll-horizontal"
215+
style="--columns-count: 2;"
213216
>
214217
<div
215218
class="rc-table-container"
@@ -259,6 +262,7 @@ exports[`Table.Basic > custom components > scroll content > with scroll 1`] = `
259262
exports[`Table.Basic > internal api > transformColumns > basic 1`] = `
260263
<div
261264
class="rc-table"
265+
style="--columns-count: 3;"
262266
>
263267
<div
264268
class="rc-table-container"
@@ -339,6 +343,7 @@ exports[`Table.Basic > internal api > transformColumns > basic 1`] = `
339343
exports[`Table.Basic > renders colSpan correctly 1`] = `
340344
<div
341345
class="rc-table"
346+
style="--columns-count: 2;"
342347
>
343348
<div
344349
class="rc-table-container"
@@ -402,6 +407,7 @@ exports[`Table.Basic > renders colSpan correctly 1`] = `
402407
exports[`Table.Basic > renders correctly > RTL 1`] = `
403408
<div
404409
class="test-prefix test-class-name test-prefix-rtl"
410+
style="--columns-count: 1;"
405411
>
406412
<div
407413
class="test-prefix-container"
@@ -458,6 +464,7 @@ exports[`Table.Basic > renders correctly > RTL 1`] = `
458464
exports[`Table.Basic > renders correctly > basic 1`] = `
459465
<div
460466
class="test-prefix test-class-name"
467+
style="--columns-count: 1;"
461468
>
462469
<div
463470
class="test-prefix-container"
@@ -514,6 +521,7 @@ exports[`Table.Basic > renders correctly > basic 1`] = `
514521
exports[`Table.Basic > renders correctly > column children undefined 1`] = `
515522
<div
516523
class="rc-table"
524+
style="--columns-count: 2;"
517525
>
518526
<div
519527
class="rc-table-container"
@@ -582,6 +590,7 @@ exports[`Table.Basic > renders correctly > column children undefined 1`] = `
582590
exports[`Table.Basic > renders correctly > falsy columns 1`] = `
583591
<div
584592
class="rc-table"
593+
style="--columns-count: 1;"
585594
>
586595
<div
587596
class="rc-table-container"
@@ -638,6 +647,7 @@ exports[`Table.Basic > renders correctly > falsy columns 1`] = `
638647
exports[`Table.Basic > renders correctly > no columns 1`] = `
639648
<div
640649
class="rc-table"
650+
style="--columns-count: 1;"
641651
>
642652
<div
643653
class="rc-table-container"
@@ -687,6 +697,7 @@ exports[`Table.Basic > renders correctly > no columns 1`] = `
687697
exports[`Table.Basic > renders rowSpan correctly 1`] = `
688698
<div
689699
class="rc-table"
700+
style="--columns-count: 2;"
690701
>
691702
<div
692703
class="rc-table-container"
@@ -755,6 +766,7 @@ exports[`Table.Basic > renders rowSpan correctly 1`] = `
755766
exports[`Table.Basic > should get scrollbar size 1`] = `
756767
<div
757768
class="rc-table rc-table-fixed-header"
769+
style="--columns-count: 1;"
758770
>
759771
<div
760772
class="rc-table-container"
@@ -798,6 +810,7 @@ exports[`Table.Basic > should get scrollbar size 1`] = `
798810
exports[`Table.Basic > syntactic sugar 1`] = `
799811
<div
800812
class="rc-table"
813+
style="--columns-count: 1;"
801814
>
802815
<div
803816
class="rc-table-container"

0 commit comments

Comments
 (0)