Skip to content

Commit 13a5d6e

Browse files
committed
chore: delete AnyObject and use Object instead
1 parent ece47aa commit 13a5d6e

File tree

8 files changed

+26
-34
lines changed

8 files changed

+26
-34
lines changed

src/_util/type.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/context/configProvider.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React from 'react';
2-
import type { AnyObject } from '../_util/type';
32

4-
export interface DefaultConfigConsumerProps extends AnyObject {
3+
export interface DefaultConfigConsumerProps extends Object {
54
getPrefixCls?: (suffixCls?: string, customizePrefixCls?: string) => string;
65
iconPrefixCls?: string;
76
csp?: CSPConfig;

src/context/themeProvider.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import type { Theme } from '@ant-design/cssinjs';
33

44
import defaultSeedToken from '../themes/seed';
55

6-
import type { AnyObject } from '../_util/type';
76
import type { AliasToken, OverrideToken, MapToken, SeedToken, GlobalToken } from '../interface';
87

98
export const unitless: {
@@ -41,13 +40,13 @@ export const ignore: {
4140
motionUnit: true,
4241
};
4342

44-
type ComponentsToken<CompTokenMap extends AnyObject> = {
43+
type ComponentsToken<CompTokenMap extends Object> = {
4544
[key in keyof OverrideToken<CompTokenMap>]?: OverrideToken<CompTokenMap>[key] & {
4645
theme?: Theme<SeedToken, MapToken>;
4746
};
4847
};
4948

50-
export interface DesignTokenProviderProps<CompTokenMap extends AnyObject> {
49+
export interface DesignTokenProviderProps<CompTokenMap extends Object> {
5150
token: GlobalToken<CompTokenMap>;
5251
/** Just merge `token` & `override` at top to save perf */
5352
override: { override: Partial<AliasToken> } & ComponentsToken<CompTokenMap>;
@@ -69,9 +68,9 @@ export const DefaultThemeProviderContextConfig = {
6968
hashed: true,
7069
};
7170

72-
export type GetThemeProviderContext<CompTokenMap extends AnyObject> = () => [React.Context<DesignTokenProviderProps<CompTokenMap>>];
71+
export type GetThemeProviderContext<CompTokenMap extends Object> = () => [React.Context<DesignTokenProviderProps<CompTokenMap>>];
7372

74-
export function useMergedThemeContext<CompTokenMap extends AnyObject> (getThemeProviderContext?: GetThemeProviderContext<CompTokenMap>) {
73+
export function useMergedThemeContext<CompTokenMap extends Object> (getThemeProviderContext?: GetThemeProviderContext<CompTokenMap>) {
7574
const DefaultThemeProviderContext = React.createContext<DesignTokenProviderProps<CompTokenMap>>(
7675
DefaultThemeProviderContextConfig as DesignTokenProviderProps<CompTokenMap>
7776
);

src/interface/components.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import type { AnyObject } from '../_util/type';
21
import type { AliasToken } from './alias';
32

4-
export type OverrideToken<CompTokenMap extends AnyObject> = {
3+
export type OverrideToken<CompTokenMap extends Object> = {
54
[key in keyof CompTokenMap]: Partial<CompTokenMap[key]> & Partial<AliasToken>;
65
};
76

87
/** Final token which contains the components level override */
9-
export type GlobalToken<CompTokenMap extends AnyObject> = AliasToken & CompTokenMap;
8+
export type GlobalToken<CompTokenMap extends Object> = AliasToken & CompTokenMap;

src/interface/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import type { CSSInterpolation, DerivativeFunc } from '@ant-design/cssinjs';
33
import type { AliasToken } from './alias';
44
import type { MapToken } from './maps';
55
import type { SeedToken } from './seeds';
6-
import type { AnyObject } from '../_util/type';
76

87
export type MappingAlgorithm = DerivativeFunc<SeedToken, MapToken>;
98

@@ -37,6 +36,6 @@ export type { SeedToken } from './seeds';
3736
export type UseComponentStyleResult = [(node: React.ReactNode) => React.ReactElement, string];
3837

3938
export type GenerateStyle<
40-
ComponentToken extends AnyObject = AliasToken,
39+
ComponentToken extends Object = AliasToken,
4140
ReturnType = CSSInterpolation,
4241
> = (token: ComponentToken) => ReturnType;

src/util/alias.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1-
import { TinyColor } from '@ant-design/fast-color';
1+
import { FastColor } from '@ant-design/fast-color';
22

33
import type { AliasToken, MapToken, OverrideToken, SeedToken } from '../interface';
44
import seedToken from '../themes/seed';
55
import getAlphaColor from './getAlphaColor';
6-
import type { AnyObject } from '../_util/type';
76

87
/** Raw merge of `@ant-design/cssinjs` token. Which need additional process */
98
// type RawMergedToken = MapToken & { override: Partial<AliasToken> };
10-
type RawMergedToken<CompTokenMap extends AnyObject> = MapToken & OverrideToken<CompTokenMap> & { override: Partial<AliasToken> };
9+
type RawMergedToken<CompTokenMap extends Object> = MapToken & OverrideToken<CompTokenMap> & { override: Partial<AliasToken> };
1110

1211
/**
1312
* Seed (designer) > Derivative (designer) > Alias (developer).
1413
*
1514
* Merge seed & derivative & override token and generate alias token for developer.
1615
*/
17-
export default function formatToken<CompTokenMap extends AnyObject> (derivativeToken: RawMergedToken<CompTokenMap>): AliasToken {
16+
export default function formatToken<CompTokenMap extends Object> (derivativeToken: RawMergedToken<CompTokenMap>): AliasToken {
1817
const { override, ...restToken } = derivativeToken;
1918
const overrideTokens = { ...override };
2019

@@ -169,9 +168,9 @@ export default function formatToken<CompTokenMap extends AnyObject> (derivativeT
169168

170169
boxShadowPopoverArrow: '2px 2px 5px rgba(0, 0, 0, 0.05)',
171170
boxShadowCard: `
172-
0 1px 2px -2px ${new TinyColor('rgba(0, 0, 0, 0.16)').toRgbString()},
173-
0 3px 6px 0 ${new TinyColor('rgba(0, 0, 0, 0.12)').toRgbString()},
174-
0 5px 12px 4px ${new TinyColor('rgba(0, 0, 0, 0.09)').toRgbString()}
171+
0 1px 2px -2px ${new FastColor('rgba(0, 0, 0, 0.16)').toRgbString()},
172+
0 3px 6px 0 ${new FastColor('rgba(0, 0, 0, 0.12)').toRgbString()},
173+
0 5px 12px 4px ${new FastColor('rgba(0, 0, 0, 0.09)').toRgbString()}
175174
`,
176175
boxShadowDrawerRight: `
177176
-6px 0 16px 0 rgba(0, 0, 0, 0.08),

src/util/genStyleUtils.tsx

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,15 @@ import getDefaultComponentToken from './getDefaultComponentToken';
3636
import statisticToken, { merge as mergeToken } from './statistic';
3737

3838
import useUniqueMemo from '../_util/hooks/useUniqueMemo';
39-
import type { AnyObject } from '../_util/type';
4039

4140

42-
export type OverrideComponent<CompTokenMap extends AnyObject> = Extract<keyof CompTokenMap, string>;
41+
export type OverrideComponent<CompTokenMap extends Object> = Extract<keyof CompTokenMap, string>;
4342

44-
export type GlobalTokenWithComponent<CompTokenMap extends AnyObject, C extends OverrideComponent<CompTokenMap>> = GlobalToken<CompTokenMap> &
43+
export type GlobalTokenWithComponent<CompTokenMap extends Object, C extends OverrideComponent<CompTokenMap>> = GlobalToken<CompTokenMap> &
4544
CompTokenMap[C];
4645

47-
export type ComponentToken<CompTokenMap extends AnyObject, C extends OverrideComponent<CompTokenMap>> = Exclude<OverrideToken<CompTokenMap>[C], undefined>;
48-
export type ComponentTokenKey<CompTokenMap extends AnyObject, C extends OverrideComponent<CompTokenMap>> = keyof ComponentToken<CompTokenMap, C>;
46+
export type ComponentToken<CompTokenMap extends Object, C extends OverrideComponent<CompTokenMap>> = Exclude<OverrideToken<CompTokenMap>[C], undefined>;
47+
export type ComponentTokenKey<CompTokenMap extends Object, C extends OverrideComponent<CompTokenMap>> = keyof ComponentToken<CompTokenMap, C>;
4948

5049
export interface StyleInfo {
5150
hashId: string;
@@ -71,21 +70,21 @@ export type TokenWithCommonCls<T> = T & {
7170
antCls: string;
7271
} & CSSUtil;
7372

74-
export type FullToken<CompTokenMap extends AnyObject, C extends OverrideComponent<CompTokenMap>> = TokenWithCommonCls<
73+
export type FullToken<CompTokenMap extends Object, C extends OverrideComponent<CompTokenMap>> = TokenWithCommonCls<
7574
GlobalTokenWithComponent<CompTokenMap, C>
7675
>;
7776

78-
export type GenStyleFn<CompTokenMap extends AnyObject, C extends OverrideComponent<CompTokenMap>> = (
77+
export type GenStyleFn<CompTokenMap extends Object, C extends OverrideComponent<CompTokenMap>> = (
7978
token: FullToken<CompTokenMap, C>,
8079
info: StyleInfo,
8180
) => CSSInterpolation;
8281

8382
export type GetDefaultTokenFn<
84-
CompTokenMap extends AnyObject,
83+
CompTokenMap extends Object,
8584
C extends OverrideComponent<CompTokenMap>
8685
> = (token: AliasToken & Partial<CompTokenMap[C]>) => CompTokenMap[C];
8786

88-
export type GetDefaultToken<CompTokenMap extends AnyObject, C extends OverrideComponent<CompTokenMap>> =
87+
export type GetDefaultToken<CompTokenMap extends Object, C extends OverrideComponent<CompTokenMap>> =
8988
| null
9089
| CompTokenMap[C]
9190
| GetDefaultTokenFn<CompTokenMap, C>
@@ -104,7 +103,7 @@ export type CSSVarRegisterProps = {
104103
};
105104
};
106105

107-
export default function genStyleUtils<CompTokenMap extends AnyObject>(
106+
export default function genStyleUtils<CompTokenMap extends Object>(
108107
getConfigProviderContext?: GetConfigProviderContext,
109108
getThemeProviderContext?: GetThemeProviderContext<CompTokenMap>,
110109
) {
@@ -369,7 +368,7 @@ export default function genStyleUtils<CompTokenMap extends AnyObject>(
369368
)})`;
370369
});
371370
}
372-
const mergedToken = mergeToken(
371+
const mergedToken = mergeToken<any>(
373372
proxyToken,
374373
{
375374
componentCls,

src/util/statistic.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import type { AnyObject } from '../_util/type';
21

32
declare const CSSINJS_STATISTIC: any;
43

@@ -10,7 +9,7 @@ let recording = true;
109
* This function will do as `Object.assign` in production. But will use Object.defineProperty:get to
1110
* pass all value access in development. To support statistic field usage with alias token.
1211
*/
13-
export function merge<T extends AnyObject>(...objs: Partial<T>[]): T {
12+
export function merge<T extends Object>(...objs: Partial<T>[]): T {
1413
/* istanbul ignore next */
1514
if (!enableStatistic) {
1615
return Object.assign({}, ...objs);
@@ -49,7 +48,7 @@ export const _statistic_build_: typeof statistic = {};
4948
function noop() {}
5049

5150
/** Statistic token usage case. Should use `merge` function if you do not want spread record. */
52-
const statisticToken = <T extends AnyObject>(token: T) => {
51+
const statisticToken = <T extends Object>(token: T) => {
5352
let tokenKeys: Set<string> | undefined;
5453
let proxy = token;
5554
let flush: (componentName: string, componentToken: Record<string, string | number>) => void =

0 commit comments

Comments
 (0)