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.

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

Scrolling improvements #1254

Merged
merged 78 commits into from
Aug 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
03a9bf4
Effiecient windowing example
malonecj Jul 19, 2018
2f76d27
Remove use of refs to setScrollLeft. Renamed row/col visible boundary…
malonecj Jul 19, 2018
dc0faa9
Calculate overscan columns based on scroll direction
malonecj Jul 19, 2018
00969f3
Render overscan columns and rows based on scroll direction
malonecj Jul 19, 2018
a0767ba
Set height of grid
malonecj Jul 19, 2018
5f271d5
Improved overscan row/col calcualtion
malonecj Jul 20, 2018
28f7c0d
Send isScrolling prop to formatters to improve perf of complex format…
malonecj Jul 27, 2018
3a91ce3
Pass isScrolling prop to HeaderCell and Formatter
malonecj Jul 31, 2018
cdedad3
Pass isScrolling prop to HeaderCell and Formatter 2
malonecj Jul 31, 2018
2bcee94
Set pointer-events to none when scrolling
malonecj Aug 1, 2018
f2a629e
reset setScrollLeft functionality to enable frozen columns
malonecj Aug 1, 2018
a5b392a
Ensure set scroll left on frozen columns when scrolling in vertical d…
malonecj Aug 1, 2018
24d7355
Fix context menu
malonecj Aug 1, 2018
071080a
zindex styles for locked cells
malonecj Aug 2, 2018
9fab49d
Render overscan columns when row scrolling has complete
malonecj Aug 2, 2018
a860758
Show correct SelectionMask position for locked cells
malonecj Aug 6, 2018
4758113
is scrolling example
malonecj Aug 6, 2018
5a33ed7
Do not deep compare dependentValues check
malonecj Aug 7, 2018
e8852b6
Ensure rowOverscanEndIdx within bounds
malonecj Aug 7, 2018
f921323
Ensure frozen cells are mounted in correct fixed position if canvas h…
malonecj Aug 8, 2018
d09aa0f
Move InteractionMasks styles to a separate file
amanmahajan7 Jun 17, 2018
fc545f8
Cherry pick set cell ref commit
amanmahajan7 Jun 17, 2018
bc3ccb1
Base SelectionMask top and left off rendered cells to handle dynamic …
malonecj Aug 10, 2018
7264a0f
Take scroll left into account when open editor container
malonecj Aug 10, 2018
f6ca658
Catchup with next branch
malonecj Aug 10, 2018
0f1fc76
Catchup with next branch
malonecj Aug 10, 2018
9d770ba
Re-add lost canvas.js file
malonecj Aug 10, 2018
d6d8e28
Fix lint errors
malonecj Aug 10, 2018
4473586
Fix some build errors
malonecj Aug 10, 2018
0694fbe
Remove references to deleted RowsContainer file
malonecj Aug 10, 2018
c589e1c
Fix typo
malonecj Aug 10, 2018
24e3005
Fix InteractionMaks test
malonecj Aug 10, 2018
c5bdb49
Fix some tests
malonecj Aug 10, 2018
e721bf0
Fix failing tests
malonecj Aug 13, 2018
349a3dc
Handle dynamic row heights in SelectionMask
malonecj Aug 13, 2018
0cc0738
Remove unnecessary packages
malonecj Aug 14, 2018
b0b0e21
Viewport scroll calculations
malonecj Aug 14, 2018
bd5f100
Address pull request comments
malonecj Aug 14, 2018
dfcdb84
use let instead of const in checkScroll function
malonecj Aug 14, 2018
47f7147
Remove unneeded id from Row component
malonecj Aug 14, 2018
d165c45
Chang logic around getRenderedColumns
malonecj Aug 15, 2018
34c47a2
Address more PR comments
malonecj Aug 15, 2018
9f633ab
Tests for Viewport Utils
malonecj Aug 15, 2018
f70133f
Fix lint errors and remove console rule from lintrc
malonecj Aug 15, 2018
2d6fd95
Tests for getScrollDirection
malonecj Aug 16, 2018
3ddaae4
Tests for getRowOverscanStartIdx
malonecj Aug 16, 2018
ae5921d
getRowOverscanEndIdx tests
malonecj Aug 16, 2018
f4ff251
Tests for getColOverscanEndIdx
malonecj Aug 16, 2018
26b7d15
Tidy up syntax in example31-isScrolling
malonecj Aug 16, 2018
97a6ed0
Ensure locked columns are shifted to start of column metrics array
malonecj Aug 16, 2018
e026106
Test for rendering the correct cells
malonecj Aug 16, 2018
b41756e
Fix lint errors
malonecj Aug 16, 2018
f1756c3
Rename all fixed/locked/frozen columns to frozen
malonecj Aug 17, 2018
b178f49
Fix tests after npm update
malonecj Aug 17, 2018
dff770a
Fix IE test
malonecj Aug 20, 2018
59f4f7e
Fixed new warnings in tests
malonecj Aug 20, 2018
48b1539
Fix failing test
malonecj Aug 20, 2018
d9809ca
Update version to 5.0.0-alpha1
malonecj Aug 21, 2018
45235ca
Ensure render all visible columns if scrolled to the right and using …
malonecj Aug 21, 2018
ace6f47
Version bump
malonecj Aug 21, 2018
1f16bb6
Change test expectation
malonecj Aug 21, 2018
c03908e
Fix test
malonecj Aug 21, 2018
8f0f4f2
Ensure last column is rendered when grid scrolled and using frozen co…
malonecj Aug 22, 2018
4b0cb89
Minor version bump
malonecj Aug 22, 2018
257e053
Handle viewport scroll state when no columns present
malonecj Aug 22, 2018
bb9a226
5.0.0-alpha8
malonecj Aug 22, 2018
4317191
Fallback for getSelectedRowTop if no access to row ref
malonecj Aug 23, 2018
341f64b
Fix some bugs around cell selection for RowGroups
malonecj Aug 23, 2018
5528ace
Fix failing test
malonecj Aug 23, 2018
e916db3
Pass row prop to formatters
malonecj Aug 23, 2018
0cda1e0
Fix failing test and version bump
malonecj Aug 23, 2018
ddae0ef
Fix lint error
malonecj Aug 23, 2018
d115f9a
Re-add deprecated onRowUpdatedMethod - to be removed in v6
malonecj Aug 24, 2018
2f10f15
Address some more PR comments
malonecj Aug 29, 2018
c07b1b6
Air BNB browser shims for Enzyme testing
malonecj Aug 29, 2018
2c6ef53
Remove unused functions
malonecj Aug 29, 2018
2d69e00
prop deprecation warnings
malonecj Aug 29, 2018
f0e55f7
onDragHandleDoubleClick deprecation warning
malonecj Aug 29, 2018
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
1 change: 0 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
*/
"comma-dangle": [2, "never"], // http://eslint.org/docs/rules/comma-dangle
"no-cond-assign": [2, "always"], // http://eslint.org/docs/rules/no-cond-assign
"no-console": 1, // http://eslint.org/docs/rules/no-console
"no-debugger": 1, // http://eslint.org/docs/rules/no-debugger
"no-alert": 1, // http://eslint.org/docs/rules/no-alert
"no-constant-condition": 1, // http://eslint.org/docs/rules/no-constant-condition
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Features
- [Rich cell editors like autocomplete, checkbox and dropdown editors, complete with keyboard navigation](http://adazzle.github.io/react-data-grid/examples.html#/built-in-editors)
- Custom cell Editors - Easily create your own
- [Custom cell Formatters](http://adazzle.github.io/react-data-grid/examples.html#/custom-formatters)
- [Frozen columns](http://adazzle.github.io/react-data-grid/examples.html#/fixed-cols)
- [Frozen columns](http://adazzle.github.io/react-data-grid/examples.html#/frozen-cols)
- [Resizable columns](http://adazzle.github.io/react-data-grid/examples.html#/resizable-cols)
- [Sorting](http://adazzle.github.io/react-data-grid/examples.html#/sortable-cols)
- [Filtering](http://adazzle.github.io/react-data-grid/examples.html#/filterable-sortable-grid)
Expand Down
2 changes: 1 addition & 1 deletion config/karma.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module.exports = function (config) {
return BROWSERS.split(',');
}
if(RELEASE){
browsers = ['Chrome','Firefox','IE']
browsers = ['Chrome','Firefox']
}else if(DEBUG){
browsers = ['ChromeDebugging'];
}
Expand Down
30 changes: 15 additions & 15 deletions docs/api/docs.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"type": null
},
{
"name": "displayEnd",
"name": "rowOverscanEndIdx",
"type": null
},
{
Expand All @@ -69,13 +69,13 @@
"modifiers": [],
"params": [
{
"name": "displayStart",
"name": "rowOverscanStartIdx",
"type": {
"name": "number"
}
},
{
"name": "displayEnd",
"name": "rowOverscanEndIdx",
"type": {
"name": "number"
}
Expand Down Expand Up @@ -287,56 +287,56 @@
"required": false,
"description": ""
},
"displayStart": {
"rowOverscanStartIdx": {
"type": {
"name": "number"
},
"required": true,
"description": ""
},
"displayEnd": {
"rowOverscanEndIdx": {
"type": {
"name": "number"
},
"required": true,
"description": ""
},
"visibleStart": {
"rowVisibleStartIdx": {
"type": {
"name": "number"
},
"required": true,
"description": ""
},
"visibleEnd": {
"rowVisibleEndIdx": {
"type": {
"name": "number"
},
"required": true,
"description": ""
},
"colVisibleStart": {
"colVisibleStartIdx": {
"type": {
"name": "number"
},
"required": true,
"description": ""
},
"colVisibleEnd": {
"colVisibleEndIdx": {
"type": {
"name": "number"
},
"required": true,
"description": ""
},
"colDisplayStart": {
"colOverscanStartIdx": {
"type": {
"name": "number"
},
"required": true,
"description": ""
},
"colDisplayEnd": {
"colOverscanEndIdx": {
"type": {
"name": "number"
},
Expand Down Expand Up @@ -4178,28 +4178,28 @@
"required": false,
"description": ""
},
"colVisibleStart": {
"colVisibleStartIdx": {
"type": {
"name": "number"
},
"required": true,
"description": ""
},
"colVisibleEnd": {
"colVisibleEndIdx": {
"type": {
"name": "number"
},
"required": true,
"description": ""
},
"colDisplayStart": {
"colOverscanStartIdx": {
"type": {
"name": "number"
},
"required": true,
"description": ""
},
"colDisplayEnd": {
"colOverscanEndIdx": {
"type": {
"name": "number"
},
Expand Down
16 changes: 8 additions & 8 deletions docs/markdowns/Canvas.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@ type: `shaperequire('./PropTypeShapes/CellMetaDataShape')`
type: `string`


### `colDisplayEnd` (required)
### `colOverscanEndIdx` (required)

type: `number`


### `colDisplayStart` (required)
### `colOverscanStartIdx` (required)

type: `number`


### `colVisibleEnd` (required)
### `colVisibleEndIdx` (required)

type: `number`


### `colVisibleStart` (required)
### `colVisibleStartIdx` (required)

type: `number`

Expand All @@ -46,12 +46,12 @@ type: `union(object|array)`
type: `element`


### `displayEnd` (required)
### `rowOverscanEndIdx` (required)

type: `number`


### `displayStart` (required)
### `rowOverscanStartIdx` (required)

type: `number`

Expand Down Expand Up @@ -145,12 +145,12 @@ type: `string`
type: `union(number|string)`


### `visibleEnd` (required)
### `rowVisibleEndIdx` (required)

type: `number`


### `visibleStart` (required)
### `rowVisibleStartIdx` (required)

type: `number`

Expand Down
8 changes: 4 additions & 4 deletions docs/markdowns/Row.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,22 @@ type: `func`
defaultValue: `require('./Cell')`


### `colDisplayEnd` (required)
### `colOverscanEndIdx` (required)

type: `number`


### `colDisplayStart` (required)
### `colOverscanStartIdx` (required)

type: `number`


### `colVisibleEnd` (required)
### `colVisibleEndIdx` (required)

type: `number`


### `colVisibleStart` (required)
### `colVisibleStartIdx` (required)

type: `number`

Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"lerna": "2.8.0",
"version": "4.0.8",
"version": "5.0.0-alpha12",
"packages": [
"packages/*"
]
Expand Down
Loading