Skip to content

fix: remove doubled spacing between drag handle and checkbox #974

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.

Sign up for GitHub

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

Open
raswonders wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: remove doubled spacing between drag handle and checkbox #974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions packages/module/src/ListManager/ListManager.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,19 @@ describe('ListManager', () => {
});

describe('enableDragDrop prop', () => {
it('places checkboxes in DataListControl so they share spacing with the drag handle', () => {
render(<ListManager columns={mockColumns} />);
const checkbox = screen.getByTestId('column-check-name');
expect(checkbox.closest('.pf-v6-c-data-list__item-control')).toBeInTheDocument();
expect(checkbox.closest('.pf-v6-c-data-list__item-row')).not.toBeInTheDocument();
});

it('keeps non-draggable rows in DataListItemRow', () => {
render(<ListManager columns={mockColumns} enableDragDrop={false} />);
const checkbox = screen.getByTestId('column-check-name');
expect(checkbox.closest('.pf-v6-c-data-list__item-row')).toBeInTheDocument();
});

it('should sync columns when props change', async () => {
const { rerender } = render(<ListManager columns={mockColumns} enableDragDrop={false} />);

Expand Down
57 changes: 38 additions & 19 deletions packages/module/src/ListManager/ListManager.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
DataListItem,
DataListItemRow,
DataListCheck,
DataListControl,
DataListCell,
DataListItemCells,
Button,
Expand Down Expand Up @@ -111,29 +112,47 @@ const ListManager: FunctionComponent<ListManagerProps> = (
onSelectAll?.(newColumns);
};

const renderColumnCheck = (column: ListManagerItem & { id: string }, index: number, otherControls = false) => (
<DataListCheck
data-testid={`column-check-${column.key}`}
otherControls={otherControls}
isChecked={column.isSelected}
onChange={() => handleChange(column.key)}
isDisabled={column.isUntoggleable}
ouiaId={`${ouiaId}-column-${index}-checkbox`}
id={`${ouiaId}-column-${index}-checkbox`}
aria-labelledby={`${ouiaId}-column-${index}-label`}
/>
);

const renderColumnCells = (column: ListManagerItem & { id: string }, index: number) => (
<DataListItemCells
dataListCells={[
<DataListCell key={column.key} data-ouia-component-id={`${ouiaId}-column-${index}-label`}>
<label htmlFor={`${ouiaId}-column-${index}-checkbox`}>
{column.title}
</label>
</DataListCell>
]}
/>
);

const renderDataListItem = (column: ListManagerItem & { id: string }, index: number) => (
<DataListItemRow key={column.key}>
<DataListCheck
data-testid={`column-check-${column.key}`}
isChecked={column.isSelected}
onChange={() => handleChange(column.key)}
isDisabled={column.isUntoggleable}
ouiaId={`${ouiaId}-column-${index}-checkbox`}
id={`${ouiaId}-column-${index}-checkbox`}
aria-labelledby={`${ouiaId}-column-${index}-label`}
/>
<DataListItemCells
dataListCells={[
<DataListCell key={column.key} data-ouia-component-id={`${ouiaId}-column-${index}-label`}>
<label htmlFor={`${ouiaId}-column-${index}-checkbox`}>
{column.title}
</label>
</DataListCell>
]}
/>
{renderColumnCheck(column, index)}
{renderColumnCells(column, index)}
</DataListItemRow>
);

const renderDraggableDataListItem = (column: ListManagerItem & { id: string }, index: number) => (
<>
<DataListControl>
{renderColumnCheck(column, index, true)}
</DataListControl>
{renderColumnCells(column, index)}
</>
);

return (
<>
<div style={{ paddingBlockEnd: 'var(--pf-t--global--spacer--md)' }}>
Expand All @@ -152,7 +171,7 @@ const ListManager: FunctionComponent<ListManagerProps> = (
{enableDragDrop ? (
<DragDropSort
variant="DataList"
items={currentColumns.map((column, index) => ({ id: column.key, content: renderDataListItem(column, index) }))}
items={currentColumns.map((column, index) => ({ id: column.key, content: renderDraggableDataListItem(column, index) }))}
onDrop={onDrag}
overlayProps={{ isCompact: true }}
>
Expand Down
Loading