From 01380eeb48bc2cad9a46b14b326f7f14a21fe30b Mon Sep 17 00:00:00 2001
From: arvinxx <arvinx@foxmail.com>
Date: Tue, 17 Jan 2023 20:03:16 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20fix:=20=E4=BF=AE=E6=AD=A3=20message?=
 =?UTF-8?q?=E3=80=81notification=20=E7=BB=84=E4=BB=B6=20prefix=20=E4=B8=8D?=
 =?UTF-8?q?=E5=AF=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/containers/ThemeProvider/AntdProvider.tsx | 14 ++++++--------
 tests/containers/ThemeProvider.test.tsx       |  6 +++---
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/containers/ThemeProvider/AntdProvider.tsx b/src/containers/ThemeProvider/AntdProvider.tsx
index 191731ab..f108eac9 100644
--- 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
index 5f7ebd6c..cf781048 100644
--- 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);
   });
 });