vanja/feishin
1
0
Fork 0
mirror of https://github.com/jeffvli/feishin.git synced 2026-05-07 04:20:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

add type assertion for primaryShade

Browse Source
This commit is contained in:
jeffvli
2026-03-04 21:01:56 -08:00
parent 93791aea15
commit cad7fef454
1 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/themes/use-app-theme.ts
+26 -10
View File
@@ -1,3 +1,5 @@
import type { MantineThemeOverride } from '@mantine/core';
import { useMantineColorScheme } from '@mantine/core';
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
@@ -52,8 +54,15 @@ export const useAppTheme = (overrideTheme?: AppTheme) => {
const themeInlineStylesRef = useRef<HTMLStyleElement | null>(null);
const getCurrentTheme = () => window.matchMedia('(prefers-color-scheme: dark)').matches;
const [isDarkTheme, setIsDarkTheme] = useState(getCurrentTheme());
const { followSystemTheme, primaryShade, theme, themeDark, themeLight, useThemeAccentColor, useThemePrimaryShade } =
useThemeSettings();
const {
followSystemTheme,
primaryShade,
theme,
themeDark,
themeLight,
useThemeAccentColor,
useThemePrimaryShade,
} = useThemeSettings();
const mqListener = (e: any) => {
setIsDarkTheme(e.matches);
@@ -144,10 +153,10 @@ export const useAppTheme = (overrideTheme?: AppTheme) => {
? themeProperties.colors?.primary || themeProperties.colors?.['state-info'] || accent
: accent;
// Use theme's primary shade if useThemePrimaryShade is enabled, otherwise use slider value
const effectivePrimaryShade = useThemePrimaryShade
// Use theme's primary shade if useThemePrimaryShade is enabled, otherwise use slider value (0-9)
const effectivePrimaryShade: MantineThemeOverride['primaryShade'] = useThemePrimaryShade
? themeProperties.mantineOverride?.primaryShade
: { dark: primaryShade, light: primaryShade };
: ({ dark: primaryShade, light: primaryShade } as MantineThemeOverride['primaryShade']);
return {
...themeProperties,
@@ -250,8 +259,15 @@ export const useAppThemeColors = () => {
const accent = useAccent();
const getCurrentTheme = () => window.matchMedia('(prefers-color-scheme: dark)').matches;
const [isDarkTheme] = useState(getCurrentTheme());
const { followSystemTheme, primaryShade, theme, themeDark, themeLight, useThemeAccentColor, useThemePrimaryShade } =
useThemeSettings();
const {
followSystemTheme,
primaryShade,
theme,
themeDark,
themeLight,
useThemeAccentColor,
useThemePrimaryShade,
} = useThemeSettings();
const getSelectedTheme = () => {
if (followSystemTheme) {
@@ -271,10 +287,10 @@ export const useAppThemeColors = () => {
? themeProperties.colors?.primary || themeProperties.colors?.['state-info'] || accent
: accent;
// Use theme's primary shade if useThemePrimaryShade is enabled, otherwise use slider value
const effectivePrimaryShade = useThemePrimaryShade
// Use theme's primary shade if useThemePrimaryShade is enabled, otherwise use slider value (0-9)
const effectivePrimaryShade: MantineThemeOverride['primaryShade'] = useThemePrimaryShade
? themeProperties.mantineOverride?.primaryShade
: { dark: primaryShade, light: primaryShade };
: ({ dark: primaryShade, light: primaryShade } as MantineThemeOverride['primaryShade']);
return {
...themeProperties,