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

fix: remove title from datagrid expander #6200

Merged
merged 3 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
39 changes: 19 additions & 20 deletions packages/ibm-products/src/components/Datagrid/Datagrid.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ const EmptyUsage = ({ emptyStateType, ...rest } = {}) => {
DatagridPagination,
});

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

const TenThousandEntries = ({ ...rest } = {}) => {
Expand Down Expand Up @@ -406,6 +406,8 @@ const ExpandedRow = ({ ...rest } = {}) => {
data,
ExpandedRowContentComponent: expansionRenderer,
expandedContentHeight: 95,
expanderButtonTitleExpanded: 'Collapse row',
expanderButtonTitleCollapsed: 'Expand row',
},
useExpandedRow
);
Expand Down Expand Up @@ -609,6 +611,8 @@ const NestedTable = ({ ...rest } = {}) => {
data,
ExpandedRowContentComponent: expansionRenderer,
expandedContentHeight: (nestedDatagridState.state.pageSize + 2) * 48 + 1, // +2 for header and pagination
expanderButtonTitleExpanded: 'Collapse row',
expanderButtonTitleCollapsed: 'Expand row',
},
useExpandedRow
);
Expand Down Expand Up @@ -1012,7 +1016,7 @@ describe(componentName, () => {
});

it('renders a Batch Actions Table', async () => {
render(<BatchActions data-testid={dataTestId}></BatchActions>);
render(<BatchActions data-testid={dataTestId} />);

const alertMock = jest.spyOn(window, 'alert');

Expand Down Expand Up @@ -1206,7 +1210,7 @@ describe(componentName, () => {
});

it('Infinite Scroll', async () => {
render(<InfiniteScroll data-testid={dataTestId}></InfiniteScroll>);
render(<InfiniteScroll data-testid={dataTestId} />);

expect(
screen
Expand Down Expand Up @@ -1247,7 +1251,7 @@ describe(componentName, () => {
});

it('With Pagination', async () => {
render(<WithPagination data-testid={dataTestId}></WithPagination>);
render(<WithPagination data-testid={dataTestId} />);

expect(
document.getElementById(`${carbon.prefix}-pagination-select-4`)
Expand Down Expand Up @@ -1340,15 +1344,15 @@ describe(componentName, () => {
}

it('Is Hover On Row', async () => {
render(<IsHoverOnRow data-testid={dataTestId}></IsHoverOnRow>);
render(<IsHoverOnRow data-testid={dataTestId} />);
completeHoverOperation(1);

completeHoverOperation(5);
});

//Disables Selected Rows
it('Renders Disable Select Row', async () => {
render(<DisableSelectRow data-testid={dataTestId}></DisableSelectRow>);
render(<DisableSelectRow data-testid={dataTestId} />);

const alertMock = jest.spyOn(window, 'alert');

Expand Down Expand Up @@ -1538,7 +1542,7 @@ describe(componentName, () => {
}

it('Hide Select All', async () => {
render(<HideSelectAll data-testid={dataTestId}></HideSelectAll>);
render(<HideSelectAll data-testid={dataTestId} />);

hideSelectAll(2);

Expand Down Expand Up @@ -1599,7 +1603,7 @@ describe(componentName, () => {
});

it('Nested Table', async () => {
render(<NestedTable data-testid={dataTestId}></NestedTable>);
render(<NestedTable data-testid={dataTestId} />);
const firstRowExpander = screen.getAllByLabelText('Expand row')[0];
const firstRow = screen.getAllByRole('row')[1];
fireEvent.click(firstRowExpander);
Expand Down Expand Up @@ -1673,7 +1677,7 @@ describe(componentName, () => {
}

it('Radio Select', async () => {
render(<RadioSelect data-testid={dataTestId}></RadioSelect>);
render(<RadioSelect data-testid={dataTestId} />);
radioSelectButton(1, 1);

radioSelectButton(1, 4);
Expand All @@ -1687,9 +1691,7 @@ describe(componentName, () => {
it('Select Items In All Pages', async () => {
const alertMock = jest.spyOn(window, 'alert');

render(
<SelectItemsInAllPages data-testid={dataTestId}></SelectItemsInAllPages>
);
render(<SelectItemsInAllPages data-testid={dataTestId} />);
// check if 10 rows are rendered on initial load
var numRows = screen
.getByRole('table')
Expand Down Expand Up @@ -1943,7 +1945,7 @@ describe(componentName, () => {
});

it('Selectable Row', async () => {
render(<SelectableRow data-testid={dataTestId}></SelectableRow>);
render(<SelectableRow data-testid={dataTestId} />);

fireEvent.click(
screen
Expand Down Expand Up @@ -2036,12 +2038,7 @@ describe(componentName, () => {
},
];
const columns = [...columnsWithoutSticky, ...defaultHeader.slice(2)];
render(
<CustomizingColumns
data-testid={dataTestId}
columns={columns}
></CustomizingColumns>
);
render(<CustomizingColumns data-testid={dataTestId} columns={columns} />);

const customizeColumnsButton = screen.getByLabelText('Customize columns');
fireEvent.click(customizeColumnsButton);
Expand All @@ -2060,7 +2057,7 @@ describe(componentName, () => {
});

it('Customizing Columns', async () => {
render(<CustomizingColumns data-testid={dataTestId}></CustomizingColumns>);
render(<CustomizingColumns data-testid={dataTestId} />);

const alertMock = jest.spyOn(window, 'alert');

Expand Down Expand Up @@ -2324,6 +2321,8 @@ describe(componentName, () => {
});

const sharedFilterGridProps = {
expanderButtonTitleExpanded: 'Collapse row',
expanderButtonTitleCollapsed: 'Expand row',
gridTitle: 'Data table title',
gridDescription: 'Additional information if needed',
useDenseHeader: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,10 @@ const useRowExpander = (hooks) => {
row?.onClick?.(row, event);
lastExpandedRowIndex.current = row.id;
},
title: null,
};
const {
expanderButtonTitleExpanded = 'Collapse row',
expanderButtonTitleCollapsed = 'Expand row',
} = tempState?.current || {};
const { expanderButtonTitleExpanded, expanderButtonTitleCollapsed } =
tempState?.current || {};
const expanderTitle = row.isExpanded
? expanderButtonTitleExpanded
: expanderButtonTitleCollapsed;
Expand Down
Loading