Skip to content
Open
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
29 changes: 29 additions & 0 deletions packages/module/src/BulkSelect/BulkSelect.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,33 @@ describe('BulkSelect component', () => {
expect(dropdownList).toBeInTheDocument();
expect(dropdownList).toHaveClass('pf-v6-c-menu__list');
});

test('should render with menuToggleProps', () => {
render(
<BulkSelect
canSelectAll
pageCount={5}
totalCount={10}
selectedCount={2}
pageSelected={false}
pagePartiallySelected={true}
onSelect={() => null}
menuToggleProps={{ isDisabled: true, className: 'custom-menu-toggle' }}
/>
);

const toggleButton = screen.getByLabelText('Bulk select toggle');
expect(toggleButton).toBeInTheDocument();

// Confirm the split button toggle is disabled
expect(toggleButton).toBeDisabled();

// Confirm the split button toggle receives the correct PatternFly class
expect(toggleButton).toHaveClass('pf-v6-c-menu-toggle__button');

// Confirm the split button toggle wrapper receives the custom class
const toggleWrapper = toggleButton.parentElement;
expect(toggleWrapper).toBeInTheDocument();
expect(toggleWrapper).toHaveClass('custom-menu-toggle');
});
});
9 changes: 7 additions & 2 deletions packages/module/src/BulkSelect/BulkSelect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import {
MenuToggle,
MenuToggleCheckbox,
MenuToggleCheckboxProps,
MenuToggleElement
MenuToggleElement,
MenuToggleProps
} from '@patternfly/react-core';

export const BulkSelectValue = {
Expand Down Expand Up @@ -47,6 +48,8 @@ export interface BulkSelectProps extends Omit<DropdownProps, 'toggle' | 'onSelec
menuToggleCheckboxProps?: Omit<MenuToggleCheckboxProps, 'onChange' | 'isChecked' | 'instance' | 'ref'>;
/** Additional props for DropdownList */
dropdownListProps?: Omit<DropdownListProps, 'children'>;
/** Additional props for MenuToggleProps */
menuToggleProps?: Omit<MenuToggleProps, 'children' | 'splitButtonItems' | 'ref' | 'isExpanded' | 'onClick'>;
}

export const BulkSelect: FC<BulkSelectProps> = ({
Expand All @@ -61,6 +64,7 @@ export const BulkSelect: FC<BulkSelectProps> = ({
onSelect,
menuToggleCheckboxProps,
dropdownListProps,
menuToggleProps,
...props
}: BulkSelectProps) => {
const [ isOpen, setOpen ] = useState(false);
Expand Down Expand Up @@ -116,7 +120,7 @@ export const BulkSelect: FC<BulkSelectProps> = ({
aria-label={`Select ${allOption}`}
isChecked={
(isDataPaginated && pagePartiallySelected) ||
(!isDataPaginated && selectedCount > 0 && selectedCount < totalCount)
(!isDataPaginated && selectedCount > 0 && selectedCount < totalCount)
? null
: pageSelected || (selectedCount === totalCount && totalCount > 0)
}
Expand All @@ -129,6 +133,7 @@ export const BulkSelect: FC<BulkSelectProps> = ({
</span>
) : null
]}
{...menuToggleProps}
/>
)}
{...props}
Expand Down