From 61d61320dc1c31e9db78c956073aae710e312df9 Mon Sep 17 00:00:00 2001
From: zombiej <smith3816@gmail.com>
Date: Wed, 30 Oct 2019 17:40:56 +0800
Subject: [PATCH] chore: remove useless colSpan & rowSpan

---
 src/Cell/index.tsx                           |  4 +-
 tests/__snapshots__/ExpandRow.spec.js.snap   | 12 ---
 tests/__snapshots__/FixedColumn.spec.js.snap | 98 --------------------
 tests/__snapshots__/Table.spec.js.snap       | 21 -----
 4 files changed, 2 insertions(+), 133 deletions(-)

diff --git a/src/Cell/index.tsx b/src/Cell/index.tsx
index 53be1ba60..43a129f82 100644
--- 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
index 602ce045e..dae17bc72 100644
--- 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>
diff --git a/tests/__snapshots__/FixedColumn.spec.js.snap b/tests/__snapshots__/FixedColumn.spec.js.snap
index c2b0332f9..1353aba48 100644
--- a/tests/__snapshots__/FixedColumn.spec.js.snap
+++ b/tests/__snapshots__/FixedColumn.spec.js.snap
@@ -35,87 +35,63 @@ exports[`Table.FixedColumn renders correctly scrollX - with data 1`] = `
         <tr>
           <th
             class="rc-table-cell rc-table-cell-fix-left"
-            colspan="1"
-            rowspan="1"
             style="position: sticky; left: 0px;"
           >
             title1
           </th>
           <th
             class="rc-table-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
-            colspan="1"
-            rowspan="1"
             style="position: sticky; left: 93px;"
           >
             title2
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title3
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title4
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title5
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title6
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title7
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title8
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title9
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title10
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title11
           </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;"
           >
             title12
@@ -623,87 +599,63 @@ exports[`Table.FixedColumn renders correctly scrollX - without data 1`] = `
         <tr>
           <th
             class="rc-table-cell rc-table-cell-fix-left"
-            colspan="1"
-            rowspan="1"
             style="position: sticky; left: 0px;"
           >
             title1
           </th>
           <th
             class="rc-table-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
-            colspan="1"
-            rowspan="1"
             style="position: sticky; left: 93px;"
           >
             title2
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title3
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title4
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title5
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title6
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title7
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title8
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title9
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title10
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title11
           </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;"
           >
             title12
@@ -766,95 +718,69 @@ exports[`Table.FixedColumn renders correctly scrollXY - with data 1`] = `
         <tr>
           <th
             class="rc-table-cell rc-table-cell-fix-left"
-            colspan="1"
-            rowspan="1"
             style="position: sticky; left: 0px;"
           >
             title1
           </th>
           <th
             class="rc-table-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
-            colspan="1"
-            rowspan="1"
             style="position: sticky; left: 93px;"
           >
             title2
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title3
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title4
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title5
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title6
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title7
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title8
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title9
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title10
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title11
           </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: 15px;"
           >
             title12
           </th>
           <th
             class="rc-table-cell rc-table-cell-fix-right rc-table-cell-scrollbar"
-            colspan="1"
-            rowspan="1"
             style="position: sticky; right: 0px;"
           />
         </tr>
@@ -1389,87 +1315,63 @@ exports[`Table.FixedColumn renders correctly scrollXY - without data 1`] = `
         <tr>
           <th
             class="rc-table-cell rc-table-cell-fix-left"
-            colspan="1"
-            rowspan="1"
             style="position: sticky; left: 0px;"
           >
             title1
           </th>
           <th
             class="rc-table-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
-            colspan="1"
-            rowspan="1"
             style="position: sticky; left: 93px;"
           >
             title2
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title3
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title4
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title5
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title6
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title7
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title8
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title9
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title10
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             title11
           </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;"
           >
             title12
diff --git a/tests/__snapshots__/Table.spec.js.snap b/tests/__snapshots__/Table.spec.js.snap
index 3b8049c42..71bc60211 100644
--- a/tests/__snapshots__/Table.spec.js.snap
+++ b/tests/__snapshots__/Table.spec.js.snap
@@ -22,9 +22,7 @@ exports[`Table.Basic custom components renders correctly 1`] = `
         >
           <th
             class="rc-table-cell"
-            colspan="1"
             name="my-header-cell"
-            rowspan="1"
           >
             Name
           </th>
@@ -88,35 +86,27 @@ exports[`Table.Basic custom components renders fixed column and header correctly
         >
           <th
             class="rc-table-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
-            colspan="1"
             name="my-header-cell"
-            rowspan="1"
             style="position: sticky; left: 0px;"
           >
             Name
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
             name="my-header-cell"
-            rowspan="1"
           >
             Age
           </th>
           <th
             class="rc-table-cell rc-table-cell-fix-right rc-table-cell-fix-right-first"
-            colspan="1"
             name="my-header-cell"
-            rowspan="1"
             style="position: sticky; right: 15px;"
           >
             Gender
           </th>
           <th
             class="rc-table-cell rc-table-cell-fix-right rc-table-cell-scrollbar"
-            colspan="1"
             name="my-header-cell"
-            rowspan="1"
             style="position: sticky; right: 0px;"
           />
         </tr>
@@ -189,7 +179,6 @@ exports[`Table.Basic renders colSpan correctly 1`] = `
           <th
             class="rc-table-cell"
             colspan="2"
-            rowspan="1"
           >
             Name
           </th>
@@ -243,8 +232,6 @@ exports[`Table.Basic renders correctly 1`] = `
         <tr>
           <th
             class="test-prefix-cell"
-            colspan="1"
-            rowspan="1"
           >
             Name
           </th>
@@ -293,15 +280,11 @@ exports[`Table.Basic renders rowSpan correctly 1`] = `
         <tr>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             First Name
           </th>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             Last Name
           </th>
@@ -355,7 +338,6 @@ exports[`Table.Basic syntactic sugar 1`] = `
         <tr>
           <th
             class="rc-table-cell"
-            colspan="1"
           >
             total
           </th>
@@ -363,8 +345,6 @@ exports[`Table.Basic syntactic sugar 1`] = `
         <tr>
           <th
             class="rc-table-cell"
-            colspan="1"
-            rowspan="1"
           >
             Name
           </th>
@@ -376,7 +356,6 @@ exports[`Table.Basic syntactic sugar 1`] = `
         >
           <td
             class="rc-table-cell"
-            colspan="1"
           >
             No Data
           </td>