Add support for variable row heights #2384
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
amanmahajan7
commented
May 3, 2021
| @@ -94,20 +94,79 @@ export function useViewportRows<R>({ | |||
| } | |||
| }, [expandedGroupIds, groupedRows, rawRows]); | |||
|
|
|||
| const { totalRowHeight, getRowTop, getRowHeight, findRowIdx } = useMemo(() => { | |||
| if (typeof rowHeight === 'number') { | |||
There was a problem hiding this comment.
This change does not impact the performance if rowHeight is a number.
|
|
||
| const rowPositions: ({ height: number; top: number })[] = []; | ||
| let totalRowHeight = 0; | ||
| // Calcule the height of all the rows upfront. This can cause performance issues |
There was a problem hiding this comment.
I did not notice any performance issues even on a large grid. Tried editing, colspan and a few other features. This can be slow if rowHeight itself is expensive
| return rowPositions[rowIdx].top; | ||
| }, | ||
| getRowHeight: (rowIdx: number) => rowPositions[rowIdx].height, | ||
| findRowIdx(offset: number) { |
There was a problem hiding this comment.
Use binary search on a sorted array.
| @@ -98,13 +98,13 @@ function createRows(): readonly Row[] { | |||
| for (let i = 1; i < 10000; i++) { | |||
| rows.push({ | |||
| id: i, | |||
| year: 2015 + faker.random.number(3), | |||
| year: 2015 + faker.datatype.number(3), | |||
There was a problem hiding this comment.
faker.random is deprecated
|
Working on tests but ready for review. |
amanmahajan7
changed the title
nstepien
reviewed
May 4, 2021
Co-authored-by: Nicolas Stepien <[email protected]>
Co-authored-by: Nicolas Stepien <[email protected]>
nstepien
reviewed
May 4, 2021
Co-authored-by: Nicolas Stepien <[email protected]>
nstepien
previously approved these changes
May 4, 2021
added 2 commits
May 4, 2021 11:14
nstepien
approved these changes
May 4, 2021
gernotkogler
pushed a commit
to Garaio-REM/react-data-grid
that referenced
this pull request
May 13, 2021
* Change rowHeight to a function to support variable row heights * Fix hooks order * Remove memo * Add a comment * Fix tests * Fix types * Cleanup * Use a single array * Fix pageup/pagedown * Update src/DataGrid.tsx Co-authored-by: Nicolas Stepien <[email protected]> * Update src/hooks/useViewportRows.ts Co-authored-by: Nicolas Stepien <[email protected]> * newScrollTop -> nextRowY * move/deduplicate getRowTop(rowIdx) and getRowHeight(rowIdx) calls outside the ifs * Validate rowIdx * Update src/hooks/useViewportRows.ts Co-authored-by: Nicolas Stepien <[email protected]> * Fix typo * Add rowHeight tests * typo Co-authored-by: Nicolas Stepien <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
rowHeightto anumber/functionto support variable row heightsrowHeightis a numberI think this can really useful specially on readonly grids