diff --git a/components/skeleton/style/index.ts b/components/skeleton/style/index.ts index 934202d802..efafbbd8db 100644 --- a/components/skeleton/style/index.ts +++ b/components/skeleton/style/index.ts @@ -1,9 +1,13 @@ import type { CSSObject } from '@ant-design/cssinjs'; import { Keyframes, unit } from '@ant-design/cssinjs'; -import type { FullToken, GenerateStyle, GetDefaultToken } from '../../theme/internal'; +import type { + FullToken, + GenerateStyle, + GetDefaultToken, + CSSUtil, +} from '../../theme/internal'; import { genStyleHooks, mergeToken } from '../../theme/internal'; -import type { CSSUtil } from '../../theme/util/genComponentStyleHook'; export type ComponentToken = { /** @deprecated use gradientFromColor instead. */ diff --git a/components/style/compact-item-vertical.ts b/components/style/compact-item-vertical.ts index dad1bc24bd..a57e68061d 100644 --- a/components/style/compact-item-vertical.ts +++ b/components/style/compact-item-vertical.ts @@ -1,8 +1,12 @@ /* eslint-disable import/prefer-default-export */ import type { CSSInterpolation, CSSObject } from '@ant-design/cssinjs'; -import type { AliasToken, FullToken, OverrideComponent } from '../theme/internal'; -import type { CSSUtil } from '../theme/util/genComponentStyleHook'; +import type { + AliasToken, + FullToken, + OverrideComponent, + CSSUtil, +} from '../theme/internal'; function compactItemVerticalBorder(token: AliasToken & CSSUtil, parentCls: string): CSSObject { return { diff --git a/components/style/compact-item.ts b/components/style/compact-item.ts index bb2fb3842a..c1ff882e63 100644 --- a/components/style/compact-item.ts +++ b/components/style/compact-item.ts @@ -1,8 +1,12 @@ /* eslint-disable import/prefer-default-export */ import type { CSSInterpolation, CSSObject } from '@ant-design/cssinjs'; -import type { AliasToken, FullToken, OverrideComponent } from '../theme/internal'; -import type { CSSUtil } from '../theme/util/genComponentStyleHook'; +import type { + AliasToken, + FullToken, + OverrideComponent, + CSSUtil, +} from '../theme/internal'; interface CompactItemOptions { focus?: boolean; diff --git a/components/style/roundedArrow.ts b/components/style/roundedArrow.ts index d8cb725056..7e0896c821 100644 --- a/components/style/roundedArrow.ts +++ b/components/style/roundedArrow.ts @@ -1,8 +1,7 @@ /* eslint-disable import/prefer-default-export */ import type { CSSObject } from '@ant-design/cssinjs'; import { unit } from '@ant-design/cssinjs'; -import type { CSSUtil } from 'antd/es/theme/util/genComponentStyleHook'; - +import type { CSSUtil } from '../theme/internal'; import type { AliasToken } from '../theme/interface'; export interface ArrowToken { diff --git a/components/theme/internal.ts b/components/theme/internal.ts index 7586af3854..dba6e6dceb 100644 --- a/components/theme/internal.ts +++ b/components/theme/internal.ts @@ -24,6 +24,8 @@ import genPresetColor from './util/genPresetColor'; import statisticToken, { merge as mergeToken } from './util/statistic'; import useResetIconStyle from './util/useResetIconStyle'; +export type { CSSUtil } from '@ant-design/cssinjs-utils'; + export { DesignTokenContext, defaultConfig } from './context'; export { PresetColors, diff --git a/components/tree-select/style/index.ts b/components/tree-select/style/index.ts index c4a7bfa024..626b1b2d47 100644 --- a/components/tree-select/style/index.ts +++ b/components/tree-select/style/index.ts @@ -1,9 +1,14 @@ import { unit } from '@ant-design/cssinjs'; import { getStyle as getCheckboxStyle } from '../../checkbox/style'; -import type { AliasToken, FullToken, GenerateStyle, GetDefaultToken } from '../../theme/internal'; +import type { + AliasToken, + FullToken, + GenerateStyle, + GetDefaultToken, + CSSUtil, +} from '../../theme/internal'; import { genStyleHooks, mergeToken } from '../../theme/internal'; -import type { CSSUtil } from '../../theme/util/genComponentStyleHook'; import type { TreeSharedToken } from '../../tree/style'; import { genTreeStyle, initComponentToken } from '../../tree/style'; diff --git a/components/tree/style/index.ts b/components/tree/style/index.ts index edf399bb47..de229cf97d 100644 --- a/components/tree/style/index.ts +++ b/components/tree/style/index.ts @@ -4,9 +4,14 @@ import { Keyframes, unit } from '@ant-design/cssinjs'; import { getStyle as getCheckboxStyle } from '../../checkbox/style'; import { genFocusOutline, resetComponent } from '../../style'; import { genCollapseMotion } from '../../style/motion'; -import type { AliasToken, DerivativeToken, FullToken, GetDefaultToken } from '../../theme/internal'; +import type { + AliasToken, + DerivativeToken, + FullToken, + GetDefaultToken, + CSSUtil, +} from '../../theme/internal'; import { genStyleHooks, mergeToken } from '../../theme/internal'; -import type { CSSUtil } from '../../theme/util/genComponentStyleHook'; export interface TreeSharedToken { /**