Skip to content

Commit

Permalink
fix(DataGrid): add support for selectrow and nestedrow (#4354)
Browse files Browse the repository at this point in the history
Co-authored-by: Matt Gallo <[email protected]>
  • Loading branch information
Ratheeshrajan and matthewgallo authored Feb 20, 2024
1 parent 8feb304 commit 984da57
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@ import {
getStoryTitle,
prepareStory,
} from '../../../../global/js/utils/story-helper';
import { Datagrid, useDatagrid, useNestedRows } from '../../index';
import {
Datagrid,
useDatagrid,
useNestedRows,
useSelectRows,
} from '../../index';
import styles from '../../_storybook-styles.scss';
import { DatagridActions } from '../../utils/DatagridActions';
import { makeData } from '../../utils/makeData';
Expand Down Expand Up @@ -270,6 +275,48 @@ export const NestedRowsUsageStory = prepareStory(BasicTemplateWrapper, {
},
});

const SelectableNestedRows = ({ ...args }) => {
const columns = React.useMemo(() => defaultHeader, []);
const [data] = useState(makeData(10, 5, 2, 2));
const datagridState = useDatagrid(
{
columns,
data,
DatagridActions,
...args.defaultGridProps,
},
useNestedRows,
useSelectRows
);

return <Datagrid datagridState={{ ...datagridState }} />;
};

const SelectableNestedRowTemplateWrapper = ({ ...args }) => {
return <SelectableNestedRows defaultGridProps={{ ...args }} />;
};

const selectableNestedRowsStoryName = 'With selectable nested rows';
export const SelectableNestedRowsUsageStory = prepareStory(
SelectableNestedRowTemplateWrapper,
{
storyName: selectableNestedRowsStoryName,
argTypes: {
gridTitle: ARG_TYPES.gridTitle,
gridDescription: ARG_TYPES.gridDescription,
useDenseHeader: ARG_TYPES.useDenseHeader,
rowSize: ARG_TYPES.rowSize,
rowSizes: ARG_TYPES.rowSizes,
onRowSizeChange: ARG_TYPES.onRowSizeChange,
expanderButtonTitleExpanded: 'Collapse row',
expanderButtonTitleCollapsed: 'Expand row',
},
args: {
...nestedRowsControlProps,
},
}
);

const nestedRowsInitialStateStoryName = 'With initially expanded nested rows';
export const NestedRowsInitialUsageStory = prepareStory(BasicTemplateWrapper, {
storyName: nestedRowsInitialStateStoryName,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ const SelectRow = (datagridState) => {
const cellProps = cell.getCellProps();
const isFirstColumnStickyLeft =
columns[0]?.sticky === 'left' && withStickyColumn;
const rowId = `${tableId}-${row.index}`;
const rowId = `${tableId}-${row.id}-${row.index}`;
return (
<TableSelectRow
{...cellProps}
Expand Down

0 comments on commit 984da57

Please sign in to comment.