Skip to content

Commit 5e026f3

Browse files
authored
type(site): fix site TypeScript definition error (ant-design#57667)
1 parent 19f4c75 commit 5e026f3

4 files changed

Lines changed: 55 additions & 12 deletions

File tree

.dumi/theme/builtins/ComponentTokenTable/index.tsx

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ import { LinkOutlined, QuestionCircleOutlined, RightOutlined } from '@ant-design
33
import { ConfigProvider, Flex, Popover, Table, Typography } from 'antd';
44
import { createStyles, css, useTheme } from 'antd-style';
55
import { getDesignToken } from 'antd-token-previewer';
6-
import tokenMeta from 'antd/es/version/token-meta.json';
7-
import tokenData from 'antd/es/version/token.json';
86

97
import useLocale from '../../../hooks/useLocale';
10-
import { useColumns } from '../TokenTable';
118
import type { TokenData } from '../TokenTable';
9+
import { useColumns } from '../TokenTable';
10+
import { tokenData, tokenMeta } from '../versionToken';
1211

1312
const compare = (token1: string, token2: string) => {
1413
const hasColor1 = token1.toLowerCase().includes('color');
@@ -112,23 +111,25 @@ const SubTokenTable: React.FC<SubTokenTableProps> = (props) => {
112111

113112
const data = tokens
114113
.sort(component ? undefined : compare)
115-
.map<TokenData>((name) => {
114+
.map<TokenData | null>((name) => {
116115
const meta = component
117116
? tokenMeta.components[component].find((item) => item.token === name)
118117
: tokenMeta.global[name];
119118

120119
if (!meta) {
121-
return null as unknown as TokenData;
120+
return null;
122121
}
123122

124123
return {
125124
name,
126125
desc: lang === 'cn' ? meta.desc : meta.descEn,
127126
type: meta.type,
128-
value: component ? tokenData[component].component[name] : defaultToken[name],
127+
value: component
128+
? tokenData[component]?.component[name]
129+
: defaultToken[name as keyof typeof defaultToken],
129130
};
130131
})
131-
.filter(Boolean);
132+
.filter((item): item is TokenData => item !== null && item !== undefined);
132133

133134
const code = component
134135
? `<ConfigProvider

.dumi/theme/builtins/TokenCompare/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import React from 'react';
33
import { FastColor } from '@ant-design/fast-color';
44
import { Flex, theme } from 'antd';
55
import { createStaticStyles } from 'antd-style';
6-
import tokenMeta from 'antd/es/version/token-meta.json';
76
import { clsx } from 'clsx';
87

98
import useLocale from '../../../hooks/useLocale';
9+
import { tokenMeta } from '../versionToken';
1010

1111
const styles = createStaticStyles(({ cssVar, css }) => {
1212
const height = cssVar.controlHeightLG;
13-
const dotSize = height / 5;
13+
const dotSize = Number(height) / 5;
1414

1515
return {
1616
container: css`
@@ -86,7 +86,7 @@ const TokenCompare: React.FC<TokenCompareProps> = (props) => {
8686
const darkTokens = theme.getDesignToken({ algorithm: theme.darkAlgorithm });
8787

8888
return list.map((tokenName) => {
89-
const meta = (tokenMeta.global as any)[tokenName];
89+
const meta = tokenMeta.global?.[tokenName];
9090
const name = lang === 'cn' ? meta.name : meta.nameEn;
9191
return {
9292
name: name.replace('颜色', '').replace('色', '').replace('Color', '').trim(),

.dumi/theme/builtins/TokenTable/index.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ import type { TableProps } from 'antd';
44
import { Table } from 'antd';
55
import { createStyles } from 'antd-style';
66
import { getDesignToken } from 'antd-token-previewer';
7-
import tokenMeta from 'antd/es/version/token-meta.json';
87

98
import useLocale from '../../../hooks/useLocale';
109
import BezierVisualizer from '../../common/BezierVisualizer';
1110
import ColorChunk from '../ColorChunk';
11+
import { tokenMeta } from '../versionToken';
12+
import type { GlobalTokenSource } from '../versionToken';
1213

1314
type TokenTableProps = {
14-
type: 'seed' | 'map' | 'alias';
15+
type: GlobalTokenSource;
1516
lang: 'zh' | 'en';
1617
};
1718

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
import rawTokenMeta from 'antd/es/version/token-meta.json';
2+
import rawTokenData from 'antd/es/version/token.json';
3+
4+
export type GlobalTokenSource = 'seed' | 'map' | 'alias';
5+
6+
export interface GlobalTokenMeta {
7+
name: string;
8+
nameEn: string;
9+
desc: string;
10+
descEn: string;
11+
type: string;
12+
source: GlobalTokenSource;
13+
}
14+
15+
export interface ComponentTokenMeta {
16+
source: string;
17+
token: string;
18+
type: string;
19+
desc: string;
20+
descEn: string;
21+
name: string;
22+
nameEn: string;
23+
}
24+
25+
export interface VersionTokenMeta {
26+
global: Record<string, GlobalTokenMeta>;
27+
components: Record<string, ComponentTokenMeta[]>;
28+
}
29+
30+
export type VersionTokenValue = string | number | boolean;
31+
32+
export interface ComponentTokenStatistic {
33+
global?: string[];
34+
component: Record<string, VersionTokenValue>;
35+
}
36+
37+
export type VersionTokenStatistic = Record<string, ComponentTokenStatistic>;
38+
39+
export const tokenMeta = rawTokenMeta as VersionTokenMeta;
40+
41+
export const tokenData = rawTokenData as VersionTokenStatistic;

0 commit comments

Comments
 (0)