Skip to content

Commit de38686

Browse files
committed
fix: issue with is selected in filter select picker
1 parent e575287 commit de38686

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

src/Shared/Components/SelectPicker/FilterSelectPicker.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (c) 2024. Devtron Inc.
33
*/
44

5-
import { useMemo, useState } from 'react'
5+
import { useEffect, useMemo, useState } from 'react'
66
import { ReactComponent as ICFilter } from '@Icons/ic-filter.svg'
77
import { ReactComponent as ICFilterApplied } from '@Icons/ic-filter-applied.svg'
88
import SelectPicker from './SelectPicker.component'
@@ -21,6 +21,10 @@ const FilterSelectPicker = ({
2121

2222
const appliedFiltersCount = appliedFilterOptions?.length ?? 0
2323

24+
useEffect(() => {
25+
setSelectedOptions(appliedFilterOptions ?? [])
26+
}, [appliedFilterOptions])
27+
2428
const filterIcon = useMemo(
2529
() => (appliedFiltersCount ? <ICFilterApplied className="p-2" /> : <ICFilter className="p-2" />),
2630
[appliedFiltersCount],

src/Shared/Components/SelectPicker/common.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ export const SelectPickerOption = <OptionValue, IsMulti extends boolean>({
122122
selectProps: { isMulti },
123123
selectOption,
124124
isDisabled,
125+
isSelected,
125126
} = props
126127
const { description, startIcon, endIcon } = data ?? {}
127128
const showDescription = !!description
@@ -141,7 +142,7 @@ export const SelectPickerOption = <OptionValue, IsMulti extends boolean>({
141142
<Checkbox
142143
onChange={noop}
143144
onClick={handleChange}
144-
isChecked={props.isSelected || false}
145+
isChecked={isSelected || false}
145146
value={CHECKBOX_VALUE.CHECKED}
146147
rootClassName="mb-0 w-20 p-2 dc__align-self-start dc__no-shrink"
147148
disabled={isDisabled}

src/Shared/Components/SelectPicker/type.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,6 @@ export interface FilterSelectPickerProps
232232
SelectPickerProps<number | string, true>,
233233
'selectRef' | 'inputId' | 'menuPosition' | 'autoFocus' | 'shouldMenuAlignRight'
234234
> {
235-
appliedFilterOptions: SelectPickerProps<number | string, true>['options']
235+
appliedFilterOptions: SelectPickerOptionType[]
236236
handleApplyFilter: (filtersToApply: SelectPickerOptionType<number | string>[]) => void
237237
}

0 commit comments

Comments
 (0)