fix: type of useTheme

callstack · Sep 27, 2022 · 02accf8 · 02accf8
1 parent a3916db
commit 02accf8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/example/src/RootNavigator.tsx b/example/src/RootNavigator.tsx
@@ -6,8 +6,8 @@ import {
   createStackNavigator,
 } from '@react-navigation/stack';
 import { getHeaderTitle } from '@react-navigation/elements';
-import ExampleList, { examples } from './ExampleList';
 import { Platform } from 'react-native';
+import ExampleList, { examples } from './ExampleList';
 
 const Stack = createStackNavigator();
 

diff --git a/src/core/theming.tsx b/src/core/theming.tsx
@@ -1,5 +1,5 @@
 import { createTheming } from '@callstack/react-theme-provider';
-import type { Theme } from 'src/types';
+import type { Theme, MD2Theme, MD3Theme } from 'src/types';
 import {
   MD2DarkTheme,
   MD2LightTheme,
@@ -9,9 +9,16 @@ import {
 
 export const DefaultTheme = MD3LightTheme;
 
-export const { ThemeProvider, withTheme, useTheme } = createTheming<Theme>(
-  DefaultTheme as ReactNativePaper.Theme
-);
+const {
+  ThemeProvider,
+  withTheme,
+  useTheme: useThemeProviderTheme,
+} = createTheming<Theme>(DefaultTheme);
+
+const useTheme = (overrides?: Parameters<typeof useThemeProviderTheme>[0]) =>
+  useThemeProviderTheme<MD2Theme | MD3Theme>(overrides);
+
+export { ThemeProvider, withTheme, useTheme };
 
 export const defaultThemesByVersion = {
   2: {