From 5ac3b2c6fb9f04647497a134904828e873a3cabe Mon Sep 17 00:00:00 2001
From: heheer <heheer@sealos.io>
Date: Fri, 14 Mar 2025 14:21:48 +0800
Subject: [PATCH] fix modal close scroll (#4162)

* fix modal close scroll

* update refresh
---
 packages/web/components/common/MyModal/index.tsx            | 1 +
 packages/web/hooks/useLinkedScroll.tsx                      | 6 +++---
 .../chat/ChatQuoteList/CollectionQuoteReader.tsx            | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/web/components/common/MyModal/index.tsx b/packages/web/components/common/MyModal/index.tsx
index e8ee75c26..888d14dd2 100644
--- a/packages/web/components/common/MyModal/index.tsx
+++ b/packages/web/components/common/MyModal/index.tsx
@@ -53,6 +53,7 @@ const MyModal = ({
       allowPinchZoom
       scrollBehavior={'inside'}
       closeOnOverlayClick={closeOnOverlayClick}
+      returnFocusOnClose={false}
     >
       <ModalOverlay />
       <ModalContent
diff --git a/packages/web/hooks/useLinkedScroll.tsx b/packages/web/hooks/useLinkedScroll.tsx
index ee0903aa4..753c9b8ec 100644
--- a/packages/web/hooks/useLinkedScroll.tsx
+++ b/packages/web/hooks/useLinkedScroll.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState, ReactNode, useCallback } from 'react';
+import { useEffect, useRef, useState, ReactNode } from 'react';
 import { LinkedListResponse, LinkedPaginationProps } from '../common/fetch/type';
 import { Box, BoxProps } from '@chakra-ui/react';
 import { useTranslation } from 'next-i18next';
@@ -64,11 +64,11 @@ export function useLinkedScroll<
 
   let scroolSign = useRef(false);
   const { runAsync: loadInitData } = useRequest2(
-    async (scrollWhenFinish = true) => {
+    async (scrollWhenFinish = true, refresh = false) => {
       if (!currentData || isLoading) return;
 
       const item = dataList.find((item) => item._id === currentData.id);
-      if (item) {
+      if (item && !refresh) {
         scrollToItem(item._id);
         return;
       }
diff --git a/projects/app/src/pageComponents/chat/ChatQuoteList/CollectionQuoteReader.tsx b/projects/app/src/pageComponents/chat/ChatQuoteList/CollectionQuoteReader.tsx
index 0e9a3c6f5..7a02944e6 100644
--- a/projects/app/src/pageComponents/chat/ChatQuoteList/CollectionQuoteReader.tsx
+++ b/projects/app/src/pageComponents/chat/ChatQuoteList/CollectionQuoteReader.tsx
@@ -260,7 +260,7 @@ const CollectionReader = ({
                 quoteRefs={itemRefs as React.MutableRefObject<(HTMLDivElement | null)[]>}
                 quoteIndex={item.quoteIndex}
                 setQuoteIndex={setQuoteIndex}
-                refreshList={() => loadInitData(false)}
+                refreshList={() => loadInitData(false, true)}
                 updated={item.updated}
                 isCurrentSelected={item.isCurrentSelected}
                 q={item.q}