Merge 6f4e347 into f921fdb

react-component · Mar 20, 2023 · 87a476c · 87a476c
2 parents f921fdb + 6f4e347
commit 87a476c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/src/Table.tsx b/src/Table.tsx
@@ -317,7 +317,7 @@ function Table<RecordType extends DefaultRecordType>(tableProps: TableProps<Reco
 
   if (fixHeader) {
     scrollYStyle = {
-      overflowY: 'scroll',
+      overflowY: 'auto',
       maxHeight: scroll.y,
     };
   }

diff --git a/tests/Scroll.spec.js b/tests/Scroll.spec.js
@@ -1,11 +1,14 @@
-import React from 'react';
 import { mount } from 'enzyme';
-import { act } from 'react-dom/test-utils';
 import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
+import React from 'react';
+import { act } from 'react-dom/test-utils';
 import Table from '../src';
 
 describe('Table.Scroll', () => {
-  const data = [{ key: 'key0', name: 'Lucy' }, { key: 'key1', name: 'Jack' }];
+  const data = [
+    { key: 'key0', name: 'Lucy' },
+    { key: 'key1', name: 'Jack' },
+  ];
   const createTable = props => {
     const columns = [{ title: 'Name', dataIndex: 'name', key: 'name' }];
 
@@ -32,7 +35,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('auto');
-    expect(wrapper.find('.rc-table-body').props().style.overflowY).toEqual('scroll');
+    expect(wrapper.find('.rc-table-body').props().style.overflowY).toEqual('auto');
   });
 
   it('fire scroll event', () => {

diff --git a/tests/__snapshots__/FixedColumn.spec.js.snap b/tests/__snapshots__/FixedColumn.spec.js.snap
@@ -1957,7 +1957,7 @@ exports[`Table.FixedColumn renders correctly scrollXY - with data 1`] = `
     </div>
     <div
       class="rc-table-body"
-      style="overflow-x: auto; overflow-y: scroll; max-height: 100px;"
+      style="overflow-x: auto; overflow-y: auto; max-height: 100px;"
     >
       <table
         style="width: 1200px; min-width: 100%; table-layout: fixed;"
@@ -2800,7 +2800,7 @@ exports[`Table.FixedColumn renders correctly scrollXY - without data 1`] = `
     </div>
     <div
       class="rc-table-body"
-      style="overflow-x: auto; overflow-y: scroll; max-height: 100px;"
+      style="overflow-x: auto; overflow-y: auto; max-height: 100px;"
     >
       <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
@@ -199,7 +199,7 @@ exports[`Table.Basic custom components renders fixed column and header correctly
     </div>
     <div
       class="rc-table-body"
-      style="overflow-x: auto; overflow-y: scroll; max-height: 100px;"
+      style="overflow-x: auto; overflow-y: auto; max-height: 100px;"
     >
       <table
         name="my-table"