Skip to content

Commit b930069

Browse files
committed
Remove bulk select workaround
https://issues.redhat.com/browse/COST-4596
1 parent a33de47 commit b930069

File tree

1 file changed

+10
-15
lines changed

1 file changed

+10
-15
lines changed

src/routes/components/dataToolbar/utils/bulkSelect.tsx

+10-15
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,11 @@ export const getBulkSelect = ({
6161
);
6262
}
6363

64-
// Todo: Work around to allow clicking on "10 selected" label shown in MenuToggleCheckbox
65-
// See https://github.com/patternfly/patternfly-react/issues/10035
66-
const getSelectedLabel = () => {
67-
return anySelected ? (
68-
<span onClick={() => onBulkSelectToggle(!isBulkSelectOpen)}>
69-
{intl.formatMessage(messages.selected, { value: numSelected })}
70-
</span>
71-
) : null;
64+
const handleOnBulkSelectClicked = (checked: boolean) => {
65+
if (onBulkSelectClicked) {
66+
checked ? onBulkSelectClicked('all') : onBulkSelectClicked('none');
67+
}
68+
onBulkSelectToggle(false);
7269
};
7370

7471
const toggle = toggleRef => {
@@ -87,15 +84,13 @@ export const getBulkSelect = ({
8784
anySelected ? messages.toolBarBulkSelectAriaDeselect : messages.toolBarBulkSelectAriaSelect
8885
)}
8986
isChecked={isChecked}
90-
onChange={() => {
91-
anySelected ? onBulkSelectClicked('none') : onBulkSelectClicked('all');
92-
}}
93-
>
94-
{getSelectedLabel()}
95-
</MenuToggleCheckbox>,
87+
onChange={handleOnBulkSelectClicked}
88+
/>,
9689
],
9790
}}
98-
/>
91+
>
92+
{anySelected ? intl.formatMessage(messages.selected, { value: numSelected }) : null}
93+
</MenuToggle>
9994
);
10095
};
10196

0 commit comments

Comments
 (0)