Skip to content
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

Jump to bottom

Allow Grid.props.isScrolling to override Grid.state.isScrolling #639

Merged
merged 1 commit into from
Apr 3, 2017
Merged

Allow Grid.props.isScrolling to override Grid.state.isScrolling #639

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
12 changes: 11 additions & 1 deletion source/Grid/Grid.js
View file
Open in desktop
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