Merge pull request #14 from sonnat/master

sonnat · Feb 1, 2022 · 2ae68e0 · 2ae68e0
2 parents 28b95ad + 9d4d708
commit 2ae68e0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/lib/styles/createTheme.ts b/lib/styles/createTheme.ts
@@ -1,11 +1,11 @@
 import * as React from "react";
-import type { EmptyIntersectionObject } from "../typings";
 import createBreakpoints, {
   type Breakpoints,
   type BreakpointsInput
 } from "./createBreakpoints";
 import createColors, { type Colors, type ColorsInput } from "./createColors";
 import createMixins, { type Mixins } from "./createMixins";
+import createRadius, { type Radius } from "./createRadius";
 import createSpacings, {
   type Spacings,
   type SpacingsInput
@@ -15,7 +15,6 @@ import createTypography, {
   type TypographyInput
 } from "./createTypography";
 import createZIndexes, { type ZIndexes } from "./createZIndexes";
-import createRadius, { type Radius } from "./createRadius";
 import swatches, { type Swatches } from "./swatches";
 
 export type Direction = "ltr" | "rtl";
@@ -48,7 +47,7 @@ export interface ThemeBase {
   };
 }
 
-const createTheme = <CustomProps = EmptyIntersectionObject>(
+const createTheme = <CustomProps = unknown>(
   themeInput?: Partial<ThemeInput> & {
     custom?: CustomProps | ((theme: ThemeBase) => CustomProps);
   }

diff --git a/lib/styles/useDarkMode.ts b/lib/styles/useDarkMode.ts
@@ -1,9 +1,12 @@
 import * as React from "react";
 import usePreviousValue from "../utils/usePreviousValue";
-import { type Theme } from "./createTheme";
-import defaultTheme from "./defaultTheme";
+import defaultTheme, { type DefaultTheme } from "./defaultTheme";
+import type { Theme } from "./createTheme";
 
-const useDarkMode = (isDarkMode = false, theme = defaultTheme): Theme => {
+const useDarkMode = <T extends Theme = DefaultTheme>(
+  isDarkMode = false,
+  theme: T = defaultTheme as T
+): T => {
   const cachedTheme = React.useRef(theme);
   const prevState = usePreviousValue(isDarkMode);
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sonnat/ui",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "React component library using Sonnat Design System to build faster, elegant, and accessible web applications.",
   "license": "MIT",
   "homepage": "https://www.sonnat.dev/",

diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -2,7 +2,7 @@ import { AppProps } from "next/app";
 import Head from "next/head";
 import * as React from "react";
 import CssBaseline from "../lib/CssBaseline";
-import { useDarkMode, makeStyles, SonnatInitializer } from "../lib/styles";
+import { makeStyles, SonnatInitializer, useDarkMode } from "../lib/styles";
 
 interface IAppContext {
   setIsDarkMode: React.Dispatch<React.SetStateAction<boolean>>;
@@ -43,10 +43,10 @@ const App = (props: AppProps) => {
 
   const [isDarkMode, setIsDarkMode] = React.useState(false);
 
-  const theme = useDarkMode(isDarkMode);
+  const newTheme = useDarkMode(isDarkMode);
 
   return (
-    <SonnatInitializer theme={theme} injectFirst>
+    <SonnatInitializer theme={newTheme} injectFirst>
       <Head>
         <meta
           name="viewport"