diff --git a/packages/core-components/src/components/Select/Select.tsx b/packages/core-components/src/components/Select/Select.tsx index b5a641acd4..82be078cd0 100644 --- a/packages/core-components/src/components/Select/Select.tsx +++ b/packages/core-components/src/components/Select/Select.tsx @@ -107,15 +107,15 @@ export type SelectItem = { value: string | number; }; -export type Selection = string | string[] | number | number[]; +export type SelectedItems = string | string[] | number | number[]; export type SelectProps = { multiple?: boolean; items: SelectItem[]; label: string; placeholder?: string; - selected?: Selection; - onChange: (arg: Selection) => void; + selected?: SelectedItems; + onChange: (arg: SelectedItems) => void; triggerReset?: boolean; native?: boolean; disabled?: boolean; @@ -134,7 +134,7 @@ export function SelectComponent(props: SelectProps) { disabled = false, } = props; const classes = useStyles(); - const [value, setValue] = useState( + const [value, setValue] = useState( selected || (multiple ? [] : ''), ); const [isOpen, setOpen] = useState(false); @@ -150,8 +150,8 @@ export function SelectComponent(props: SelectProps) { }, [selected]); const handleChange = (event: React.ChangeEvent<{ value: unknown }>) => { - setValue(event.target.value as Selection); - onChange(event.target.value as Selection); + setValue(event.target.value as SelectedItems); + onChange(event.target.value as SelectedItems); }; const handleClick = (event: React.ChangeEvent) => { diff --git a/packages/core-components/src/components/Select/index.tsx b/packages/core-components/src/components/Select/index.tsx index 293d626ee6..870c2a0899 100644 --- a/packages/core-components/src/components/Select/index.tsx +++ b/packages/core-components/src/components/Select/index.tsx @@ -17,8 +17,8 @@ export { SelectComponent as Select } from './Select'; export type { SelectClassKey, + SelectedItems, SelectInputBaseClassKey, - Selection, SelectItem, } from './Select'; export type { ClosedDropdownClassKey } from './static/ClosedDropdown'; diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx index e4d6f280f4..92261b6cac 100644 --- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx +++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx @@ -16,7 +16,7 @@ import { Progress, Select, - Selection, + SelectedItems, SelectItem, } from '@backstage/core-components'; import { useApi } from '@backstage/core-plugin-api'; @@ -109,7 +109,7 @@ export const RepoUrlPicker = ({ allowedOwners, ); const updateHost = useCallback( - (value: Selection) => { + (value: SelectedItems) => { onChange( serializeFormData({ host: value as string, @@ -125,7 +125,7 @@ export const RepoUrlPicker = ({ ); const updateOwnerSelect = useCallback( - (value: Selection) => + (value: SelectedItems) => onChange( serializeFormData({ host,