fix last header cell className

ant-design/ant-design#20030
react-component · Dec 2, 2019 · 0802626 · 0802626
1 parent a22bdae
commit 0802626
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/src/TableHeader.tsx b/src/TableHeader.tsx
@@ -10,24 +10,41 @@ import {
   GetComponentProps,
 } from './interface';
 
-function getHeaderRows(columns: InternalColumnType[], currentRow = 0, rows: Cell[][] = []) {
+function getHeaderRows({
+  columns = [],
+  currentRow = 0,
+  rows = [],
+  isLast = true,
+}: {
+  columns?: InternalColumnType[];
+  currentRow?: number;
+  rows?: Cell[][];
+  isLast?: boolean;
+}) {
   // eslint-disable-next-line no-param-reassign
   rows[currentRow] = rows[currentRow] || [];
 
-  columns.forEach(column => {
+  columns.forEach((column, i) => {
     if (column.rowSpan && rows.length < column.rowSpan) {
       while (rows.length < column.rowSpan) {
         rows.push([]);
       }
     }
+    const cellIsLast = isLast && i === columns.length - 1;
     const cell: Cell = {
       key: column.key,
       className: column.className || '',
       children: column.title,
+      isLast: cellIsLast,
       column,
     };
     if (column.children) {
-      getHeaderRows(column.children, currentRow + 1, rows);
+      getHeaderRows({
+        columns: column.children,
+        currentRow: currentRow + 1,
+        rows,
+        isLast: cellIsLast,
+      });
     }
     if ('colSpan' in column) {
       cell.colSpan = column.colSpan;
@@ -58,7 +75,7 @@ const TableHeader: React.FC<TableHeaderProps> = (props, { table }) => {
     return null;
   }
 
-  const rows = getHeaderRows(columns);
+  const rows = getHeaderRows({ columns });
 
   expander.renderExpandIndentCell(rows, fixed);
 

diff --git a/src/TableHeaderRow.tsx b/src/TableHeaderRow.tsx
@@ -48,7 +48,7 @@ function TableHeaderRow({
           [`${prefixCls}-align-${column.align}`]: !!column.align,
           [`${prefixCls}-row-cell-ellipsis`]: !!column.ellipsis,
           [`${prefixCls}-row-cell-break-word`]: !!column.width,
-          [`${prefixCls}-row-cell-last`]: i === row.length - 1,
+          [`${prefixCls}-row-cell-last`]: cell.isLast,
         });
         return (
           <HeaderCell {...cellProps} {...customProps} key={column.key || column.dataIndex || i} />

diff --git a/src/interface.ts b/src/interface.ts
@@ -44,6 +44,7 @@ export interface Cell {
   column?: ColumnType;
   colSpan?: number;
   rowSpan?: number;
+  isLast?: boolean;
 }
 
 export interface TableStoreState {

diff --git a/tests/__snapshots__/Table.spec.js.snap b/tests/__snapshots__/Table.spec.js.snap
@@ -642,7 +642,7 @@ exports[`Table renders colSpan correctly 1`] = `
         >
           <tr>
             <th
-              class="rc-table-row-cell-last"
+              class=""
               colspan="2"
             >
               Name
-Original file line number
+Diff line change
@@ Expand Up / @@ -642,7 +642,7 @@ exports[`Table renders colSpan correctly 1`] = ` @@
             >
               <tr>
                 <th
-                  class="rc-table-row-cell-last"
+                  class=""
                   colspan="2"
                 >
                   Name
@@ Expand Down @@