File tree 1 file changed +10
-15
lines changed
src/routes/components/dataToolbar/utils
1 file changed +10
-15
lines changed Original file line number Diff line number Diff line change @@ -61,14 +61,11 @@ export const getBulkSelect = ({
61
61
) ;
62
62
}
63
63
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 ) ;
72
69
} ;
73
70
74
71
const toggle = toggleRef => {
@@ -87,15 +84,13 @@ export const getBulkSelect = ({
87
84
anySelected ? messages . toolBarBulkSelectAriaDeselect : messages . toolBarBulkSelectAriaSelect
88
85
) }
89
86
isChecked = { isChecked }
90
- onChange = { ( ) => {
91
- anySelected ? onBulkSelectClicked ( 'none' ) : onBulkSelectClicked ( 'all' ) ;
92
- } }
93
- >
94
- { getSelectedLabel ( ) }
95
- </ MenuToggleCheckbox > ,
87
+ onChange = { handleOnBulkSelectClicked }
88
+ /> ,
96
89
] ,
97
90
} }
98
- />
91
+ >
92
+ { anySelected ? intl . formatMessage ( messages . selected , { value : numSelected } ) : null }
93
+ </ MenuToggle >
99
94
) ;
100
95
} ;
101
96
You can’t perform that action at this time.
0 commit comments