Skip to content

Commit 0063d36

Browse files
li-jia-nanli-jia-nan
authored
type: typeScript definition improvement (ant-design#57020)
1 parent 60285bd commit 0063d36

35 files changed

Lines changed: 98 additions & 79 deletions

File tree

‎components/button/style/group.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import type { CSSObject } from '@ant-design/cssinjs';
2+
13
import type { GenerateStyle } from '../../theme/internal';
24
import type { ButtonToken } from './token';
35

@@ -22,7 +24,7 @@ const genButtonBorderStyle = (buttonTypeCls: string, borderColor: string) => ({
2224
},
2325
});
2426

25-
const genGroupStyle: GenerateStyle<ButtonToken> = (token) => {
27+
const genGroupStyle: GenerateStyle<ButtonToken, CSSObject> = (token) => {
2628
const { componentCls, fontSize, lineWidth, groupBorderColor, colorErrorHover } = token;
2729

2830
return {

‎components/card/style/index.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ interface CardToken extends FullToken<'Card'> {
9999
// ============================== Styles ==============================
100100

101101
// ============================== Head ==============================
102-
const genCardHeadStyle: GenerateStyle<CardToken> = (token): CSSObject => {
102+
const genCardHeadStyle: GenerateStyle<CardToken, CSSObject> = (token) => {
103103
const { antCls, componentCls, headerHeight, headerPadding, tabsMarginBottom } = token;
104104

105105
return {
@@ -154,7 +154,7 @@ const genCardHeadStyle: GenerateStyle<CardToken> = (token): CSSObject => {
154154
};
155155

156156
// ============================== Grid ==============================
157-
const genCardGridStyle: GenerateStyle<CardToken> = (token): CSSObject => {
157+
const genCardGridStyle: GenerateStyle<CardToken, CSSObject> = (token) => {
158158
const { cardPaddingBase, colorBorderSecondary, cardShadow, lineWidth } = token;
159159
return {
160160
width: '33.33%',
@@ -179,7 +179,7 @@ const genCardGridStyle: GenerateStyle<CardToken> = (token): CSSObject => {
179179
};
180180

181181
// ============================== Actions ==============================
182-
const genCardActionsStyle: GenerateStyle<CardToken> = (token): CSSObject => {
182+
const genCardActionsStyle: GenerateStyle<CardToken, CSSObject> = (token) => {
183183
const {
184184
componentCls,
185185
iconCls,
@@ -242,7 +242,7 @@ const genCardActionsStyle: GenerateStyle<CardToken> = (token): CSSObject => {
242242
};
243243

244244
// ============================== Meta ==============================
245-
const genCardMetaStyle: GenerateStyle<CardToken> = (token): CSSObject => ({
245+
const genCardMetaStyle: GenerateStyle<CardToken, CSSObject> = (token) => ({
246246
margin: `${unit(token.calc(token.marginXXS).mul(-1).equal())} 0`,
247247
display: 'flex',
248248
...clearFix(),
@@ -273,7 +273,7 @@ const genCardMetaStyle: GenerateStyle<CardToken> = (token): CSSObject => ({
273273
});
274274

275275
// ============================== Inner ==============================
276-
const genCardTypeInnerStyle: GenerateStyle<CardToken> = (token): CSSObject => {
276+
const genCardTypeInnerStyle: GenerateStyle<CardToken, CSSObject> = (token) => {
277277
const { componentCls, colorFillAlter, headerPadding, bodyPadding } = token;
278278

279279
return {
@@ -293,7 +293,7 @@ const genCardTypeInnerStyle: GenerateStyle<CardToken> = (token): CSSObject => {
293293
};
294294

295295
// ============================== Loading ==============================
296-
const genCardLoadingStyle: GenerateStyle<CardToken> = (token): CSSObject => {
296+
const genCardLoadingStyle: GenerateStyle<CardToken, CSSObject> = (token) => {
297297
const { componentCls } = token;
298298

299299
return {
@@ -306,7 +306,7 @@ const genCardLoadingStyle: GenerateStyle<CardToken> = (token): CSSObject => {
306306
};
307307

308308
// ============================== Basic ==============================
309-
const genCardStyle: GenerateStyle<CardToken> = (token): CSSObject => {
309+
const genCardStyle: GenerateStyle<CardToken, CSSObject> = (token) => {
310310
const {
311311
componentCls,
312312
cardShadow,
@@ -430,7 +430,7 @@ const genCardStyle: GenerateStyle<CardToken> = (token): CSSObject => {
430430
};
431431

432432
// ============================== Size ==============================
433-
const genCardSizeStyle: GenerateStyle<CardToken> = (token): CSSObject => {
433+
const genCardSizeStyle: GenerateStyle<CardToken, CSSObject> = (token) => {
434434
const { componentCls, bodyPaddingSM, headerPaddingSM, headerHeightSM, headerFontSizeSM } = token;
435435

436436
return {

‎components/carousel/style/index.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ const genCarouselStyle: GenerateStyle<CarouselToken, CSSObject> = (token) => {
153153
};
154154
};
155155

156-
const genArrowsStyle: GenerateStyle<CarouselToken> = (token) => {
156+
const genArrowsStyle: GenerateStyle<CarouselToken, CSSObject> = (token) => {
157157
const { componentCls, motionDurationSlow, arrowSize, arrowOffset } = token;
158158
const arrowLength = token.calc(arrowSize).div(Math.SQRT2).equal();
159159

@@ -221,7 +221,7 @@ const genArrowsStyle: GenerateStyle<CarouselToken> = (token) => {
221221
};
222222
};
223223

224-
const genDotsStyle: GenerateStyle<CarouselToken> = (token) => {
224+
const genDotsStyle: GenerateStyle<CarouselToken, CSSObject> = (token) => {
225225
const {
226226
componentCls,
227227
dotOffset,
@@ -344,7 +344,7 @@ const genDotsStyle: GenerateStyle<CarouselToken> = (token) => {
344344
};
345345
};
346346

347-
const genCarouselVerticalStyle: GenerateStyle<CarouselToken> = (token) => {
347+
const genCarouselVerticalStyle: GenerateStyle<CarouselToken, CSSObject> = (token) => {
348348
const { componentCls, dotOffset, arrowOffset, marginXXS } = token;
349349

350350
const animation = new Keyframes(`${token.prefixCls}-dot-vertical-animation`, {
@@ -356,7 +356,7 @@ const genCarouselVerticalStyle: GenerateStyle<CarouselToken> = (token) => {
356356
},
357357
});
358358

359-
const reverseSizeOfDot = {
359+
const reverseSizeOfDot: CSSObject = {
360360
width: token.dotHeight,
361361
height: token.dotWidth,
362362
};

‎components/drawer/style/index.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import type { CSSObject } from '@ant-design/cssinjs';
12
import { unit } from '@ant-design/cssinjs';
23

34
import { genFocusStyle } from '../../style';
@@ -31,7 +32,7 @@ export interface ComponentToken {
3132
export interface DrawerToken extends FullToken<'Drawer'> {}
3233

3334
// =============================== Base ===============================
34-
const genDrawerStyle: GenerateStyle<DrawerToken> = (token) => {
35+
const genDrawerStyle: GenerateStyle<DrawerToken, CSSObject> = (token) => {
3536
const {
3637
borderRadiusSM,
3738
componentCls,

‎components/drawer/style/motion.ts‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import type { CSSObject } from '@ant-design/cssinjs';
2+
13
import type { DrawerToken } from '.';
24
import type { GenerateStyle } from '../../theme/internal';
35

@@ -55,20 +57,20 @@ const getPanelMotionStyles = (direction: Direction, duration: string) => [
5557
),
5658
];
5759

58-
const genMotionStyle: GenerateStyle<DrawerToken> = (token) => {
60+
const genMotionStyle: GenerateStyle<DrawerToken, CSSObject> = (token) => {
5961
const { componentCls, motionDurationSlow } = token;
60-
6162
return {
6263
[componentCls]: {
6364
// ======================== Mask ========================
6465
[`${componentCls}-mask-motion`]: getFadeStyle(0, motionDurationSlow),
65-
6666
// ======================= Panel ========================
6767
[`${componentCls}-panel-motion`]: ['left', 'right', 'top', 'bottom'].reduce(
68-
(obj, direction) => ({
69-
...obj,
70-
[`&-${direction}`]: getPanelMotionStyles(direction as Direction, motionDurationSlow),
71-
}),
68+
(obj, direction) => {
69+
return {
70+
...obj,
71+
[`&-${direction}`]: getPanelMotionStyles(direction as Direction, motionDurationSlow),
72+
};
73+
},
7274
{},
7375
),
7476
},

‎components/empty/style/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ interface EmptyToken extends FullToken<'Empty'> {
3535
}
3636

3737
// ============================== Shared ==============================
38-
const genSharedEmptyStyle: GenerateStyle<EmptyToken> = (token): CSSObject => {
38+
const genSharedEmptyStyle: GenerateStyle<EmptyToken, CSSObject> = (token) => {
3939
const { componentCls, margin, marginXS, marginXL, fontSize, lineHeight } = token;
4040

4141
return {

‎components/flex/style/index.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { CSSInterpolation } from '@ant-design/cssinjs';
1+
import type { CSSInterpolation, CSSObject } from '@ant-design/cssinjs';
22

33
import type { FullToken, GenerateStyle, GetDefaultToken } from '../../theme/internal';
44
import { genStyleHooks, mergeToken } from '../../theme/internal';
@@ -32,7 +32,7 @@ export interface FlexToken extends FullToken<'Flex'> {
3232
flexGapLG: number;
3333
}
3434

35-
const genFlexStyle: GenerateStyle<FlexToken> = (token) => {
35+
const genFlexStyle: GenerateStyle<FlexToken, CSSObject> = (token) => {
3636
const { componentCls } = token;
3737
return {
3838
[componentCls]: {
@@ -52,7 +52,7 @@ const genFlexStyle: GenerateStyle<FlexToken> = (token) => {
5252
};
5353
};
5454

55-
const genFlexGapStyle: GenerateStyle<FlexToken> = (token) => {
55+
const genFlexGapStyle: GenerateStyle<FlexToken, CSSObject> = (token) => {
5656
const { componentCls } = token;
5757
return {
5858
[componentCls]: {
@@ -69,7 +69,7 @@ const genFlexGapStyle: GenerateStyle<FlexToken> = (token) => {
6969
};
7070
};
7171

72-
const genFlexWrapStyle: GenerateStyle<FlexToken> = (token) => {
72+
const genFlexWrapStyle: GenerateStyle<FlexToken, CSSObject> = (token) => {
7373
const { componentCls } = token;
7474
const wrapStyle: CSSInterpolation = {};
7575
flexWrapValues.forEach((value) => {
@@ -78,7 +78,7 @@ const genFlexWrapStyle: GenerateStyle<FlexToken> = (token) => {
7878
return wrapStyle;
7979
};
8080

81-
const genAlignItemsStyle: GenerateStyle<FlexToken> = (token) => {
81+
const genAlignItemsStyle: GenerateStyle<FlexToken, CSSObject> = (token) => {
8282
const { componentCls } = token;
8383
const alignStyle: CSSInterpolation = {};
8484
alignItemsValues.forEach((value) => {
@@ -87,7 +87,7 @@ const genAlignItemsStyle: GenerateStyle<FlexToken> = (token) => {
8787
return alignStyle;
8888
};
8989

90-
const genJustifyContentStyle: GenerateStyle<FlexToken> = (token) => {
90+
const genJustifyContentStyle: GenerateStyle<FlexToken, CSSObject> = (token) => {
9191
const { componentCls } = token;
9292
const justifyStyle: CSSInterpolation = {};
9393
justifyContentValues.forEach((value) => {

‎components/form/style/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ const makeVerticalLayout: GenerateStyle<FormToken, CSSObject> = (token) => {
533533
};
534534
};
535535

536-
const genVerticalStyle: GenerateStyle<FormToken> = (token) => {
536+
const genVerticalStyle: GenerateStyle<FormToken, CSSObject> = (token) => {
537537
const { componentCls, formItemCls, antCls } = token;
538538

539539
return {

‎components/input/style/textarea.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import type { CSSObject } from '@ant-design/cssinjs';
2+
13
import type { GenerateStyle } from '../../theme/internal';
24
import { genStyleHooks, mergeToken } from '../../theme/internal';
35
import type { ComponentToken, InputToken } from './token';
@@ -6,7 +8,7 @@ import { initComponentToken, initInputToken } from './token';
68
export type { ComponentToken };
79
export { initComponentToken, initInputToken };
810

9-
const genTextAreaStyle: GenerateStyle<InputToken> = (token) => {
11+
const genTextAreaStyle: GenerateStyle<InputToken, CSSObject> = (token) => {
1012
const { componentCls, paddingLG } = token;
1113
const textareaPrefixCls = `${componentCls}-textarea`;
1214

‎components/mentions/style/index.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import type { CSSObject } from '@ant-design/cssinjs';
12
import { unit } from '@ant-design/cssinjs';
23

34
import {
@@ -51,7 +52,7 @@ type MentionsToken = FullToken<'Mentions'> &
5152
};
5253

5354
// ============================= Mentions =============================
54-
const genDropdownStyle: GenerateStyle<MentionsToken> = (token) => {
55+
const genDropdownStyle: GenerateStyle<MentionsToken, CSSObject> = (token) => {
5556
const {
5657
componentCls,
5758
fontSize,
@@ -144,7 +145,7 @@ const genDropdownStyle: GenerateStyle<MentionsToken> = (token) => {
144145
};
145146
};
146147

147-
const genMentionsStyle: GenerateStyle<MentionsToken> = (token) => {
148+
const genMentionsStyle: GenerateStyle<MentionsToken, CSSObject> = (token) => {
148149
const { componentCls, colorText, antCls, colorTextDisabled, calc } = token;
149150
const [varName, varRef] = genCssVar(antCls, 'cmp-mentions');
150151
return {

0 commit comments

Comments
 (0)