🐛 fix: 修正 message、notification 组件 prefix 不对的问题

ant-design · Jan 17, 2023 · 01380ee · 01380ee
1 parent 94e569f
commit 01380ee
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/containers/ThemeProvider/AntdProvider.tsx b/src/containers/ThemeProvider/AntdProvider.tsx
@@ -14,14 +14,12 @@ const AntdProvider: FC<AntdProviderProps> = memo(
   ({ children, theme: themeProp, prefixCls, getStaticInstance, staticInstanceConfig }) => {
     const { appearance, isDarkMode } = useThemeMode();
 
-    const [messageInstance, messageContextHolder] = message.useMessage({
-      prefixCls,
-      ...(staticInstanceConfig?.message || {}),
-    });
-    const [notificationInstance, notificationContextHolder] = notification.useNotification({
-      prefixCls,
-      ...(staticInstanceConfig?.notification || {}),
-    });
+    const [messageInstance, messageContextHolder] = message.useMessage(
+      staticInstanceConfig?.message,
+    );
+    const [notificationInstance, notificationContextHolder] = notification.useNotification(
+      staticInstanceConfig?.notification,
+    );
     const [modalInstance, modalContextHolder] = Modal.useModal();
 
     useEffect(() => {

diff --git a/tests/containers/ThemeProvider.test.tsx b/tests/containers/ThemeProvider.test.tsx
@@ -250,6 +250,7 @@ describe('ThemeProvider', () => {
           }}
           staticInstanceConfig={{
             message: {
+              maxCount: 1,
               getContainer: () => document.getElementById('xxx')!,
             },
             notification: {
@@ -270,13 +271,12 @@ describe('ThemeProvider', () => {
       message.success('success');
     });
 
-    expect(container.getElementsByClassName('demo-notice-success')).toHaveLength(1);
+    expect(container.getElementsByClassName('demo-message')).toHaveLength(1);
 
     act(() => {
       notification.warning({ message: '123' });
     });
 
-    expect(container.getElementsByClassName('demo-notice-warning')).toHaveLength(1);
-    expect(container.getElementsByClassName('demo-notice')).toHaveLength(2);
+    expect(container.getElementsByClassName('demo-notification')).toHaveLength(1);
   });
 });