Grouping #2106
Merged
Grouping #2106
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
Aug 19, 2020
| /> | ||
| {dragHandleProps && ( | ||
| <div className="rdg-cell-drag-handle" {...dragHandleProps} /> | ||
| {!column.rowGroup && ( |
There was a problem hiding this comment.
Rendering an empty cell for groupBy columns
src/DataGrid.tsx
Outdated
| @@ -232,6 +238,9 @@ function DataGrid<R, K extends keyof R, SR>({ | |||
| const [isDragging, setDragging] = useState(false); | |||
| const [draggedOverRowIdx, setOverRowIdx] = useState<number | undefined>(undefined); | |||
|
|
|||
| // TODO: change it to props | |||
There was a problem hiding this comment.
Not sure how to change it to props as the the keys are generated internally. The format is grandParentKey__parentKey__key__so on
There was a problem hiding this comment.
Changed it to props for now.
src/DataGrid.tsx
Outdated
| const hasGroups = groupBy.length > 0 && rowGrouper; | ||
|
|
||
| if (hasGroups) { | ||
| // TODO: finalize if these flags need to be supported on treegrid |
src/DataGrid.tsx
Outdated
| @@ -722,11 +785,41 @@ function DataGrid<R, K extends keyof R, SR>({ | |||
| } | |||
|
|
|||
| function getViewportRows() { | |||
| const rowElements = []; | |||
| // TODO: cleanup rowIndex/rowIdx logic | |||
There was a problem hiding this comment.
Need to revisit to make sure the algorithm is correct. Check useViewportRows
| ({ startRowIndex } = row); | ||
| return ( | ||
| <GroupRowRenderer<R, SR> | ||
| aria-level={row.level + 1} // aria-level is 1-based |
There was a problem hiding this comment.
| // Select is always the first column | ||
| const idx = viewportColumns[0].key === SELECT_COLUMN_KEY ? level + 1 : level; | ||
|
|
||
| function selectGroup() { |
There was a problem hiding this comment.
https://www.w3.org/TR/wai-aria-practices-1.1/examples/treegrid/treegrid-1.html
Check the Example Usage Options section. Should we focus on both rows and cells?
stories/demos/CommonFeatures.tsx
Outdated
| @@ -1,6 +1,7 @@ | |||
| import React, { useState, useCallback, useMemo } from 'react'; | |||
| import faker from 'faker'; | |||
| import { AutoSizer } from 'react-virtualized'; | |||
| import { groupBy as rowGrouper } from 'lodash'; | |||
There was a problem hiding this comment.
I will create a separate story after the review
nstepien
requested changes
Aug 28, 2020
nstepien
requested changes
Sep 2, 2020
Co-authored-by: Nicolas Stepien <567105+nstepien@users.noreply.github.com>
Co-authored-by: Nicolas Stepien <567105+nstepien@users.noreply.github.com>
Co-authored-by: Nicolas Stepien <567105+nstepien@users.noreply.github.com>
Co-authored-by: Nicolas Stepien <567105+nstepien@users.noreply.github.com>
nstepien
requested changes
Sep 2, 2020
| }); | ||
| } | ||
|
|
||
| return rows.sort((r1, r2) => r2.country.localeCompare(r1.country)); |
There was a problem hiding this comment.
Co-authored-by: Nicolas Stepien <567105+nstepien@users.noreply.github.com>
Co-authored-by: Nicolas Stepien <567105+nstepien@users.noreply.github.com>
Co-authored-by: Nicolas Stepien <567105+nstepien@users.noreply.github.com>
Co-authored-by: Nicolas Stepien <567105+nstepien@users.noreply.github.com>
nstepien
approved these changes
Sep 2, 2020
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.
groupBy,rowGrouper, andcolumn.groupFormatterpropsrowIdxis no longer in sync withrowsas the grid groups the data internally. How should it be handled?rawRows.indexOf(rows[rowIdx] as R)to get the correct indexgroupBycolumns are set as frozen columns and moved to the left (after the select column)ariaattributes fortreegridand fixarria-rowindex/aria-rowcount