fix: fixed Partial<AliasToken & CompTokenMap> instead of `CompToken…

…Map` for `GetResetStyles`
ant-design · Jul 16, 2024 · f1b541c · f1b541c
1 parent ba4f578
commit f1b541c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/hooks/useToken.ts b/src/hooks/useToken.ts
@@ -17,8 +17,8 @@ export interface UseTokenReturn<
   DesignToken extends TokenType,
   AliasToken extends TokenType,
 > {
-  token: OverrideTokenMap<CompTokenMap>;
-  realToken?: OverrideTokenMap<CompTokenMap>;
+  token: Partial<AliasToken & CompTokenMap>;
+  realToken?: Partial<AliasToken & CompTokenMap>;
   /** Just merge `token` & `override` at top to save perf */
   override: { override: OverrideTokenMap<CompTokenMap> };
   theme?: Theme<DesignToken, AliasToken>;

diff --git a/src/util/genStyleUtils.tsx b/src/util/genStyleUtils.tsx
@@ -93,7 +93,10 @@ export type CSSVarRegisterProps = {
   };
 };
 
-export type GetResetStyles<AliasToken extends TokenType> = (token: AliasToken) => CSSInterpolation;
+export type GetResetStyles<
+  CompTokenMap extends TokenMap,
+  AliasToken extends TokenType,
+> = (token: Partial<AliasToken & CompTokenMap>) => CSSInterpolation;
 
 export default function genStyleUtils<
   CompTokenMap extends TokenMap,
@@ -104,7 +107,7 @@ export default function genStyleUtils<
     usePrefix: UsePrefix;
     useToken: UseToken<CompTokenMap, DesignToken, AliasToken>;
     useCSP?: UseCSP;
-    getResetStyles?: GetResetStyles<AliasToken>,
+    getResetStyles?: GetResetStyles<CompTokenMap, AliasToken>,
   }
 ) {
   // Dependency inversion for preparing basic config.