Skip to content

Commit 59ac605

Browse files
authored
chore: improve TS definition syntax (#26)
1 parent 087f12c commit 59ac605

File tree

1 file changed

+6
-18
lines changed

1 file changed

+6
-18
lines changed

src/util/genStyleUtils.tsx

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,7 @@ export type GetCompUnitless<CompTokenMap extends TokenMap, AliasToken extends To
9797
C extends TokenMapKey<CompTokenMap>,
9898
>(
9999
component: C | [C, string],
100-
) => {
101-
[key in ComponentTokenKey<CompTokenMap, AliasToken, C>]: boolean;
102-
};
100+
) => Partial<Record<ComponentTokenKey<CompTokenMap, AliasToken, C>, boolean>>;
103101

104102
function genStyleUtils<
105103
CompTokenMap extends TokenMap,
@@ -143,9 +141,7 @@ function genStyleUtils<
143141
/**
144142
* Component tokens that do not need unit.
145143
*/
146-
unitless?: {
147-
[key in ComponentTokenKey<CompTokenMap, AliasToken, C>]: boolean;
148-
};
144+
unitless?: Partial<Record<ComponentTokenKey<CompTokenMap, AliasToken, C>, boolean>>;
149145
/**
150146
* Only use component style in client side. Ignore in SSR.
151147
*/
@@ -207,12 +203,8 @@ function genStyleUtils<
207203
component: C,
208204
getDefaultToken: GetDefaultToken<CompTokenMap, AliasToken, C> | undefined,
209205
options: {
210-
unitless?: {
211-
[key in ComponentTokenKey<CompTokenMap, AliasToken, C>]: boolean;
212-
};
213-
ignore?: {
214-
[key in keyof AliasToken]?: boolean;
215-
};
206+
unitless?: Partial<Record<ComponentTokenKey<CompTokenMap, AliasToken, C>, boolean>>;
207+
ignore?: Partial<Record<keyof AliasToken, boolean>>
216208
deprecatedTokens?: [
217209
ComponentTokenKey<CompTokenMap, AliasToken, C>,
218210
ComponentTokenKey<CompTokenMap, AliasToken, C>,
@@ -300,9 +292,7 @@ function genStyleUtils<
300292
*/
301293
order?: number;
302294
injectStyle?: boolean;
303-
unitless?: {
304-
[key in ComponentTokenKey<CompTokenMap, AliasToken, C>]: boolean;
305-
};
295+
unitless?: Partial<Record<ComponentTokenKey<CompTokenMap, AliasToken, C>, boolean>>;
306296
} = {},
307297
) {
308298
const cells = (
@@ -448,9 +438,7 @@ function genStyleUtils<
448438
*/
449439
order?: number;
450440
injectStyle?: boolean;
451-
unitless?: {
452-
[key in ComponentTokenKey<CompTokenMap, AliasToken, C>]: boolean;
453-
};
441+
unitless?: Partial<Record<ComponentTokenKey<CompTokenMap, AliasToken, C>, boolean>>;
454442
} = {},
455443
) {
456444
const useStyle = genComponentStyleHook(componentName, styleFn, getDefaultToken, {

0 commit comments

Comments
 (0)