diff --git a/components/config-provider/__tests__/__snapshots__/components.test.js.snap b/components/config-provider/__tests__/__snapshots__/components.test.js.snap index 3a3d6f8faa..5216a6ab6c 100644 --- a/components/config-provider/__tests__/__snapshots__/components.test.js.snap +++ b/components/config-provider/__tests__/__snapshots__/components.test.js.snap @@ -11417,60 +11417,64 @@ exports[`ConfigProvider components Table configProvider 1`] = ` -
- - Name - - -
- + +
- - - - + + - - - -
- -
+ + +
+ + + -
- - Name - - -
- + +
- - - - + + - - - -
- -
+ + +
+ + + -
- - Name - - -
- + +
- - - - + + - - - -
- -
+ + +
+ + + -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ diff --git a/components/locale-provider/__tests__/__snapshots__/demo.test.js.snap b/components/locale-provider/__tests__/__snapshots__/demo.test.js.snap index 953ff6b1b1..713fa35a23 100644 --- a/components/locale-provider/__tests__/__snapshots__/demo.test.js.snap +++ b/components/locale-provider/__tests__/__snapshots__/demo.test.js.snap @@ -1756,16 +1756,20 @@ exports[`renders ./components/locale-provider/demo/all.md correctly 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ diff --git a/components/locale-provider/__tests__/__snapshots__/index.test.js.snap b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap index 2a69022005..b2fbd6fa79 100644 --- a/components/locale-provider/__tests__/__snapshots__/index.test.js.snap +++ b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap @@ -7390,16 +7390,20 @@ exports[`Locale Provider should display the text as ar 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -12471,16 +12479,20 @@ exports[`Locale Provider should display the text as bg 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -17552,16 +17568,20 @@ exports[`Locale Provider should display the text as ca 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -22633,16 +22657,20 @@ exports[`Locale Provider should display the text as cs 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -27714,16 +27746,20 @@ exports[`Locale Provider should display the text as da 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -32795,16 +32835,20 @@ exports[`Locale Provider should display the text as de 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -37876,16 +37924,20 @@ exports[`Locale Provider should display the text as el 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -42957,16 +43013,20 @@ exports[`Locale Provider should display the text as en 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -48038,16 +48102,20 @@ exports[`Locale Provider should display the text as en-gb 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -53119,16 +53191,20 @@ exports[`Locale Provider should display the text as es 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -58200,16 +58280,20 @@ exports[`Locale Provider should display the text as et 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -63281,16 +63369,20 @@ exports[`Locale Provider should display the text as fa 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -68362,16 +68458,20 @@ exports[`Locale Provider should display the text as fi 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -73443,16 +73547,20 @@ exports[`Locale Provider should display the text as fr 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -78524,16 +78636,20 @@ exports[`Locale Provider should display the text as fr 2`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -83605,16 +83725,20 @@ exports[`Locale Provider should display the text as he 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -88686,16 +88814,20 @@ exports[`Locale Provider should display the text as hi 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -93767,16 +93903,20 @@ exports[`Locale Provider should display the text as hu 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -98848,16 +98992,20 @@ exports[`Locale Provider should display the text as id 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -103929,16 +104081,20 @@ exports[`Locale Provider should display the text as is 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -109010,16 +109170,20 @@ exports[`Locale Provider should display the text as it 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -114091,16 +114259,20 @@ exports[`Locale Provider should display the text as ja 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -119172,16 +119348,20 @@ exports[`Locale Provider should display the text as kn 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -124253,16 +124437,20 @@ exports[`Locale Provider should display the text as ko 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -129334,16 +129526,20 @@ exports[`Locale Provider should display the text as ku-iq 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -134415,16 +134615,20 @@ exports[`Locale Provider should display the text as mn-mn 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -139496,16 +139704,20 @@ exports[`Locale Provider should display the text as nb 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -144577,16 +144793,20 @@ exports[`Locale Provider should display the text as ne-np 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -149658,16 +149882,20 @@ exports[`Locale Provider should display the text as nl 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -154739,16 +154971,20 @@ exports[`Locale Provider should display the text as nl-be 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -159820,16 +160060,20 @@ exports[`Locale Provider should display the text as pl 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -164901,16 +165149,20 @@ exports[`Locale Provider should display the text as pt 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -169982,16 +170238,20 @@ exports[`Locale Provider should display the text as pt-br 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -175063,16 +175327,20 @@ exports[`Locale Provider should display the text as ru 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -180144,16 +180416,20 @@ exports[`Locale Provider should display the text as sk 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -185225,16 +185505,20 @@ exports[`Locale Provider should display the text as sl 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -190306,16 +190594,20 @@ exports[`Locale Provider should display the text as sr 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -195387,16 +195683,20 @@ exports[`Locale Provider should display the text as sv 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -200468,16 +200772,20 @@ exports[`Locale Provider should display the text as th 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -205549,16 +205861,20 @@ exports[`Locale Provider should display the text as tr 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -210630,16 +210950,20 @@ exports[`Locale Provider should display the text as uk 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -215711,16 +216039,20 @@ exports[`Locale Provider should display the text as vi 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -220792,16 +221128,20 @@ exports[`Locale Provider should display the text as zh-cn 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -225873,16 +226217,20 @@ exports[`Locale Provider should display the text as zh-tw 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ diff --git a/components/table/Table.tsx b/components/table/Table.tsx index f5ed8f3d19..9ad666f557 100755 --- a/components/table/Table.tsx +++ b/components/table/Table.tsx @@ -925,12 +925,14 @@ export default class Table extends React.Component, TableState< [`${prefixCls}-column-sort`]: isSortColumn && sortOrder, }), title: [ -
- - {this.renderColumnTitle(column.title)} - - {sortButton} -
, + +
+ + {this.renderColumnTitle(column.title)} + + {sortButton} +
+ , filterDropdown, ], onHeaderCell, diff --git a/components/table/__tests__/__snapshots__/Table.filter.test.js.snap b/components/table/__tests__/__snapshots__/Table.filter.test.js.snap index 4e87f6d5f2..16dd448801 100644 --- a/components/table/__tests__/__snapshots__/Table.filter.test.js.snap +++ b/components/table/__tests__/__snapshots__/Table.filter.test.js.snap @@ -96,16 +96,20 @@ exports[`Table.filter renders filter correctly 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Name - - -
+ +
+ + Name + + +
+ @@ -216,16 +220,20 @@ exports[`Table.pagination renders pagination correctly 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ diff --git a/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap b/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap index db14398f05..7695b07bfb 100644 --- a/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap +++ b/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap @@ -38,48 +38,56 @@ exports[`Table.rowSelection fix selection column on the left 1`] = ` -
- -
+
+ - -
- - -
+ class="ant-checkbox" + > + + + + +
+ + + + -
- - Name - - -
+ +
+ + Name + + +
+ @@ -255,34 +263,38 @@ exports[`Table.rowSelection fix selection column on the left 1`] = ` -
- -
+
+ - -
- - -
+ class="ant-checkbox" + > + + + + +
+ + + + diff --git a/components/table/__tests__/__snapshots__/Table.sorter.test.js.snap b/components/table/__tests__/__snapshots__/Table.sorter.test.js.snap index 6e065bb600..865dcf5ba8 100644 --- a/components/table/__tests__/__snapshots__/Table.sorter.test.js.snap +++ b/components/table/__tests__/__snapshots__/Table.sorter.test.js.snap @@ -8,60 +8,64 @@ exports[`Table.sorter renders sorter icon correctly 1`] = ` -
- - Name - - -
- + +
- - - - + + - - - -
- -
+ + +
+ + + diff --git a/components/table/__tests__/__snapshots__/Table.test.js.snap b/components/table/__tests__/__snapshots__/Table.test.js.snap index 164c4e16ee..d35ffd7782 100644 --- a/components/table/__tests__/__snapshots__/Table.test.js.snap +++ b/components/table/__tests__/__snapshots__/Table.test.js.snap @@ -35,61 +35,77 @@ exports[`Table renders JSX correctly 1`] = ` class="" colspan="2" > -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ -
- - First Name - - -
+ +
+ + First Name + + +
+ -
- - Last Name - - -
+ +
+ + Last Name + + +
+ diff --git a/components/table/__tests__/__snapshots__/demo.test.js.snap b/components/table/__tests__/__snapshots__/demo.test.js.snap index e20c35d613..6611c3be77 100755 --- a/components/table/__tests__/__snapshots__/demo.test.js.snap +++ b/components/table/__tests__/__snapshots__/demo.test.js.snap @@ -38,74 +38,82 @@ exports[`renders ./components/table/demo/ajax.md correctly 1`] = ` -
- - Name - - -
- + +
- - - - + + - - - -
- -
+ + +
+ + + -
- - Gender - - -
+ +
+ + Gender + + +
+ -
- - Email - - -
+ +
+ + Email + + +
+ @@ -212,72 +224,92 @@ exports[`renders ./components/table/demo/basic.md correctly 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ -
- - Address - - -
+ +
+ + Address + + +
+ -
- - Tags - - -
+ +
+ + Tags + + +
+ -
- - Action - - -
+ +
+ + Action + + +
+ @@ -587,44 +619,56 @@ exports[`renders ./components/table/demo/bordered.md correctly 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Cash Assets - - -
+ +
+ + Cash Assets + + +
+ -
- - Address - - -
+ +
+ + Address + + +
+ @@ -836,59 +880,75 @@ exports[`renders ./components/table/demo/colspan-rowspan.md correctly 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ -
- - Home phone - - -
+ +
+ + Home phone + + +
+ -
- - Address - - -
+ +
+ + Address + + +
+ @@ -1180,16 +1240,20 @@ exports[`renders ./components/table/demo/custom-filter-panel.md correctly 1`] = -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ -
- - Address - - -
+ +
+ + Address + + +
+ -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ -
- - Address - - -
+ +
+ + Address + + +
+ @@ -2353,90 +2437,110 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = ` -
- -
+
+ - -
- - -
+ class="ant-checkbox" + > + + + + +
+ + + + -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ -
- - Address - - -
+ +
+ + Address + + +
+ -
- - Action - - -
+ +
+ + Action + + +
+ @@ -3556,58 +3660,74 @@ exports[`renders ./components/table/demo/edit-cell.md correctly 1`] = ` -
- - name - - -
+ +
+ + name + + +
+ -
- - age - - -
+ +
+ + age + + +
+ -
- - address - - -
+ +
+ + address + + +
+ -
- - operation - - -
+ +
+ + operation + + +
+ @@ -3812,58 +3932,74 @@ exports[`renders ./components/table/demo/edit-row.md correctly 1`] = ` -
- - name - - -
+ +
+ + name + + +
+ -
- - age - - -
+ +
+ + age + + +
+ -
- - address - - -
+ +
+ + address + + +
+ -
- - operation - - -
+ +
+ + operation + + +
+ @@ -4406,58 +4542,74 @@ exports[`renders ./components/table/demo/expand.md correctly 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ -
- - Address - - -
+ +
+ + Address + + +
+ -
- - Action - - -
+ +
+ + Action + + +
+ @@ -4693,76 +4845,92 @@ exports[`renders ./components/table/demo/expand-children.md correctly 1`] = ` -
- -
+
+ - -
- - -
+ class="ant-checkbox" + > + + + + +
+ + + + -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ -
- - Address - - -
+ +
+ + Address + + +
+ @@ -4998,156 +5166,200 @@ exports[`renders ./components/table/demo/fixed-columns.md correctly 1`] = ` -
- - Full Name - - -
+ +
+ + Full Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ -
- - Column 1 - - -
+ +
+ + Column 1 + + +
+ -
- - Column 2 - - -
+ +
+ + Column 2 + + +
+ -
- - Column 3 - - -
+ +
+ + Column 3 + + +
+ -
- - Column 4 - - -
+ +
+ + Column 4 + + +
+ -
- - Column 5 - - -
+ +
+ + Column 5 + + +
+ -
- - Column 6 - - -
+ +
+ + Column 6 + + +
+ -
- - Column 7 - - -
+ +
+ + Column 7 + + +
+ -
- - Column 8 - - -
+ +
+ + Column 8 + + +
+ -
- - Action - - -
+ +
+ + Action + + +
+ @@ -5322,30 +5534,38 @@ exports[`renders ./components/table/demo/fixed-columns.md correctly 1`] = ` -
- - Full Name - - -
+ +
+ + Full Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -5420,16 +5640,20 @@ exports[`renders ./components/table/demo/fixed-columns.md correctly 1`] = ` -
- - Action - - -
+ +
+ + Action + + +
+ @@ -5612,156 +5836,200 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] = -
- - Full Name - - -
+ +
+ + Full Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ -
- - Column 1 - - -
+ +
+ + Column 1 + + +
+ -
- - Column 2 - - -
+ +
+ + Column 2 + + +
+ -
- - Column 3 - - -
+ +
+ + Column 3 + + +
+ -
- - Column 4 - - -
+ +
+ + Column 4 + + +
+ -
- - Column 5 - - -
+ +
+ + Column 5 + + +
+ -
- - Column 6 - - -
+ +
+ + Column 6 + + +
+ -
- - Column 7 - - -
+ +
+ + Column 7 + + +
+ -
- - Column 8 - - -
+ +
+ + Column 8 + + +
+ -
- - Action - - -
+ +
+ + Action + + +
+ @@ -6519,30 +6787,38 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] = -
- - Full Name - - -
+ +
+ + Full Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -6786,16 +7062,20 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] = -
- - Action - - -
+ +
+ + Action + + +
+ @@ -7166,44 +7446,56 @@ exports[`renders ./components/table/demo/fixed-header.md correctly 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ -
- - Address - - -
+ +
+ + Address + + +
+ @@ -8575,16 +8867,20 @@ exports[`renders ./components/table/demo/grouping-columns.md correctly 1`] = ` class="ant-table-fixed-columns-in-body ant-table-column-has-actions ant-table-column-has-filters" rowspan="4" > -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Other - - -
+ +
+ + Other + + +
+ -
- - Company - - -
+ +
+ + Company + + +
+ -
- - Gender - - -
+ +
+ + Gender + + +
+ @@ -8657,105 +8965,121 @@ exports[`renders ./components/table/demo/grouping-columns.md correctly 1`] = ` class="ant-table-column-has-actions ant-table-column-has-sorters" rowspan="3" > -
- - Age - - -
- + +
- - - - + + - - - -
- -
+ + +
+ + + -
- - Address - - -
+ +
+ + Address + + +
+ -
- - Company Address - - -
+ +
+ + Company Address + + +
+ -
- - Company Name - - -
+ +
+ + Company Name + + +
+ @@ -8763,61 +9087,77 @@ exports[`renders ./components/table/demo/grouping-columns.md correctly 1`] = ` class="" rowspan="2" > -
- - Street - - -
+ +
+ + Street + + +
+ -
- - Block - - -
+ +
+ + Block + + +
+ -
- - Building - - -
+ +
+ + Building + + +
+ -
- - Door No. - - -
+ +
+ + Door No. + + +
+ @@ -9372,16 +9712,20 @@ exports[`renders ./components/table/demo/grouping-columns.md correctly 1`] = ` class="ant-table-column-has-actions ant-table-column-has-filters" rowspan="4" > -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Gender - - -
+ +
+ + Gender + + +
+ @@ -9926,42 +10274,46 @@ exports[`renders ./components/table/demo/head.md correctly 1`] = ` -
- - Name - - -
- + +
- - -
- -
+ + +
+ + + -
- - Age - - -
- + +
- - - - + + - - - -
- -
+ + +
+ + + -
- - Address - - -
- + +
- - - - + + - - - -
- -
+ + +
+ + + -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ -
- - Address - - -
+ +
+ + Address + + +
+ -
- - Tags - - -
+ +
+ + Tags + + +
+ -
- - Action - - -
+ +
+ + Action + + +
+ -
- - First Name - - -
+ +
+ + First Name + + +
+ -
- - Last Name - - -
+ +
+ + Last Name + + +
+ @@ -10757,100 +11145,128 @@ exports[`renders ./components/table/demo/nested-table.md correctly 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Platform - - -
+ +
+ + Platform + + +
+ -
- - Version - - -
+ +
+ + Version + + +
+ -
- - Upgraded - - -
+ +
+ + Upgraded + + +
+ -
- - Creator - - -
+ +
+ + Creator + + +
+ -
- - Date - - -
+ +
+ + Date + + +
+ -
- - Action - - -
+ +
+ + Action + + +
+ @@ -11153,60 +11569,64 @@ exports[`renders ./components/table/demo/reset-filter.md correctly 1`] = ` -
- - Name - - -
- + +
- - - - + + - - - -
- -
+ + +
+ + + -
- - Age - - -
- + +
- - - - + + - - - -
- -
+ + +
+ + + -
- - Address - - -
- + +
- - - - + + - - - -
- -
+ + +
+ + + -
- - Date - - -
+ +
+ + Date + + +
+ -
- - Amount - - -
+ +
+ + Amount + + +
+ -
- - Type - - -
+ +
+ + Type + + +
+ -
- - Note - - -
+ +
+ + Note + + +
+ -
- - Action - - -
+ +
+ + Action + + +
+ @@ -11909,76 +12357,92 @@ exports[`renders ./components/table/demo/row-selection.md correctly 1`] = ` -
- -
+
+ - -
- - -
+ class="ant-checkbox" + > + + + + +
+ + + + -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ -
- - Address - - -
+ +
+ + Address + + +
+ @@ -12320,76 +12784,92 @@ exports[`renders ./components/table/demo/row-selection-and-operation.md correctl -
- -
+
+ - -
- - -
+ class="ant-checkbox" + > + + + + +
+ + + + -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ -
- - Address - - -
+ +
+ + Address + + +
+ @@ -13001,98 +13481,114 @@ exports[`renders ./components/table/demo/row-selection-custom.md correctly 1`] = -
- -
+
+ -
- - - + + + +
+ + + +
-
- - -
+ + +
+ -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ -
- - Address - - -
+ +
+ + Address + + +
+ @@ -13704,44 +14200,56 @@ exports[`renders ./components/table/demo/size.md correctly 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ -
- - Address - - -
+ +
+ + Address + + +
+ @@ -13934,44 +14442,56 @@ exports[`renders ./components/table/demo/size.md correctly 1`] = ` -
- - Name - - -
+ +
+ + Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ -
- - Address - - -
+ +
+ + Address + + +
+ diff --git a/components/table/__tests__/__snapshots__/empty.test.js.snap b/components/table/__tests__/__snapshots__/empty.test.js.snap index c503331294..c5409dbe1d 100644 --- a/components/table/__tests__/__snapshots__/empty.test.js.snap +++ b/components/table/__tests__/__snapshots__/empty.test.js.snap @@ -39,114 +39,146 @@ exports[`Table renders empty table 1`] = ` -
- - Column 1 - - -
+ +
+ + Column 1 + + +
+ -
- - Column 2 - - -
+ +
+ + Column 2 + + +
+ -
- - Column 3 - - -
+ +
+ + Column 3 + + +
+ -
- - Column 4 - - -
+ +
+ + Column 4 + + +
+ -
- - Column 5 - - -
+ +
+ + Column 5 + + +
+ -
- - Column 6 - - -
+ +
+ + Column 6 + + +
+ -
- - Column 7 - - -
+ +
+ + Column 7 + + +
+ -
- - Column 8 - - -
+ +
+ + Column 8 + + +
+ @@ -222,114 +254,146 @@ exports[`Table renders empty table with custom emptyText 1`] = ` -
- - Column 1 - - -
+ +
+ + Column 1 + + +
+ -
- - Column 2 - - -
+ +
+ + Column 2 + + +
+ -
- - Column 3 - - -
+ +
+ + Column 3 + + +
+ -
- - Column 4 - - -
+ +
+ + Column 4 + + +
+ -
- - Column 5 - - -
+ +
+ + Column 5 + + +
+ -
- - Column 6 - - -
+ +
+ + Column 6 + + +
+ -
- - Column 7 - - -
+ +
+ + Column 7 + + +
+ -
- - Column 8 - - -
+ +
+ + Column 8 + + +
+ @@ -401,156 +465,200 @@ exports[`Table renders empty table with fixed columns 1`] = ` -
- - Full Name - - -
+ +
+ + Full Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ -
- - Column 1 - - -
+ +
+ + Column 1 + + +
+ -
- - Column 2 - - -
+ +
+ + Column 2 + + +
+ -
- - Column 3 - - -
+ +
+ + Column 3 + + +
+ -
- - Column 4 - - -
+ +
+ + Column 4 + + +
+ -
- - Column 5 - - -
+ +
+ + Column 5 + + +
+ -
- - Column 6 - - -
+ +
+ + Column 6 + + +
+ -
- - Column 7 - - -
+ +
+ + Column 7 + + +
+ -
- - Column 8 - - -
+ +
+ + Column 8 + + +
+ -
- - Action - - -
+ +
+ + Action + + +
+ @@ -609,30 +717,38 @@ exports[`Table renders empty table with fixed columns 1`] = ` -
- - Full Name - - -
+ +
+ + Full Name + + +
+ -
- - Age - - -
+ +
+ + Age + + +
+ @@ -668,16 +784,20 @@ exports[`Table renders empty table with fixed columns 1`] = ` -
- - Action - - -
+ +
+ + Action + + +
+ @@ -756,114 +876,146 @@ exports[`Table renders empty table without emptyText when loading 1`] = ` -
- - Column 1 - - -
+ +
+ + Column 1 + + +
+ -
- - Column 2 - - -
+ +
+ + Column 2 + + +
+ -
- - Column 3 - - -
+ +
+ + Column 3 + + +
+ -
- - Column 4 - - -
+ +
+ + Column 4 + + +
+ -
- - Column 5 - - -
+ +
+ + Column 5 + + +
+ -
- - Column 6 - - -
+ +
+ + Column 6 + + +
+ -
- - Column 7 - - -
+ +
+ + Column 7 + + +
+ -
- - Column 8 - - -
+ +
+ + Column 8 + + +
+ diff --git a/components/table/style/index.less b/components/table/style/index.less index bb3e639351..345c10544b 100644 --- a/components/table/style/index.less +++ b/components/table/style/index.less @@ -116,6 +116,9 @@ -webkit-background-clip: border-box; // For Chrome extra space: https://github.com/ant-design/ant-design/issues/14926 &.@{table-prefix-cls}-column-has-filters { + // https://github.com/ant-design/ant-design/issues/12650 + padding-right: 30px !important; + .@{iconfont-css-prefix}-filter, .@{table-prefix-cls}-filter-icon { &.@{table-prefix-cls}-filter-open { @@ -154,41 +157,36 @@ } } } - - // https://github.com/ant-design/ant-design/issues/12650 - &.@{table-prefix-cls}-column-has-sorters, - &.@{table-prefix-cls}-column-has-filters { - padding-right: 30px !important; - } - - &.@{table-prefix-cls}-column-has-sorters.@{table-prefix-cls}-column-has-filters { - padding-right: 54px !important; - } } - .@{table-prefix-cls}-column-sorters { - display: table; + .@{table-prefix-cls}-header-column { + display: inline-block; + vertical-align: top; - > .@{table-prefix-cls}-column-title { - display: table-cell; - vertical-align: middle; - } + .@{table-prefix-cls}-column-sorters { + display: table; - > *:not(.@{table-prefix-cls}-column-sorter) { - position: relative; - } - &::before { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - background: transparent; - transition: all 0.3s; - content: ''; - } - &:hover::before { - background: rgba(0, 0, 0, 0.04); + > .@{table-prefix-cls}-column-title { + display: table-cell; + vertical-align: middle; + } + + > *:not(.@{table-prefix-cls}-column-sorter) { + position: relative; + } + &::before { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + background: transparent; + transition: all 0.3s; + content: ''; + } + &:hover::before { + background: rgba(0, 0, 0, 0.04); + } } }