diff --git a/components/date-picker/style/token.ts b/components/date-picker/style/token.ts index 7b6dff3e55..2a2e40fa62 100644 --- a/components/date-picker/style/token.ts +++ b/components/date-picker/style/token.ts @@ -5,9 +5,11 @@ import { initComponentToken } from '../../input/style/token'; import type { MultipleSelectorToken, SelectorToken } from '../../select/style/token'; import type { ArrowToken } from '../../style/roundedArrow'; import { getArrowToken } from '../../style/roundedArrow'; -import type { GlobalToken } from '../../theme/internal'; import type { + GlobalToken, FullToken, +} from '../../theme/internal'; +import type { GetDefaultToken, TokenWithCommonCls, } from '../../theme/util/genComponentStyleHook'; diff --git a/components/select/style/token.ts b/components/select/style/token.ts index de89197582..2fde549fa8 100644 --- a/components/select/style/token.ts +++ b/components/select/style/token.ts @@ -1,5 +1,5 @@ import type { CSSProperties } from 'react'; -import type { FullToken, GetDefaultToken } from 'antd/es/theme/util/genComponentStyleHook'; +import type { FullToken, GetDefaultToken } from 'antd/es/theme/internal'; export interface MultipleSelectorToken { /** diff --git a/components/theme/interface/cssinjs-utils.ts b/components/theme/interface/cssinjs-utils.ts index 08d9f000e1..77a0905fc3 100644 --- a/components/theme/interface/cssinjs-utils.ts +++ b/components/theme/interface/cssinjs-utils.ts @@ -1,6 +1,8 @@ import type { GlobalToken as GlobalTokenTypeUtil, OverrideTokenMap as OverrideTokenTypeUtil, + FullToken as FullTokenTypeUtil, + TokenMapKey, } from '@ant-design/cssinjs-utils'; import type { AliasToken } from './alias'; @@ -11,3 +13,5 @@ import type { ComponentTokenMap } from './components'; export type GlobalToken = GlobalTokenTypeUtil; export type OverrideToken = OverrideTokenTypeUtil; + +export type FullToken> = FullTokenTypeUtil; \ No newline at end of file diff --git a/components/theme/interface/index.ts b/components/theme/interface/index.ts index daf5c5700e..e741974b2f 100644 --- a/components/theme/interface/index.ts +++ b/components/theme/interface/index.ts @@ -7,7 +7,11 @@ import type { SeedToken } from './seeds'; export type MappingAlgorithm = DerivativeFunc; -export type { GlobalToken, OverrideToken } from './cssinjs-utils'; +export type { + GlobalToken, + OverrideToken, + FullToken, +} from './cssinjs-utils'; export type { AliasToken } from './alias'; export type { ComponentTokenMap } from './components'; diff --git a/components/theme/internal.ts b/components/theme/internal.ts index d1c9fac8a7..95cc79735b 100644 --- a/components/theme/internal.ts +++ b/components/theme/internal.ts @@ -8,11 +8,12 @@ import type { SeedToken, GlobalToken, UseComponentStyleResult, + FullToken, } from './interface'; import { PresetColors } from './interface'; import { getLineHeight } from './themes/shared/genFontSizes'; import useToken from './useToken'; -import type { FullToken, GetDefaultToken } from './util/genComponentStyleHook'; +import type { GetDefaultToken } from './util/genComponentStyleHook'; import genComponentStyleHook, { genStyleHooks, genSubStyleComponent,