generated from react-component/trigger
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8 from ant-design/fix/refactor-antd-theme
Fix: fixed some typescript error
- Loading branch information
Showing
10 changed files
with
155 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,25 @@ | ||
| export { default as genStyleUtils } from './util/genStyleUtils'; | ||
|
|
||
| export { default as genCalc } from './util/calc'; | ||
| export type { default as AbstractCalculator } from './util/calc/calculator'; | ||
| export { | ||
| default as statisticToken, | ||
| merge as mergeToken, | ||
| } from './util/statistic'; | ||
|
|
||
| export type { | ||
| OverrideTokenMap, | ||
| TokenMap, | ||
| TokenMapKey, | ||
| GlobalTokenWithComponent, | ||
| ComponentToken, | ||
| ComponentTokenKey, | ||
| GlobalToken, | ||
| } from './interface'; | ||
| export type { default as AbstractCalculator } from './util/calc/calculator'; | ||
| export type { | ||
| FullToken, | ||
| GetDefaultToken, | ||
| GetDefaultTokenFn, | ||
| GenStyleFn, | ||
| TokenWithCommonCls, | ||
| CSSUtil, | ||
| } from './util/genStyleUtils'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,35 @@ | ||
| import type { TokenType } from '@ant-design/cssinjs'; | ||
|
|
||
| export type TokenMap = Record<string, TokenType>; | ||
| export type TokenMap = object; | ||
|
|
||
| export type TokenMapKey<CompTokenMap extends TokenMap> = Extract<keyof CompTokenMap, string>; | ||
|
|
||
| export type OverrideTokenMap<CompTokenMap extends TokenMap> = Partial<CompTokenMap>; | ||
| export type GlobalToken< | ||
| CompTokenMap extends TokenMap, | ||
| AliasToken extends TokenType, | ||
| > = AliasToken & CompTokenMap; | ||
|
|
||
| export type GlobalTokenWithComponent<CompTokenMap extends TokenMap, C extends TokenMapKey<CompTokenMap>> = CompTokenMap & | ||
| CompTokenMap[C]; | ||
| export type OverrideTokenMap< | ||
| CompTokenMap extends TokenMap, | ||
| AliasToken extends TokenType, | ||
| > = { | ||
| [key in keyof CompTokenMap]: Partial<CompTokenMap[key]> & Partial<AliasToken>; | ||
| }; | ||
|
|
||
| export type ComponentToken<CompTokenMap extends TokenMap, C extends TokenMapKey<CompTokenMap>> = Exclude<OverrideTokenMap<CompTokenMap>[C], undefined>; | ||
| export type GlobalTokenWithComponent< | ||
| CompTokenMap extends TokenMap, | ||
| AliasToken extends TokenType, | ||
| C extends TokenMapKey<CompTokenMap> | ||
| > = GlobalToken<CompTokenMap, AliasToken> & CompTokenMap[C]; | ||
|
|
||
| export type ComponentTokenKey<CompTokenMap extends TokenMap, C extends TokenMapKey<CompTokenMap>> = keyof ComponentToken<CompTokenMap, C>; | ||
| export type ComponentToken< | ||
| CompTokenMap extends TokenMap, | ||
| AliasToken extends TokenType, | ||
| C extends TokenMapKey<CompTokenMap> | ||
| > = Exclude<OverrideTokenMap<CompTokenMap, AliasToken>[C], undefined>; | ||
|
|
||
| export type ComponentTokenKey< | ||
| CompTokenMap extends TokenMap, | ||
| AliasToken extends TokenType, | ||
| C extends TokenMapKey<CompTokenMap>, | ||
| > = keyof ComponentToken<CompTokenMap, AliasToken, C>; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,19 @@ | ||
| import type { TokenType } from '@ant-design/cssinjs'; | ||
| import { merge as mergeToken } from './statistic'; | ||
| import type { GetDefaultToken, GetDefaultTokenFn } from './genStyleUtils'; | ||
| import type { OverrideTokenMap, TokenMap, TokenMapKey } from '../interface'; | ||
| import type { GlobalToken, TokenMap, TokenMapKey } from '../interface'; | ||
|
|
||
| export default function getDefaultComponentToken<CompTokenMap extends TokenMap, C extends TokenMapKey<CompTokenMap>>( | ||
| export default function getDefaultComponentToken< | ||
| CompTokenMap extends TokenMap, | ||
| AliasToken extends TokenType, | ||
| C extends TokenMapKey<CompTokenMap> | ||
| >( | ||
| component: C, | ||
| token: OverrideTokenMap<CompTokenMap>, | ||
| getDefaultToken: GetDefaultToken<CompTokenMap, C>, | ||
| token: GlobalToken<CompTokenMap, AliasToken>, | ||
| getDefaultToken: GetDefaultToken<CompTokenMap, AliasToken, C>, | ||
| ): any { | ||
| if (typeof getDefaultToken === 'function') { | ||
| return (getDefaultToken as GetDefaultTokenFn<CompTokenMap, C>)(mergeToken<any>(token, token[component] ?? {})); | ||
| return (getDefaultToken as GetDefaultTokenFn<CompTokenMap, AliasToken, C>)(mergeToken<any>(token, token[component] ?? {})); | ||
| } | ||
| return getDefaultToken ?? {}; | ||
| }; |
Oops, something went wrong.