From 4068f3d190d9bc67eff7169f59d08116682be9f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E6=9C=BA=E5=99=A8=E4=BA=BA?=
 <smith3816@gmail.com>
Date: Tue, 7 Jan 2020 19:17:37 +0800
Subject: [PATCH] fix: RowSelection fixed should work (#20735)

---
 .../Table.rowSelection.test.js.snap             | 17 +++++++++++------
 components/table/hooks/useSelection.tsx         |  5 +++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap b/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap
index 86b1fece21..ff53ebc664 100644
--- a/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap
+++ b/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap
@@ -11,7 +11,7 @@ exports[`Table.rowSelection fix selection column on the left 1`] = `
       class="ant-spin-container"
     >
       <div
-        class="ant-table"
+        class="ant-table ant-table-has-fix-left"
       >
         <div
           class="ant-table-container"
@@ -31,7 +31,8 @@ exports[`Table.rowSelection fix selection column on the left 1`] = `
               <thead>
                 <tr>
                   <th
-                    class="ant-table-cell ant-table-selection-column"
+                    class="ant-table-cell ant-table-selection-column ant-table-cell-fix-left ant-table-cell-fix-left-last"
+                    style="position:sticky;left:0"
                   >
                     <div
                       class="ant-table-selection"
@@ -67,7 +68,8 @@ exports[`Table.rowSelection fix selection column on the left 1`] = `
                   class="ant-table-row ant-table-row-level-0"
                 >
                   <td
-                    class="ant-table-cell ant-table-selection-column"
+                    class="ant-table-cell ant-table-selection-column ant-table-cell-fix-left ant-table-cell-fix-left-last"
+                    style="position:sticky;left:0"
                   >
                     <label
                       class="ant-checkbox-wrapper"
@@ -95,7 +97,8 @@ exports[`Table.rowSelection fix selection column on the left 1`] = `
                   class="ant-table-row ant-table-row-level-0"
                 >
                   <td
-                    class="ant-table-cell ant-table-selection-column"
+                    class="ant-table-cell ant-table-selection-column ant-table-cell-fix-left ant-table-cell-fix-left-last"
+                    style="position:sticky;left:0"
                   >
                     <label
                       class="ant-checkbox-wrapper"
@@ -123,7 +126,8 @@ exports[`Table.rowSelection fix selection column on the left 1`] = `
                   class="ant-table-row ant-table-row-level-0"
                 >
                   <td
-                    class="ant-table-cell ant-table-selection-column"
+                    class="ant-table-cell ant-table-selection-column ant-table-cell-fix-left ant-table-cell-fix-left-last"
+                    style="position:sticky;left:0"
                   >
                     <label
                       class="ant-checkbox-wrapper"
@@ -151,7 +155,8 @@ exports[`Table.rowSelection fix selection column on the left 1`] = `
                   class="ant-table-row ant-table-row-level-0"
                 >
                   <td
-                    class="ant-table-cell ant-table-selection-column"
+                    class="ant-table-cell ant-table-selection-column ant-table-cell-fix-left ant-table-cell-fix-left-last"
+                    style="position:sticky;left:0"
                   >
                     <label
                       class="ant-checkbox-wrapper"
diff --git a/components/table/hooks/useSelection.tsx b/components/table/hooks/useSelection.tsx
index 7d59af3a4b..83259fdb86 100644
--- a/components/table/hooks/useSelection.tsx
+++ b/components/table/hooks/useSelection.tsx
@@ -75,6 +75,7 @@ export default function useSelection<RecordType>(
     columnWidth: selectionColWidth = 60,
     type: selectionType,
     selections,
+    fixed,
   } = rowSelection || {};
 
   const { locale = defaultLocale } = React.useContext(ConfigContext);
@@ -416,11 +417,11 @@ export default function useSelection<RecordType>(
         const [expandColumn, ...restColumns] = columns;
         return [
           expandColumn,
-          { ...selectionColumn, fixed: getFixedType(restColumns[0]) },
+          { ...selectionColumn, fixed: fixed || getFixedType(restColumns[0]) },
           ...restColumns,
         ];
       }
-      return [{ ...selectionColumn, fixed: getFixedType(columns[0]) }, ...columns];
+      return [{ ...selectionColumn, fixed: fixed || getFixedType(columns[0]) }, ...columns];
     },
     [
       getRowKey,