Skip to content

Commit fe96701

Browse files
committed
fix: antd latest version compatible
1 parent 921f883 commit fe96701

File tree

5 files changed

+19
-14
lines changed

5 files changed

+19
-14
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@
2626
.umi-test
2727
.env.local
2828

29-
~*
29+
~*
30+
package-lock.json

src/theme/convertLegacyToken.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,10 @@ export default function convertLegacyToken(mapToken: MapToken) {
191191
'shadow-color': 'rgba(0, 0, 0, 0.15)',
192192
'shadow-color-inverse': token.colorBgContainer,
193193
'box-shadow-base': token.boxShadow,
194-
'shadow-1-up': token.boxShadowDrawerUp,
195-
'shadow-1-down': token.boxShadowDrawerDown,
196-
'shadow-1-left': token.boxShadowDrawerLeft,
197-
'shadow-1-right': token.boxShadowDrawerRight,
194+
'shadow-1-up': (token as any).boxShadowDrawerUp,
195+
'shadow-1-down': (token as any).boxShadowDrawerDown,
196+
'shadow-1-left': (token as any).boxShadowDrawerLeft,
197+
'shadow-1-right': (token as any).boxShadowDrawerRight,
198198
'shadow-2': token.boxShadowSecondary,
199199

200200
// ==========================================================================

src/theme/dark.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ import type { DerivativeFunc } from '@ant-design/cssinjs';
22
import { generate } from '@ant-design/colors';
33
import genColorMapToken from './genColorMapToken';
44
import type { GenerateColorMap, GenerateNeutralColorMap } from 'antd/lib/theme/themes/ColorMap';
5-
import type { SeedToken } from 'antd/lib/theme';
6-
import type { MapToken } from 'antd/lib/theme/interface';
5+
import type { MapToken, SeedToken } from 'antd/lib/theme/interface';
76
import { theme } from 'antd';
87
import { TinyColor } from '@ctrl/tinycolor';
98

10-
const {darkAlgorithm} = theme;
9+
const { darkAlgorithm } = theme;
1110

1211
export const getAlphaColor = (baseColor: string, alpha: number) =>
1312
new TinyColor(baseColor).setAlpha(alpha).toRgbString();
@@ -43,6 +42,7 @@ const generateNeutralColorPalettes: GenerateNeutralColorMap = (
4342
return {
4443
colorBgBase,
4544
colorTextBase,
45+
colorBgBlur: 'transparent',
4646

4747
colorText: getAlphaColor(colorTextBase, 0.85),
4848
colorTextSecondary: getAlphaColor(colorTextBase, 0.45), // Different from v5
@@ -72,7 +72,7 @@ const derivative: DerivativeFunc<SeedToken, MapToken> = (token, mapToken) => {
7272
...mergedMapToken,
7373

7474
// Colors
75-
...genColorMapToken(mapToken ??token, {
75+
...genColorMapToken(mapToken ?? token, {
7676
generateColorPalettes,
7777
generateNeutralColorPalettes,
7878
}),

src/theme/default.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ import { generate } from '@ant-design/colors';
33
import genColorMapToken from './genColorMapToken';
44
import { theme } from 'antd';
55
import type { GenerateColorMap, GenerateNeutralColorMap } from 'antd/lib/theme/themes/ColorMap';
6-
import type { SeedToken } from 'antd/lib/theme';
7-
import type { MapToken } from 'antd/lib/theme/interface';
6+
import type { MapToken, SeedToken } from 'antd/lib/theme/interface';
87
import { TinyColor } from '@ctrl/tinycolor';
98

10-
const {defaultAlgorithm} = theme;
9+
const { defaultAlgorithm } = theme;
1110

1211
export const getAlphaColor = (baseColor: string, alpha: number) =>
1312
new TinyColor(baseColor).setAlpha(alpha).toRgbString();
@@ -43,6 +42,7 @@ const generateNeutralColorPalettes: GenerateNeutralColorMap = (
4342
return {
4443
colorBgBase,
4544
colorTextBase,
45+
colorBgBlur: 'transparent',
4646

4747
colorText: getAlphaColor(colorTextBase, 0.85),
4848
colorTextSecondary: getAlphaColor(colorTextBase, 0.45), // Different from v5

src/theme/genColorMapToken.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { TinyColor } from '@ctrl/tinycolor';
22
import type { GenerateColorMap, GenerateNeutralColorMap } from 'antd/lib/theme/themes/ColorMap';
3-
import type { SeedToken } from 'antd/lib/theme';
4-
import type { ColorMapToken } from 'antd/lib/theme/interface';
3+
import type { ColorMapToken, SeedToken } from 'antd/lib/theme/interface';
54

65
interface PaletteGenerators {
76
generateColorPalettes: GenerateColorMap;
@@ -32,6 +31,10 @@ export default function genColorMapToken(
3231
return {
3332
...neutralColors,
3433

34+
colorLink: primaryColors[6],
35+
colorLinkHover: primaryColors[4],
36+
colorLinkActive: primaryColors[7],
37+
3538
colorPrimaryBg: primaryColors[1],
3639
colorPrimaryBgHover: primaryColors[2],
3740
colorPrimaryBorder: primaryColors[3],
@@ -57,6 +60,7 @@ export default function genColorMapToken(
5760
colorErrorBg: errorColors[1],
5861
colorErrorBgHover: errorColors[2],
5962
colorErrorBorder: errorColors[3],
63+
colorErrorBgActive: errorColors[3],
6064
colorErrorBorderHover: errorColors[4],
6165
colorErrorHover: errorColors[5],
6266
colorError: errorColors[6],

0 commit comments

Comments
 (0)