Skip to content

Commit

Permalink
chore: code format
Browse files Browse the repository at this point in the history
  • Loading branch information
li-jia-nan committed Jul 28, 2024
1 parent 0bcf3e3 commit dd78e80
Show file tree
Hide file tree
Showing 19 changed files with 257 additions and 316 deletions.
2 changes: 0 additions & 2 deletions .dumirc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,3 @@ export default defineConfig({
logo: 'https://avatars0.githubusercontent.com/u/9441414?s=200&v=4',
},
});


1 change: 1 addition & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"semi": true,
"singleQuote": true,
"tabWidth": 2,
"printWidth": 100,
"trailingComma": "all",
"jsxSingleQuote": false
}
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ hero:
description: A cssinjs util library to support Ant Design (antd) and its ecosystem libraries.
---

<embed src="../README.md"></embed>
<embed src="../README.md"></embed>
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"rc-test": "^7.0.13",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"prettier": "^3.3.3",
"regenerator-runtime": "^0.14.0",
"typescript": "^5.1.6"
},
Expand Down
11 changes: 7 additions & 4 deletions src/hooks/useToken.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@ export type TokenMapWithTheme<
AliasToken extends TokenType,
DesignToken extends TokenType,
> = {
[key in keyof OverrideTokenMap<CompTokenMap, AliasToken>]?: OverrideTokenMap<CompTokenMap, AliasToken>[key] & {
theme?: Theme<DesignToken, AliasToken>;
};
[key in keyof OverrideTokenMap<CompTokenMap, AliasToken>]?: OverrideTokenMap<
CompTokenMap,
AliasToken
>[key] & {
theme?: Theme<DesignToken, AliasToken>;
};
};

export interface UseTokenReturn<
CompTokenMap extends TokenMap,
Expand All @@ -33,4 +36,4 @@ export type UseToken<
CompTokenMap extends TokenMap,
DesignToken extends TokenType,
AliasToken extends TokenType,
> = () => UseTokenReturn<CompTokenMap, DesignToken, AliasToken>;
> = () => UseTokenReturn<CompTokenMap, DesignToken, AliasToken>;
8 changes: 2 additions & 6 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
export { default as genStyleUtils } from './util/genStyleUtils';
export { default as genCalc } from './util/calc';
export {
default as statisticToken,
merge as mergeToken,
statistic,
} from './util/statistic';
export { default as statisticToken, merge as mergeToken, statistic } from './util/statistic';

export type {
OverrideTokenMap,
Expand All @@ -23,4 +19,4 @@ export type {
GenStyleFn,
TokenWithCommonCls,
CSSUtil,
} from './util/genStyleUtils';
} from './util/genStyleUtils';
23 changes: 9 additions & 14 deletions src/interface/components.ts
Original file line number Diff line number Diff line change
@@ -1,35 +1,30 @@
import type { TokenType } from '@ant-design/cssinjs';

export type TokenMap = object;
export type TokenMap = Record<PropertyKey, any>;

export type TokenMapKey<CompTokenMap extends TokenMap> = Extract<keyof CompTokenMap, string>;

export type GlobalToken<
CompTokenMap extends TokenMap,
AliasToken extends TokenType,
> = AliasToken & CompTokenMap;
export type GlobalToken<CompTokenMap extends TokenMap, AliasToken extends TokenType> = AliasToken &
CompTokenMap;

export type OverrideTokenMap<
CompTokenMap extends TokenMap,
AliasToken extends TokenType,
> = {
[key in keyof CompTokenMap]: Partial<CompTokenMap[key]> & Partial<AliasToken>;
};
export type OverrideTokenMap<CompTokenMap extends TokenMap, AliasToken extends TokenType> = {
[key in keyof CompTokenMap]: Partial<CompTokenMap[key]> & Partial<AliasToken>;
};

export type GlobalTokenWithComponent<
CompTokenMap extends TokenMap,
AliasToken extends TokenType,
C extends TokenMapKey<CompTokenMap>
C extends TokenMapKey<CompTokenMap>,
> = GlobalToken<CompTokenMap, AliasToken> & CompTokenMap[C];

export type ComponentToken<
CompTokenMap extends TokenMap,
AliasToken extends TokenType,
C extends TokenMapKey<CompTokenMap>
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>;
> = keyof ComponentToken<CompTokenMap, AliasToken, C>;
11 changes: 2 additions & 9 deletions src/util/calc/CSSCalculator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ export default class CSSCalculator extends AbstractCalculator {

lowPriority?: boolean;

constructor(
num: number | string | AbstractCalculator,
unitlessCssVar: Set<string>,
) {
constructor(num: number | string | AbstractCalculator, unitlessCssVar: Set<string>) {
super();

const numType = typeof num;
Expand Down Expand Up @@ -93,11 +90,7 @@ export default class CSSCalculator extends AbstractCalculator {
let mergedUnit: boolean = true;
if (typeof cssUnit === 'boolean') {
mergedUnit = cssUnit;
} else if (
Array.from(this.unitlessCssVar).some((cssVar) =>
this.result.includes(cssVar),
)
) {
} else if (Array.from(this.unitlessCssVar).some((cssVar) => this.result.includes(cssVar))) {
mergedUnit = false;
}

Expand Down
4 changes: 3 additions & 1 deletion src/util/calc/NumCalculator.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import AbstractCalculator from './calculator';

export default class NumCalculator extends AbstractCalculator {
class NumCalculator extends AbstractCalculator {
result: number = 0;

constructor(num: number | string | AbstractCalculator) {
Expand Down Expand Up @@ -52,3 +52,5 @@ export default class NumCalculator extends AbstractCalculator {
return this.result;
}
}

export default NumCalculator;
4 changes: 1 addition & 3 deletions src/util/calc/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ import NumCalculator from './NumCalculator';

const genCalc = (type: 'css' | 'js', unitlessCssVar: Set<string>) => {
const Calculator = type === 'css' ? CSSCalculator : NumCalculator;

return (num: number | string | AbstractCalculator) =>
new Calculator(num, unitlessCssVar);
return (num: number | string | AbstractCalculator) => new Calculator(num, unitlessCssVar);
};

export default genCalc;
Loading

0 comments on commit dd78e80

Please sign in to comment.