refactor(theme): ✨ add support for defaultTheme with extend

adaptui · Jul 29, 2021 · c2feed3 · c2feed3
1 parent 99b0b93
commit c2feed3
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/theme/index.tsx b/src/theme/index.tsx
@@ -38,16 +38,18 @@ export type ExtendableDefaultTheme = PartialDefaultTheme & {
 
 export type RenderlesskitProviderProps = {
   children?: React.ReactNode;
-  theme?: ExtendableDefaultTheme;
+  theme?: DefaultTheme;
+  extend?: ExtendableDefaultTheme;
 };
 
 export const RenderlesskitProvider = (props: RenderlesskitProviderProps) => {
-  const { children, theme = defaultTheme } = props;
+  const { children, theme = defaultTheme, extend } = props;
 
-  const finalTheme: DefaultTheme = React.useMemo(
-    () => mergeExtensions(mergeThemes([theme, cloneDeep(defaultTheme)])),
-    [theme],
-  );
+  let finalTheme = theme;
+
+  if (extend) {
+    finalTheme = mergeExtensions(mergeThemes([extend, cloneDeep(theme)]));
+  }
 
   return (
     <ThemeContext.Provider value={finalTheme}>{children}</ThemeContext.Provider>