Merge pull request #89 from UgnisSoftware/UGN-337

Fix UGN-337 remove enforced button color in dropzone

Author: masiulis

src/components/Providers.tsx

@@ -1,7 +1,7 @@
 import { ChakraProvider, extendTheme } from "@chakra-ui/react"
 import { createContext } from "react"
 import type { RsiProps } from "../types"
-import { colorSchemeOverrides, CustomTheme, themeOverrides } from "../theme"
+import type { CustomTheme } from "../theme"
 
 export const RsiContext = createContext({} as any)
 
@@ -14,8 +14,9 @@ type ProvidersProps<T extends string> = {
 export const rootId = "chakra-modal-rsi"
 
 export const Providers = <T extends string>({ children, theme, rsiValues }: ProvidersProps<T>) => {
-  const mergedTheme = extendTheme(colorSchemeOverrides, theme)
+  const mergedTheme = extendTheme(theme)
 
+  console.log(mergedTheme)
   if (!rsiValues.fields) {
     throw new Error("Fields must be provided to react-spreadsheet-import")
   }

src/theme.ts

@@ -104,7 +104,6 @@ export const themeOverrides = {
         },
         dropZoneBorder: "rsi.500",
         dropzoneButton: {
-          bg: "rsi.500",
           mt: "1rem",
         },
       },
@@ -373,6 +372,11 @@ export const themeOverrides = {
         },
       },
     },
+    Button: {
+      defaultProps: {
+        colorScheme: "rsi",
+      },
+    },
   },
   styles: {
     global: {
@@ -472,9 +476,4 @@ export const themeOverrides = {
   },
 } as const
 
-export const colorSchemeOverrides = withDefaultColorScheme({
-  colorScheme: "rsi",
-  components: ["Button"],
-})
-
 export type CustomTheme = DeepPartial<typeof themeOverrides>