diff --git a/packages/design-system/lib/components/Select/Select.stories.tsx b/packages/design-system/lib/components/Select/Select.stories.tsx
index 5c467e65a..5f42f9dcc 100644
--- a/packages/design-system/lib/components/Select/Select.stories.tsx
+++ b/packages/design-system/lib/components/Select/Select.stories.tsx
@@ -22,6 +22,15 @@ export const Default: Story = {
},
}
+export const DefaultSelected: Story = {
+ args: {
+ items: ['Foo', 'Bar', 'Baz'],
+ label: 'Select an item',
+ name: 'foo',
+ defaultSelectedKey: 'Foo',
+ },
+}
+
export const ObjectItem: Story = {
args: {
items: [
diff --git a/packages/design-system/lib/components/Select/Select.tsx b/packages/design-system/lib/components/Select/Select.tsx
index 9a3d67998..dd918c7c8 100644
--- a/packages/design-system/lib/components/Select/Select.tsx
+++ b/packages/design-system/lib/components/Select/Select.tsx
@@ -88,22 +88,27 @@ export function Select({
- {items.map((item, idx) => (
-
- {typeof item === 'object' ? (
-
- {item.label}
-
- ) : (
-
- {item.toString()}
-
- )}
-
- ))}
+ {items.map((item) =>
+ typeof item === 'object' ? (
+
+ {item.label}
+
+ ) : (
+
+ {item.toString()}
+
+ )
+ )}
diff --git a/packages/design-system/lib/components/Select/SelectFilter.tsx b/packages/design-system/lib/components/Select/SelectFilter.tsx
index ec65f91c3..469ea4abb 100644
--- a/packages/design-system/lib/components/Select/SelectFilter.tsx
+++ b/packages/design-system/lib/components/Select/SelectFilter.tsx
@@ -81,22 +81,27 @@ export function SelectFilter({
offset={22}
>
- {items.map((item, idx) => (
-
- {typeof item === 'object' ? (
-
- {item.label}
-
- ) : (
-
- {item.toString()}
-
- )}
-
- ))}
+ {items.map((item) =>
+ typeof item === 'object' ? (
+
+ {item.label}
+
+ ) : (
+
+ {item.toString()}
+
+ )
+ )}
diff --git a/packages/design-system/lib/components/Select/SelectItem.tsx b/packages/design-system/lib/components/Select/SelectItem.tsx
index 2e8efbc81..0a2d8a631 100644
--- a/packages/design-system/lib/components/Select/SelectItem.tsx
+++ b/packages/design-system/lib/components/Select/SelectItem.tsx
@@ -4,12 +4,20 @@ import styles from './select.module.css'
import { MaterialIcon } from '../Icons/MaterialIcon'
import { SelectItemProps } from './types'
-export function SelectItem({ children, icon, isDisabled }: SelectItemProps) {
+export function SelectItem({
+ children,
+ icon,
+ isDisabled,
+ ...props
+}: SelectItemProps) {
+ const iconColor = isDisabled ? 'Icon/Interactive/Disabled' : 'Icon/Default'
+
return (
{({ isSelected }) => (
<>
@@ -17,7 +25,7 @@ export function SelectItem({ children, icon, isDisabled }: SelectItemProps) {
) : null}