From d31b47e155e789c2cb2a44555616aa429fd9de09 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Tue, 28 Mar 2023 09:19:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=90=9C=E7=B4=A2=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E5=88=97=E8=A1=A8=E7=9A=84=E6=98=BE=E7=A4=BA=E6=97=B6?=
 =?UTF-8?q?=E6=9C=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md                      |  1 +
 src/screens/Home/Views/Search/TipList.tsx |  1 -
 src/screens/Home/Views/Search/index.tsx   | 17 +++++++++++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index f31245de..2ef4a5e3 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -10,3 +10,4 @@
 ### 修复
 
 - 修复歌单排序列表滚动重置问题
+- 修复搜索提示列表的显示时机问题
diff --git a/src/screens/Home/Views/Search/TipList.tsx b/src/screens/Home/Views/Search/TipList.tsx
index 23848573..c4b75daf 100644
--- a/src/screens/Home/Views/Search/TipList.tsx
+++ b/src/screens/Home/Views/Search/TipList.tsx
@@ -46,7 +46,6 @@ export default forwardRef<TipListType, TipListProps>(({ onSearch }, ref) => {
     searchTipListRef.current?.setHeight(height)
     setSearchText(keyword)
     if (keyword) {
-      visibleListRef.current = true
       setTipListInfo(keyword, searchState.temp_source)
       debounceTipSearch(keyword, searchState.temp_source, (list) => {
         if (keyword != searchState.tipListInfo.text) return
diff --git a/src/screens/Home/Views/Search/index.tsx b/src/screens/Home/Views/Search/index.tsx
index 19e8e48f..de0ac6e1 100644
--- a/src/screens/Home/Views/Search/index.tsx
+++ b/src/screens/Home/Views/Search/index.tsx
@@ -28,6 +28,7 @@ export default () => {
   const listRef = useRef<ListType>(null)
   const layoutHeightRef = useRef<number>(0)
   const searchInfo = useRef<SearchInfo>({ temp_source: 'kw', source: 'kw', searchType: 'music' })
+  const timeoutRef = useRef<NodeJS.Timeout | null>(null)
 
   useEffect(() => {
     void getSearchSetting().then(info => {
@@ -74,16 +75,24 @@ export default () => {
       searchTipListRef.current?.search(text, layoutHeightRef.current)
     }, 500)
   }
-  const handleSearch: HeaderBarProps['onSearch'] = (text) => {
-    searchTipListRef.current?.search(text, layoutHeightRef.current)
+  const handleHideTipList = () => {
+    if (timeoutRef.current) {
+      clearTimeout(timeoutRef.current)
+      timeoutRef.current = null
+    }
     searchTipListRef.current?.hide()
+  }
+  const handleSearch: HeaderBarProps['onSearch'] = (text) => {
+    handleHideTipList()
+    searchTipListRef.current?.search(text, layoutHeightRef.current)
     headerBarRef.current?.setText(text)
     headerBarRef.current?.blur()
     void addHistoryWord(text)
     listRef.current?.loadList(text, searchInfo.current.source, searchInfo.current.searchType)
   }
   const handleShowTipList: HeaderBarProps['onShowTipList'] = () => {
-    setTimeout(() => {
+    if (timeoutRef.current) clearTimeout(timeoutRef.current)
+    timeoutRef.current = setTimeout(() => {
       searchTipListRef.current?.show(layoutHeightRef.current)
     }, 500)
   }
@@ -95,7 +104,7 @@ export default () => {
         onSourceChange={handleSourceChange}
         onTempSearch={handleTempSearch}
         onSearch={handleSearch}
-        onHideTipList={() => searchTipListRef.current?.hide()}
+        onHideTipList={handleHideTipList}
         onShowTipList={handleShowTipList}
       />
       <View style={styles.content} onLayout={handleLayout}>