🐛 fix: 修正在添加 ThemeProvider 后 customToken 设定会丢失的问题

ant-design · Feb 19, 2023 · 936e43b · 936e43b
1 parent c51f422
commit 936e43b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/src/factories/createThemeProvider/ThemeSwitcher.tsx b/src/factories/createThemeProvider/ThemeSwitcher.tsx
@@ -9,7 +9,6 @@ let darkThemeMatch: MediaQueryList;
 const matchThemeMode = (mode: ThemeAppearance) =>
   matchMedia && matchMedia(`(prefers-color-scheme: ${mode})`);
 
-// 将适配
 const ThemeObserver: FC<{
   themeMode: ThemeMode;
   setAppearance: (value: ThemeAppearance) => void;

diff --git a/src/factories/createThemeProvider/index.tsx b/src/factories/createThemeProvider/index.tsx
@@ -15,6 +15,7 @@ interface CreateThemeProviderOptions {
   styledConfig?: StyledConfig;
   CustomThemeContext: Context<any>;
   prefixCls?: string;
+  customToken: ThemeProviderProps<any>['customToken'];
 }
 
 export const createThemeProvider = (
@@ -24,7 +25,7 @@ export const createThemeProvider = (
     ({
       children,
 
-      customToken,
+      customToken = option.customToken,
       customStylish,
 
       theme,

diff --git a/src/functions/createInstance.ts b/src/functions/createInstance.ts
@@ -32,7 +32,7 @@ export interface CreateOptions<T> {
   /**
    * 默认的自定义 Token
    */
-  defaultCustomToken?: T;
+  customToken?: T;
   hashPriority?: HashPriority;
 
   ThemeProvider?: Omit<ThemeProviderProps<T>, 'children'>;
@@ -55,7 +55,7 @@ export const createInstance = <T = any>(options: CreateOptions<T>) => {
   // ******* 下面这些都和主题相关，如果做了任何改动，都需要排查一遍 ************* //
 
   const CustomThemeContext = createContext<T>(
-    (options.defaultCustomToken ? options.defaultCustomToken : {}) as T,
+    (options.customToken ? options.customToken : {}) as T,
   );
 
   const styledUseTheme = options.styled?.useTheme as () => Theme;
@@ -79,6 +79,7 @@ export const createInstance = <T = any>(options: CreateOptions<T>) => {
     styledConfig: options.styled,
     CustomThemeContext,
     prefixCls: options.prefixCls,
+    customToken: options.customToken,
   });
 
   // ******** 上面这些都和主题相关，如果做了任何改动，都需要排查一遍 ************ //

diff --git a/tests/functions/createInstance.test.ts b/tests/functions/createInstance.test.ts
@@ -6,7 +6,7 @@ describe('createInstance', () => {
     key: 'xxx',
     prefixCls: 'test',
     speedy: true,
-    defaultCustomToken: {
+    customToken: {
       x: '123',
     },
   });
@@ -26,14 +26,16 @@ describe('createInstance', () => {
 
     expect(result.current.x).toEqual('123');
   });
+  it('包裹 ThemeProvider 时 x 也存在', () => {
+    const { result } = renderHook(instance.useTheme, { wrapper: instance.ThemeProvider });
+
+    expect(result.current.x).toEqual('123');
+  });
 
   it('创建实例时可以不填 key', () => {
     const instance = createInstance({
       prefixCls: 'test',
       speedy: true,
-      defaultCustomToken: {
-        x: '123',
-      },
     });
     expect(instance.styleManager.sheet.key).toEqual('ant-css');
   });