mirror of
https://github.com/truewhile/MeBox.git
synced 2026-10-09 06:46:37 +08:00
修复搜索下拉框异步响应导致的意外展开
This commit is contained in:
@@ -114,16 +114,24 @@ function LayoutHeaderSearch() {
|
|||||||
const [loading, setLoading] = useState(false)
|
const [loading, setLoading] = useState(false)
|
||||||
const [results, setResults] = useState<Media[]>([])
|
const [results, setResults] = useState<Media[]>([])
|
||||||
const containerRef = useRef<HTMLDivElement>(null)
|
const containerRef = useRef<HTMLDivElement>(null)
|
||||||
|
const isOpenRef = useRef(false)
|
||||||
// 递增序号守卫:快速连续输入时丢弃过期响应
|
// 递增序号守卫:快速连续输入时丢弃过期响应
|
||||||
const searchSeqRef = useRef(0)
|
const searchSeqRef = useRef(0)
|
||||||
const navigate = useNavigate()
|
const navigate = useNavigate()
|
||||||
|
|
||||||
|
const setSearchOpen = (open: boolean) => {
|
||||||
|
isOpenRef.current = open
|
||||||
|
setIsOpen(open)
|
||||||
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const trimmed = query.trim()
|
const trimmed = query.trim()
|
||||||
if (!trimmed) {
|
if (!trimmed) {
|
||||||
searchSeqRef.current += 1
|
searchSeqRef.current += 1
|
||||||
setResults([])
|
setResults([])
|
||||||
setLoading(false)
|
setLoading(false)
|
||||||
|
isOpenRef.current = false
|
||||||
|
setIsOpen(false)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -134,7 +142,7 @@ function LayoutHeaderSearch() {
|
|||||||
const res = await mediaAPI.search(trimmed, 8)
|
const res = await mediaAPI.search(trimmed, 8)
|
||||||
if (seq !== searchSeqRef.current) return
|
if (seq !== searchSeqRef.current) return
|
||||||
setResults(res.items || [])
|
setResults(res.items || [])
|
||||||
setIsOpen(true)
|
if (isOpenRef.current) setIsOpen(true)
|
||||||
} catch {
|
} catch {
|
||||||
// 请求失败时保留旧结果,避免网络抖动清空下拉
|
// 请求失败时保留旧结果,避免网络抖动清空下拉
|
||||||
} finally {
|
} finally {
|
||||||
@@ -148,6 +156,7 @@ function LayoutHeaderSearch() {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
function handleClickOutside(e: MouseEvent) {
|
function handleClickOutside(e: MouseEvent) {
|
||||||
if (containerRef.current && !containerRef.current.contains(e.target as Node)) {
|
if (containerRef.current && !containerRef.current.contains(e.target as Node)) {
|
||||||
|
isOpenRef.current = false
|
||||||
setIsOpen(false)
|
setIsOpen(false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -156,14 +165,14 @@ function LayoutHeaderSearch() {
|
|||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
const handleSelect = (item: Media) => {
|
const handleSelect = (item: Media) => {
|
||||||
setIsOpen(false)
|
setSearchOpen(false)
|
||||||
setQuery('')
|
setQuery('')
|
||||||
navigate(favouriteMediaLink(item))
|
navigate(favouriteMediaLink(item))
|
||||||
}
|
}
|
||||||
|
|
||||||
const handleKeyDown = (e: React.KeyboardEvent) => {
|
const handleKeyDown = (e: React.KeyboardEvent) => {
|
||||||
if (e.key === 'Escape') {
|
if (e.key === 'Escape') {
|
||||||
setIsOpen(false)
|
setSearchOpen(false)
|
||||||
} else if (e.key === 'Enter' && results.length > 0) {
|
} else if (e.key === 'Enter' && results.length > 0) {
|
||||||
handleSelect(results[0])
|
handleSelect(results[0])
|
||||||
}
|
}
|
||||||
@@ -180,11 +189,12 @@ function LayoutHeaderSearch() {
|
|||||||
type="text"
|
type="text"
|
||||||
value={query}
|
value={query}
|
||||||
onChange={(e) => {
|
onChange={(e) => {
|
||||||
setQuery(e.target.value)
|
const nextQuery = e.target.value
|
||||||
if (e.target.value.trim()) setIsOpen(true)
|
setQuery(nextQuery)
|
||||||
|
setSearchOpen(Boolean(nextQuery.trim()))
|
||||||
}}
|
}}
|
||||||
onFocus={() => {
|
onFocus={() => {
|
||||||
if (results.length > 0) setIsOpen(true)
|
if (query.trim()) setSearchOpen(true)
|
||||||
}}
|
}}
|
||||||
onKeyDown={handleKeyDown}
|
onKeyDown={handleKeyDown}
|
||||||
placeholder="搜索媒体…"
|
placeholder="搜索媒体…"
|
||||||
@@ -198,7 +208,7 @@ function LayoutHeaderSearch() {
|
|||||||
onClick={() => {
|
onClick={() => {
|
||||||
setQuery('')
|
setQuery('')
|
||||||
setResults([])
|
setResults([])
|
||||||
setIsOpen(false)
|
setSearchOpen(false)
|
||||||
}}
|
}}
|
||||||
className="absolute right-3 text-[var(--app-muted)] hover:text-[var(--app-text)] p-0.5 rounded-lg"
|
className="absolute right-3 text-[var(--app-muted)] hover:text-[var(--app-text)] p-0.5 rounded-lg"
|
||||||
>
|
>
|
||||||
|
|||||||
Reference in New Issue
Block a user