🐛 fix: 修复窗口特殊情况下不停 Shaking 的问题 (#252)

ant-design · Jun 18, 2024 · 854432d · 854432d
1 parent 5ff3b89
commit 854432d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/ProChat/__test__/index.test.tsx b/src/ProChat/__test__/index.test.tsx
@@ -1,5 +1,6 @@
 import { gLocaleObject } from '@/locale';
 import { fireEvent, render, waitFor } from '@testing-library/react';
+import { describe, it, vi } from 'vitest';
 import { ProChat } from '..';
 
 describe('ProChat', () => {

diff --git a/src/ProChat/container/App.tsx b/src/ProChat/container/App.tsx
@@ -120,7 +120,12 @@ const App = memo<ConversationProps>(
     return (
       <RcResizeObserver
         onResize={(e) => {
-          if (e.height !== height) {
+          if (
+            typeof height !== typeof e.height ||
+            (typeof height === 'string' && typeof e.height === 'string' && e.height !== height) ||
+            (typeof height === 'number' && Math.abs(e.height - height) > 1)
+          ) {
+            // stop shaking
             setHeight(e.height);
           }
         }}

diff --git a/src/ProChat/store/reducers/message.test.ts b/src/ProChat/store/reducers/message.test.ts
@@ -45,9 +45,9 @@ describe('messagesReducer', () => {
       expect(newState.find((m) => m.id === 'message3')).toEqual({
         id: 'message3',
         content: 'New Message',
+        message: 'New Message',
         createAt: expect.any(Number),
         updateAt: expect.any(Number),
-        parentId: undefined,
         role: 'user',
       });
     });
@@ -72,9 +72,9 @@ describe('messagesReducer', () => {
       expect(newState.find((m) => m.id === 'customId')).toEqual({
         id: 'customId',
         content: 'New Message',
+        message: 'New Message',
         createAt: expect.any(Number),
         updateAt: expect.any(Number),
-        parentId: undefined,
         role: 'user',
       });
     });
@@ -93,6 +93,7 @@ describe('messagesReducer', () => {
       expect(newState.find((m) => m.id === 'message3')).toEqual({
         id: 'message3',
         content: 'New Message',
+        message: 'New Message',
         createAt: expect.any(Number),
         updateAt: expect.any(Number),
         role: 'user',
@@ -114,6 +115,7 @@ describe('messagesReducer', () => {
       expect(newState.find((m) => m.id === 'message3')).toEqual({
         id: 'message3',
         content: 'New Message',
+        message: 'New Message',
         createAt: expect.any(Number),
         updateAt: expect.any(Number),
         role: 'user',