Skip to content

Commit 61d6132

Browse files
committed
chore: remove useless colSpan & rowSpan
1 parent 725f745 commit 61d6132

File tree

4 files changed

+2
-133
lines changed

4 files changed

+2
-133
lines changed

src/Cell/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ function Cell<RecordType extends DefaultRecordType>(
147147
const componentProps = {
148148
title,
149149
...additionalProps,
150-
colSpan: mergedColSpan,
151-
rowSpan: mergedRowSpan,
150+
colSpan: mergedColSpan && mergedColSpan !== 1 ? mergedColSpan : null,
151+
rowSpan: mergedRowSpan && mergedRowSpan !== 1 ? mergedRowSpan : null,
152152
className: classNames(
153153
cellPrefixCls,
154154
className,

tests/__snapshots__/ExpandRow.spec.js.snap

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,21 @@ exports[`Table.Expand renders fixed column correctly 1`] = `
2323
<tr>
2424
<th
2525
class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left"
26-
colspan="1"
27-
rowspan="1"
2826
style="position: sticky; left: 0px;"
2927
/>
3028
<th
3129
class="rc-table-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
32-
colspan="1"
33-
rowspan="1"
3430
style="position: sticky; left: 0px;"
3531
>
3632
Name
3733
</th>
3834
<th
3935
class="rc-table-cell"
40-
colspan="1"
41-
rowspan="1"
4236
>
4337
Age
4438
</th>
4539
<th
4640
class="rc-table-cell rc-table-cell-fix-right rc-table-cell-fix-right-first"
47-
colspan="1"
48-
rowspan="1"
4941
style="position: sticky; right: 0px;"
5042
>
5143
Gender
@@ -169,15 +161,11 @@ exports[`Table.Expand renders tree row correctly 1`] = `
169161
<tr>
170162
<th
171163
class="rc-table-cell"
172-
colspan="1"
173-
rowspan="1"
174164
>
175165
Name
176166
</th>
177167
<th
178168
class="rc-table-cell"
179-
colspan="1"
180-
rowspan="1"
181169
>
182170
Age
183171
</th>

0 commit comments

Comments
 (0)