chore: remove useless colSpan & rowSpan

react-component · Oct 30, 2019 · 61d6132 · 61d6132 · vercel · Oct 30, 2019
1 parent 725f745
commit 61d6132
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 133 deletions.
diff --git a/src/Cell/index.tsx b/src/Cell/index.tsx
@@ -147,8 +147,8 @@ function Cell<RecordType extends DefaultRecordType>(
   const componentProps = {
     title,
     ...additionalProps,
-    colSpan: mergedColSpan,
-    rowSpan: mergedRowSpan,
+    colSpan: mergedColSpan && mergedColSpan !== 1 ? mergedColSpan : null,
+    rowSpan: mergedRowSpan && mergedRowSpan !== 1 ? mergedRowSpan : null,
     className: classNames(
       cellPrefixCls,
       className,

diff --git a/tests/__snapshots__/ExpandRow.spec.js.snap b/tests/__snapshots__/ExpandRow.spec.js.snap
@@ -23,29 +23,21 @@ exports[`Table.Expand renders fixed column correctly 1`] = `
         <tr>
           <th
             class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left"
-            colspan="1"
-            rowspan="1"
             style="position: sticky; left: 0px;"
           />
           <th
             class="rc-table-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
-            colspan="1"
-            rowspan="1"
             style="position: sticky; left: 0px;"
           >
             Name
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             Age
           </th>
           <th
             class="rc-table-cell rc-table-cell-fix-right rc-table-cell-fix-right-first"
-            colspan="1"
-            rowspan="1"
             style="position: sticky; right: 0px;"
           >
             Gender
@@ -169,15 +161,11 @@ exports[`Table.Expand renders tree row correctly 1`] = `
         <tr>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             Name
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             Age
           </th>