From 28c02ecaf4668fc85b509ac96b1c050e913ebdb9 Mon Sep 17 00:00:00 2001 From: LofiSu Date: Sat, 18 Jan 2025 17:27:57 +0800 Subject: [PATCH 1/2] Fix: Resolve dual scrollbar issue and flickering on initial load --- components/conversations/demo/infinite-load.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/conversations/demo/infinite-load.tsx b/components/conversations/demo/infinite-load.tsx index bea56ed7..f08a37b8 100644 --- a/components/conversations/demo/infinite-load.tsx +++ b/components/conversations/demo/infinite-load.tsx @@ -16,7 +16,7 @@ const App: React.FC = () => { height: 600, background: token.colorBgContainer, borderRadius: token.borderRadius, - overflow: 'scroll', + overflow: 'auto', }; const loadMoreData = () => { @@ -59,6 +59,7 @@ const App: React.FC = () => { } endMessage={It is all, nothing more 🤐} scrollableTarget="scrollableDiv" + style={{ overflow: 'hidden' }} > From 492191f5fdc12d34717cd1043504fb8fc9313f3f Mon Sep 17 00:00:00 2001 From: LofiSu <163713803+LofiSu@users.noreply.github.com> Date: Thu, 23 Jan 2025 06:11:38 +0000 Subject: [PATCH 2/2] fix: add snapshot --- .../__snapshots__/demo-extend.test.ts.snap | 9 +- .../__snapshots__/demo.test.tsx.snap | 11 +- .../__snapshots__/demo-extend.test.ts.snap | 92 +++++++------- .../__tests__/__snapshots__/demo.test.ts.snap | 92 +++++++------- .../__snapshots__/demo-extend.test.ts.snap | 4 +- .../__tests__/__snapshots__/demo.test.ts.snap | 4 +- .../__snapshots__/index.test.tsx.snap | 118 +++++++++--------- .../__snapshots__/demo-extend.test.ts.snap | 3 + .../__tests__/__snapshots__/demo.test.ts.snap | 3 + 9 files changed, 172 insertions(+), 164 deletions(-) diff --git a/components/attachments/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/attachments/__tests__/__snapshots__/demo-extend.test.ts.snap index 0e2bf99e..c332827d 100644 --- a/components/attachments/__tests__/__snapshots__/demo-extend.test.ts.snap +++ b/components/attachments/__tests__/__snapshots__/demo-extend.test.ts.snap @@ -747,8 +747,9 @@ exports[`renders components/attachments/demo/overflow.tsx extend context correct
Wrap @@ -775,12 +776,12 @@ exports[`renders components/attachments/demo/overflow.tsx extend context correct >
Scroll X @@ -791,12 +792,12 @@ exports[`renders components/attachments/demo/overflow.tsx extend context correct >
Scroll Y diff --git a/components/attachments/__tests__/__snapshots__/demo.test.tsx.snap b/components/attachments/__tests__/__snapshots__/demo.test.tsx.snap index fcd30dba..926721f2 100644 --- a/components/attachments/__tests__/__snapshots__/demo.test.tsx.snap +++ b/components/attachments/__tests__/__snapshots__/demo.test.tsx.snap @@ -677,8 +677,9 @@ Array [
Wrap @@ -705,12 +706,12 @@ Array [ >
Scroll X @@ -721,12 +722,12 @@ Array [ >
Scroll Y @@ -1905,7 +1906,7 @@ Array [ exports[`renders components/attachments/demo/placeholder.tsx correctly 1`] = `
block block block block block block block block block block block block block block block block block block block block block block block block block
@@ -455,7 +455,7 @@ exports[`renders components/bubble/demo/debug.tsx extend context correctly 1`] = class="ant-bubble-content ant-bubble-content-shadow" >
fixed width content
@@ -496,7 +496,7 @@ exports[`renders components/bubble/demo/debug.tsx extend context correctly 1`] = class="ant-bubble-content ant-bubble-content-outlined ant-bubble-content-round" >
block block block block block block block block block block block block block block block block block block block block block block block block block
@@ -509,7 +509,7 @@ exports[`renders components/bubble/demo/debug.tsx extend context correctly 1`] = class="ant-bubble-content ant-bubble-content-shadow" >
fixed width content
@@ -529,7 +529,7 @@ exports[`renders components/bubble/demo/debug.tsx extend context correctly 1`] = class="ant-bubble ant-bubble-start" >
header
@@ -553,7 +553,7 @@ exports[`renders components/bubble/demo/debug.tsx extend context correctly 1`] = string bubble