Skip to content

Commit

Permalink
Fix infinite loop with externally controlled scroll
Browse files Browse the repository at this point in the history
  • Loading branch information
boxfoot committed Feb 18, 2020
1 parent 10da369 commit 944f0ed
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
6 changes: 3 additions & 3 deletions src/FixedDataTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -1113,23 +1113,23 @@ class FixedDataTable extends React.Component {
/**
* Calls the user specified scroll callbacks -- onScrollStart, onScrollEnd, onHorizontalScroll, and onVerticalScroll.
*/
_didScroll = (/* !object */ nextProps) => {
_didScroll = (/* !object */ prevProps) => {
const {
onScrollStart,
scrollX,
scrollY,
onHorizontalScroll,
onVerticalScroll,
tableSize: { ownerHeight },
} = nextProps;
} = this.props;

const {
endRowIndex: oldEndRowIndex,
firstRowIndex: oldFirstRowIndex,
scrollX: oldScrollX,
scrollY: oldScrollY,
tableSize: { ownerHeight: oldOwnerHeight },
} = this.props;
} = prevProps;

// check if scroll values have changed - we have an extra check on NaN because (NaN !== NaN)
const ownerHeightChanged = ownerHeight !== oldOwnerHeight && !(isNaN(ownerHeight) && isNaN(oldOwnerHeight));
Expand Down
2 changes: 1 addition & 1 deletion src/FixedDataTableContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ class FixedDataTableContainer extends React.Component {
render() {
return (
<FixedDataTable
{...this.props}
{...this.state}
{...this.props}
scrollActions={this.scrollActions}
columnActions={this.columnActions}
/>
Expand Down
4 changes: 1 addition & 3 deletions src/FixedDataTableStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,5 @@ import reducers from 'reducers'
import { createStore } from 'redux'

export default {
get: () => {
return createStore(reducers)
},
get: () => createStore(reducers)
};

0 comments on commit 944f0ed

Please sign in to comment.