templates/toco-react-template
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: update theme import and algorithm handling in App component

Browse Source
This commit is contained in:
dayjoy
2025-05-06 16:26:52 +08:00
parent aca60e107d
commit 58406d2d54
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/app/index.tsx
View File

@@ -1,5 +1,5 @@
import { customValueTypeMap } from '@components';
import { ConfigProvider, App as TocoApp, theme, ProConfigProvider } from '@toco-design/components';
import { ConfigProvider, App as TocoApp, theme as antTheme, ProConfigProvider } from '@toco-design/components';
import { Router } from '@remix-run/router';
import enUS from 'antd/locale/en_US';
import zhCN from 'antd/locale/zh_CN';
@@ -13,7 +13,7 @@ import * as langs from './langs';
import { store } from './store';
import appTheme from './theme';
const { darkAlgorithm } = theme;
const { darkAlgorithm } = antTheme;
const AppInternal: React.FC<{ router: Router }> = (props) => {
const { router } = props;
@@ -32,8 +32,19 @@ const AppInternal: React.FC<{ router: Router }> = (props) => {
};
const themeConfig = useMemo(() => {
const algorithmArr = Array.isArray(appTheme.algorithm) ? appTheme.algorithm : appTheme.algorithm ? [appTheme.algorithm] : [];
if (theme === Theme.DARK) {
if (!algorithmArr.includes(antTheme.darkAlgorithm)) {
algorithmArr.push(antTheme.darkAlgorithm);
}
} else {
const index = algorithmArr.indexOf(antTheme.darkAlgorithm);
if (index > -1) {
algorithmArr.splice(index, 1);
}
}
return {
algorithm: (theme === Theme.DARK ? [darkAlgorithm] : []).concat(appTheme.algorithm ?? []),
algorithm: algorithmArr,
cssVar: appTheme.cssVar ?? true,
token: primaryColor
? {