From a58a513870c36e2d3aa13b443d780b59774aa61f Mon Sep 17 00:00:00 2001
From: Mary Hipp <maryhipp@Marys-MacBook-Air.local>
Date: Wed, 18 Sep 2024 14:00:15 -0400
Subject: [PATCH 1/2] spread custom components with those passed in

---
 lib/components/combobox/combobox.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/components/combobox/combobox.tsx b/lib/components/combobox/combobox.tsx
index bafda90..5e15ade 100644
--- a/lib/components/combobox/combobox.tsx
+++ b/lib/components/combobox/combobox.tsx
@@ -75,7 +75,7 @@ export const Combobox = typedMemo((props: ComboboxProps) => {
       menuPortalTarget={document.body}
       colorScheme="base"
       selectedOptionColorScheme="base"
-      components={components}
+      components={{...components, ...rest.components}}
       chakraStyles={chakraStyles}
       styles={styles}
       variant="filled"

From 634795607a9bec18d93b212bebc60f3f425f38a1 Mon Sep 17 00:00:00 2001
From: Mary Hipp <maryhipp@Marys-MacBook-Air.local>
Date: Wed, 18 Sep 2024 14:02:31 -0400
Subject: [PATCH 2/2] remove components from the rest

---
 lib/components/combobox/combobox.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/components/combobox/combobox.tsx b/lib/components/combobox/combobox.tsx
index 5e15ade..541a9fb 100644
--- a/lib/components/combobox/combobox.tsx
+++ b/lib/components/combobox/combobox.tsx
@@ -31,13 +31,13 @@ const styles: StylesConfig<ComboboxOption> = {
   menuPortal: (provided) => ({ ...provided, zIndex: 9999 }),
 };
 
-const components: SelectComponentsConfig<ComboboxOption, false, GroupBase<ComboboxOption>> = {
+const componentOverrides: SelectComponentsConfig<ComboboxOption, false, GroupBase<ComboboxOption>> = {
   Option: CustomOptionComponent,
   MenuList: CustomMenuListComponent,
 };
 
 export const Combobox = typedMemo((props: ComboboxProps) => {
-  const { sx, selectRef, inputRef, ...rest } = props;
+  const { sx, selectRef, inputRef, components, ...rest } = props;
   const chakraStyles = useMemo<CustomChakraStylesConfig>(
     () => ({
       container: (provided, _state) => ({ ...provided, w: 'full', ...sx }),
@@ -75,7 +75,7 @@ export const Combobox = typedMemo((props: ComboboxProps) => {
       menuPortalTarget={document.body}
       colorScheme="base"
       selectedOptionColorScheme="base"
-      components={{...components, ...rest.components}}
+      components={{...componentOverrides, ...components}}
       chakraStyles={chakraStyles}
       styles={styles}
       variant="filled"