Skip to content

Commit 244dcc0

Browse files
committed
fix: K8sResourceList: ColumnSelector - option not getting selected after closing menu
1 parent cc72799 commit 244dcc0

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

src/components/ResourceBrowser/ResourceList/ColumnSelector.tsx

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import { MultiValue, SelectInstance } from 'react-select'
1919

2020
import {
2121
ButtonVariantType,
22+
deepEqual,
2223
Icon,
2324
SelectPicker,
2425
SelectPickerOptionType,
@@ -64,13 +65,6 @@ const ColumnSelector = ({ setVisibleColumns, visibleColumns, allColumns }: Colum
6465
setSelectedColumns(getSelectedColumns())
6566
}, [allColumns])
6667

67-
const handleMenuClose = () => {
68-
setIsMenuOpen(false)
69-
resetTriggerAutoClickTimestamp()
70-
71-
selectRef.current?.blur()
72-
}
73-
7468
const onChange = (newValue: MultiValue<SelectPickerOptionType<TableColumnType>>) => {
7569
setTriggerAutoClickTimestampToNow()
7670
setSelectedColumns(newValue)
@@ -90,7 +84,14 @@ const ColumnSelector = ({ setVisibleColumns, visibleColumns, allColumns }: Colum
9084

9185
selectRef.current?.blur()
9286

93-
setVisibleColumns(newVisibleColumns)
87+
if (!deepEqual(newVisibleColumns, visibleColumns.slice(1))) {
88+
setVisibleColumns(newVisibleColumns)
89+
}
90+
}
91+
92+
const handleMenuClose = () => {
93+
handleApplySelectedColumns()
94+
resetTriggerAutoClickTimestamp()
9495
}
9596

9697
return (

0 commit comments

Comments
 (0)