Skip to content

Table scroll 问题。修复。 #152

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

Closed
wants to merge 4 commits into from
Closed

Table scroll 问题。修复。 #152

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c1530a9
Table scroll 问题。修复。
shenqihui Jul 4, 2017
9da2d21
Remember last scrollLeft and scrollTop for scroll direction detecting.
shenqihui Jul 19, 2017
e8d0f9b
解决抖动的问题。
shenqihui Jul 19, 2017
6bc2818
lastScrollLeft lastScrollTop 存储设定。
shenqihui Jul 19, 2017
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
68 changes: 33 additions & 35 deletions src/Table.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,9 +497,7 @@ export default class Table extends React.Component {
className={`${prefixCls}-header`}
ref={fixed ? null : 'headTable'}
style={headStyle}
onMouseOver={this.detectScrollTarget}
onTouchStart={this.detectScrollTarget}
onScroll={this.handleBodyScroll}
onScroll={this.handleBodyScrollLeft}
>
{renderTable(true, false)}
</div>
Expand All @@ -512,8 +510,6 @@ export default class Table extends React.Component {
className={`${prefixCls}-body`}
style={bodyStyle}
ref="bodyTable"
onMouseOver={this.detectScrollTarget}
onTouchStart={this.detectScrollTarget}
onScroll={this.handleBodyScroll}
>
{renderTable(!useFixedHeader)}
Expand All @@ -539,8 +535,6 @@ export default class Table extends React.Component {
className={`${prefixCls}-body-inner`}
style={innerBodyStyle}
ref={refName}
onMouseOver={this.detectScrollTarget}
onTouchStart={this.detectScrollTarget}
onScroll={this.handleBodyScroll}
>
{renderTable(!useFixedHeader)}
Expand Down Expand Up @@ -675,46 +669,50 @@ export default class Table extends React.Component {
return typeof this.findExpandedRow(record, index) !== 'undefined';
}

detectScrollTarget = (e) => {
if (this.scrollTarget !== e.currentTarget) {
this.scrollTarget = e.currentTarget;
}
}

hasScrollX() {
const { scroll = {} } = this.props;
return 'x' in scroll;
}

handleBodyScroll = (e) => {
// Prevent scrollTop setter trigger onScroll event
// http://stackoverflow.com/q/1386696
if (e.target !== this.scrollTarget) {
return;
}
handleBodyScrollLeft = (e) => {
const target = e.target;
const { scroll = {} } = this.props;
const { headTable, bodyTable, fixedColumnsBodyLeft, fixedColumnsBodyRight } = this.refs;
if (scroll.x && e.target.scrollLeft !== this.lastScrollLeft) {
if (e.target === bodyTable && headTable) {
headTable.scrollLeft = e.target.scrollLeft;
} else if (e.target === headTable && bodyTable) {
bodyTable.scrollLeft = e.target.scrollLeft;
const { headTable, bodyTable } = this.refs;
if (target.scrollLeft !== this.lastScrollLeft && scroll.x) {
if (target === bodyTable && headTable) {
headTable.scrollLeft = target.scrollLeft;
} else if (target === headTable && bodyTable) {
bodyTable.scrollLeft = target.scrollLeft;
}
this.setScrollPositionClassName(e.target);
this.setScrollPositionClassName(target);
}
if (scroll.y) {
if (fixedColumnsBodyLeft && e.target !== fixedColumnsBodyLeft) {
fixedColumnsBodyLeft.scrollTop = e.target.scrollTop;
// Remember last scrollLeft for scroll direction detecting.
this.lastScrollLeft = target.scrollLeft;
}

handleBodyScrollTop = (e) => {
const target = e.target;
const { scroll = {} } = this.props;
const { headTable, bodyTable, fixedColumnsBodyLeft, fixedColumnsBodyRight } = this.refs;
if (target.scrollTop !== this.lastScrollTop && scroll.y && target !== headTable) {
const scrollTop = target.scrollTop;
if (fixedColumnsBodyLeft && target !== fixedColumnsBodyLeft) {
fixedColumnsBodyLeft.scrollTop = scrollTop;
}
if (fixedColumnsBodyRight && e.target !== fixedColumnsBodyRight) {
fixedColumnsBodyRight.scrollTop = e.target.scrollTop;
if (fixedColumnsBodyRight && target !== fixedColumnsBodyRight) {
fixedColumnsBodyRight.scrollTop = scrollTop;
}
if (bodyTable && e.target !== bodyTable) {
bodyTable.scrollTop = e.target.scrollTop;
if (bodyTable && target !== bodyTable) {
bodyTable.scrollTop = scrollTop;
}
}
// Remember last scrollLeft for scroll direction detecting.
this.lastScrollLeft = e.target.scrollLeft;
// Remember last scrollTop for scroll direction detecting.
this.lastScrollTop = target.scrollTop;
}

handleBodyScroll = (e) => {
this.handleBodyScrollLeft(e);
this.handleBodyScrollTop(e);
}

handleRowHover = (isHover, key) => {
Expand Down