Skip to content

Set maxHeight to inner body #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 27, 2017
+4 −1
Merged

Set maxHeight to inner body #128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/Table.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,11 +428,13 @@ export default class Table extends React.Component {
bodyStyle.overflowX = bodyStyle.overflowX || 'auto';
}

const innerBodyStyle = {};
if (scroll.y) {
// maxHeight will make fixed-Table scrolling not working
// so we only set maxHeight to body-Table here
if (fixed) {
bodyStyle.height = bodyStyle.height || scroll.y;
innerBodyStyle.maxHeight = bodyStyle.maxHeight || scroll.y;
innerBodyStyle.overflowY = bodyStyle.overflowY || 'scroll';
} else {
bodyStyle.maxHeight = bodyStyle.maxHeight || scroll.y;
}
Expand Down Expand Up @@ -520,6 +522,7 @@ export default class Table extends React.Component {
>
<div
className={`${prefixCls}-body-inner`}
style={innerBodyStyle}
ref={refName}
onMouseOver={this.detectScrollTarget}
onTouchStart={this.detectScrollTarget}
Expand Down