Skip to content

Commit

Permalink
Allow Grid.props.isScrolling to override Grid.state.isScrolling in _c…
Browse files Browse the repository at this point in the history
…alculateChildrenToRender
  • Loading branch information
olavk committed Apr 3, 2017
1 parent 5984b6f commit d44b8d6
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion source/Grid/Grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,11 @@ export default class Grid extends PureComponent {
*/
id: PropTypes.string,

/**
* Provide a way to override isScrolling through props. Useful for WindowScroller to use cell caching.
*/
isScrolling: PropTypes.bool,

/**
* Optional renderer to be used in place of rows when either :rowCount or :columnCount is 0.
*/
Expand Down Expand Up @@ -751,13 +756,18 @@ export default class Grid extends PureComponent {
} = props

const {
isScrolling,
scrollDirectionHorizontal,
scrollDirectionVertical,
scrollLeft,
scrollTop
} = state

let isScrolling = state.isScrolling;
if (Object.hasOwnProperty.call(props, 'isScrolling')) {
// If isScrolling is defined in props, use it to override the value in state
isScrolling = props.isScrolling
}

this._childrenToDisplay = []

// Render only enough columns and rows to cover the visible area of the grid.
Expand Down

0 comments on commit d44b8d6

Please sign in to comment.