From 1bb2b3942395e264b5ac2531a2e0ae828a537490 Mon Sep 17 00:00:00 2001
From: Nathan Bierema <nbierema@gmail.com>
Date: Sun, 6 Jun 2021 23:48:59 -0400
Subject: [PATCH] more

---
 packages/devui/src/Form/widgets.tsx  | 21 +++++++++++++++------
 packages/devui/src/Select/Select.tsx |  9 ++++++++-
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/packages/devui/src/Form/widgets.tsx b/packages/devui/src/Form/widgets.tsx
index 1d26c3ab..87e69dfc 100644
--- a/packages/devui/src/Form/widgets.tsx
+++ b/packages/devui/src/Form/widgets.tsx
@@ -4,13 +4,22 @@ import Select from '../Select';
 import Slider from '../Slider';
 
 /* eslint-disable react/prop-types */
-const SelectWidget: Widget = ({ options, onChange, value, ...rest }) => (
-  <Select
-    options={options.enumOptions}
-    onChange={(option: { value: string }) => {
-      onChange(option.value);
+const SelectWidget: Widget = ({
+  options,
+  onChange,
+  value,
+  onBlur,
+  defaultValue,
+  tabIndex,
+  onFocus,
+  ...rest
+}) => (
+  <Select<{ label: string; value: string }>
+    options={options.enumOptions as { label: string; value: string }[]}
+    onChange={(option) => {
+      onChange(option?.value);
     }}
-    value={(options.enumOptions as { value: string }[]).find(
+    value={(options.enumOptions as { label: string; value: string }[]).find(
       (option) => option.value === value
     )}
     {...rest}
diff --git a/packages/devui/src/Select/Select.tsx b/packages/devui/src/Select/Select.tsx
index a7acaee2..721869ac 100644
--- a/packages/devui/src/Select/Select.tsx
+++ b/packages/devui/src/Select/Select.tsx
@@ -81,11 +81,18 @@ export class Select<
   };
 }
 
+interface ExternalSelectProps<
+  Option extends OptionTypeBase = OptionTypeBase,
+  IsMulti extends boolean = false
+> extends Omit<ReactSelectProps<Option, IsMulti>, 'theme'> {
+  theme?: Theme;
+}
+
 type SelectComponent = <
   Option extends OptionTypeBase = OptionTypeBase,
   IsMulti extends boolean = false
 >(
-  props: SelectProps<Option, IsMulti>
+  props: ExternalSelectProps<Option, IsMulti>
 ) => ReactElement;
 
 export default createThemedComponent(Select) as SelectComponent & {