From 5d3564df2b197684012cd25d633c99888ae053f6 Mon Sep 17 00:00:00 2001
From: Israel kusayev <israel.kusayev@gmail.com>
Date: Tue, 23 Jun 2020 00:12:17 +0300
Subject: [PATCH 1/2] :lipstick: antd-25124 hide horizontal scroll when no need
 to scroll

---
 src/Table.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Table.tsx b/src/Table.tsx
index 06ca9637a..52836b2d6 100644
--- a/src/Table.tsx
+++ b/src/Table.tsx
@@ -389,7 +389,7 @@ function Table<RecordType extends DefaultRecordType>(props: TableProps<RecordTyp
   }
 
   if (horizonScroll) {
-    scrollXStyle = { overflowX: 'scroll' };
+    scrollXStyle = { overflowX: 'auto' };
     // When no vertical scrollbar, should hide it
     // https://github.com/ant-design/ant-design/pull/20705
     // https://github.com/ant-design/ant-design/issues/21879

From cc82032b9776301742b11e1d79ccad72baae1b3a Mon Sep 17 00:00:00 2001
From: Israel kusayev <israel.kusayev@gmail.com>
Date: Tue, 23 Jun 2020 00:12:41 +0300
Subject: [PATCH 2/2] :white_check_mark: antd-25124 updating tests

---
 tests/Scroll.spec.js                         |  4 ++--
 tests/__snapshots__/ExpandRow.spec.js.snap   |  2 +-
 tests/__snapshots__/FixedColumn.spec.js.snap | 10 +++++-----
 tests/__snapshots__/Table.spec.js.snap       |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/Scroll.spec.js b/tests/Scroll.spec.js
index 53a969f95..b165c4974 100644
--- a/tests/Scroll.spec.js
+++ b/tests/Scroll.spec.js
@@ -15,7 +15,7 @@ describe('Table.Scroll', () => {
   it('renders scroll.x is true', () => {
     const wrapper = mount(createTable({ scroll: { x: true } }));
     expect(wrapper.find('table').props().style.width).toEqual('auto');
-    expect(wrapper.find('.rc-table-content').props().style.overflowX).toEqual('scroll');
+    expect(wrapper.find('.rc-table-content').props().style.overflowX).toEqual('auto');
     expect(wrapper.find('.rc-table-content').props().style.overflowY).toEqual('hidden');
   });
 
@@ -31,7 +31,7 @@ describe('Table.Scroll', () => {
 
   it('renders scroll.x and scroll.y are both true', () => {
     const wrapper = mount(createTable({ scroll: { x: true, y: 200 } }));
-    expect(wrapper.find('.rc-table-body').props().style.overflowX).toEqual('scroll');
+    expect(wrapper.find('.rc-table-body').props().style.overflowX).toEqual('auto');
     expect(wrapper.find('.rc-table-body').props().style.overflowY).toEqual('scroll');
   });
 
diff --git a/tests/__snapshots__/ExpandRow.spec.js.snap b/tests/__snapshots__/ExpandRow.spec.js.snap
index 91b4b35c8..9b83f29a4 100644
--- a/tests/__snapshots__/ExpandRow.spec.js.snap
+++ b/tests/__snapshots__/ExpandRow.spec.js.snap
@@ -112,7 +112,7 @@ exports[`Table.Expand renders fixed column correctly work 1`] = `
   >
     <div
       class="rc-table-content"
-      style="overflow-x: scroll; overflow-y: hidden;"
+      style="overflow-x: auto; overflow-y: hidden;"
     >
       <table
         style="width: 903px; min-width: 100%; table-layout: fixed;"
diff --git a/tests/__snapshots__/FixedColumn.spec.js.snap b/tests/__snapshots__/FixedColumn.spec.js.snap
index ab642380a..d1d68f456 100644
--- a/tests/__snapshots__/FixedColumn.spec.js.snap
+++ b/tests/__snapshots__/FixedColumn.spec.js.snap
@@ -9,7 +9,7 @@ exports[`Table.FixedColumn fixed column renders correctly RTL 1`] = `
   >
     <div
       class="rc-table-content"
-      style="overflow-x: scroll; overflow-y: hidden;"
+      style="overflow-x: auto; overflow-y: hidden;"
     >
       <table
         style="width: 1px; min-width: 100%; table-layout: fixed;"
@@ -632,7 +632,7 @@ exports[`Table.FixedColumn renders correctly scrollX - with data 1`] = `
   >
     <div
       class="rc-table-content"
-      style="overflow-x: scroll; overflow-y: hidden;"
+      style="overflow-x: auto; overflow-y: hidden;"
     >
       <table
         style="width: 1200px; min-width: 100%; table-layout: fixed;"
@@ -1255,7 +1255,7 @@ exports[`Table.FixedColumn renders correctly scrollX - without data 1`] = `
   >
     <div
       class="rc-table-content"
-      style="overflow-x: scroll; overflow-y: hidden;"
+      style="overflow-x: auto; overflow-y: hidden;"
     >
       <table
         style="width: 1200px; min-width: 100%; table-layout: fixed;"
@@ -1526,7 +1526,7 @@ exports[`Table.FixedColumn renders correctly scrollXY - with data 1`] = `
     </div>
     <div
       class="rc-table-body"
-      style="overflow-x: scroll; overflow-y: scroll; max-height: 100px;"
+      style="overflow-x: auto; overflow-y: scroll; max-height: 100px;"
     >
       <table
         style="width: 1200px; min-width: 100%; table-layout: fixed;"
@@ -2080,7 +2080,7 @@ exports[`Table.FixedColumn renders correctly scrollXY - without data 1`] = `
   >
     <div
       class="rc-table-content"
-      style="overflow-x: scroll; overflow-y: hidden;"
+      style="overflow-x: auto; overflow-y: hidden;"
     >
       <table
         style="width: 1200px; min-width: 100%; table-layout: fixed;"
diff --git a/tests/__snapshots__/Table.spec.js.snap b/tests/__snapshots__/Table.spec.js.snap
index a1e6c12d7..3fc2a1fba 100644
--- a/tests/__snapshots__/Table.spec.js.snap
+++ b/tests/__snapshots__/Table.spec.js.snap
@@ -125,7 +125,7 @@ exports[`Table.Basic custom components renders fixed column and header correctly
     </div>
     <div
       class="rc-table-body"
-      style="overflow-x: scroll; overflow-y: scroll; max-height: 100px;"
+      style="overflow-x: auto; overflow-y: scroll; max-height: 100px;"
     >
       <table
         name="my-table"