Skip to content

Commit d84f889

Browse files
committed
feat: place loading indicator in place of dropdown indicator
1 parent dc4111c commit d84f889

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/Shared/Components/SelectPicker/SelectPicker.component.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import {
3535
SelectPickerControl,
3636
SelectPickerDropdownIndicator,
3737
SelectPickerGroupHeading,
38-
SelectPickerLoadingIndicator,
3938
SelectPickerMenuList,
4039
SelectPickerOption,
4140
SelectPickerValueContainer,
@@ -426,7 +425,7 @@ const SelectPicker = <OptionValue, IsMulti extends boolean>({
426425
ref={selectRef}
427426
components={{
428427
IndicatorSeparator: null,
429-
LoadingIndicator: SelectPickerLoadingIndicator,
428+
LoadingIndicator: null,
430429
DropdownIndicator: SelectPickerDropdownIndicator,
431430
Control: SelectPickerControl,
432431
Option: renderOption,

src/Shared/Components/SelectPicker/common.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,14 @@ const getTooltipProps = (tooltipProps: SelectPickerOptionType['tooltipProps'] =
6464
export const SelectPickerDropdownIndicator = <OptionValue,>(
6565
props: DropdownIndicatorProps<SelectPickerOptionType<OptionValue>>,
6666
) => {
67-
const { isDisabled } = props
67+
const {
68+
isDisabled,
69+
selectProps: { isLoading },
70+
} = props
6871

6972
return (
7073
<components.DropdownIndicator {...props}>
71-
<ICCaretDown className={isDisabled ? 'scn-3' : 'scn-6'} />
74+
{isLoading ? <Progressing /> : <ICCaretDown className={isDisabled ? 'scn-3' : 'scn-6'} />}
7275
</components.DropdownIndicator>
7376
)
7477
}
@@ -169,8 +172,6 @@ export const SelectPickerValueContainer = <OptionValue, IsMulti extends boolean>
169172
)
170173
}
171174

172-
export const SelectPickerLoadingIndicator = () => <Progressing />
173-
174175
export const SelectPickerOption = <OptionValue, IsMulti extends boolean>({
175176
disableDescriptionEllipsis,
176177
...props

0 commit comments

Comments
 (0)