From 0e0940f5f0e28e47e1b38af39874f876993f5958 Mon Sep 17 00:00:00 2001 From: Leo Giovanetti Date: Wed, 30 Nov 2022 13:13:20 -0300 Subject: [PATCH] Fixing button/select styles (#5810) --- packages/ui/components/button/Button.tsx | 2 +- packages/ui/v2/core/form/select/Select.tsx | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/ui/components/button/Button.tsx b/packages/ui/components/button/Button.tsx index 6e61ad9119..a308025917 100644 --- a/packages/ui/components/button/Button.tsx +++ b/packages/ui/components/button/Button.tsx @@ -104,7 +104,7 @@ const buttonClasses = cva( className: "bg-gray-100 text-gray-900/30 dark:bg-darkgray-100 dark:text-darkgray-900/30 dark:border-darkgray-200", }, - applyStyleToMultipleVariants({ + ...applyStyleToMultipleVariants({ disabled: [undefined, false], color: "minimal", className: diff --git a/packages/ui/v2/core/form/select/Select.tsx b/packages/ui/v2/core/form/select/Select.tsx index a1a0a8281d..11b9a2fdca 100644 --- a/packages/ui/v2/core/form/select/Select.tsx +++ b/packages/ui/v2/core/form/select/Select.tsx @@ -65,6 +65,7 @@ const Select = < >({ className, components, + styles, ...props }: SelectProps) => { const reactSelectProps = React.useMemo(() => { @@ -86,6 +87,7 @@ const Select = < ? "var(--brand-color-dark-mode)" : "var(--brand-text-color)", }), + ...styles, }} /> );