refactor: simplify hover menu logic and update related tests for workspace switcher
This commit is contained in:
@@ -2,7 +2,6 @@
|
||||
|
||||
import { CheckIcon, ChevronsUpDownIcon } from "lucide-react"
|
||||
import Link from "next/link"
|
||||
import { useEffect, useRef, useState } from "react"
|
||||
import type { ReactElement } from "react"
|
||||
|
||||
import { useI18n } from "@/i18n/provider"
|
||||
@@ -52,44 +51,9 @@ export function WorkspaceSwitcher({
|
||||
trigger,
|
||||
}: WorkspaceSwitcherProps) {
|
||||
const t = useI18n()
|
||||
const [hoverOpen, setHoverOpen] = useState(false)
|
||||
const closeTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
|
||||
const isRail = variant === "rail"
|
||||
const currentOption =
|
||||
workspaceOptions.find((item) => item.key === currentWorkspace) ?? workspaceOptions[0]
|
||||
|
||||
const clearCloseTimer = () => {
|
||||
if (closeTimerRef.current) {
|
||||
clearTimeout(closeTimerRef.current)
|
||||
closeTimerRef.current = null
|
||||
}
|
||||
}
|
||||
const openHoverMenu = () => {
|
||||
if (!isRail) {
|
||||
return
|
||||
}
|
||||
clearCloseTimer()
|
||||
setHoverOpen(true)
|
||||
}
|
||||
const closeHoverMenu = () => {
|
||||
if (!isRail) {
|
||||
return
|
||||
}
|
||||
clearCloseTimer()
|
||||
closeTimerRef.current = setTimeout(() => {
|
||||
setHoverOpen(false)
|
||||
closeTimerRef.current = null
|
||||
}, 120)
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
return () => {
|
||||
if (closeTimerRef.current) {
|
||||
clearTimeout(closeTimerRef.current)
|
||||
}
|
||||
}
|
||||
}, [])
|
||||
|
||||
const triggerClassName = cn(
|
||||
"gap-2 text-left",
|
||||
variant === "header" &&
|
||||
@@ -134,13 +98,8 @@ export function WorkspaceSwitcher({
|
||||
)
|
||||
|
||||
return (
|
||||
<DropdownMenu
|
||||
open={isRail ? hoverOpen : undefined}
|
||||
onOpenChange={isRail ? setHoverOpen : undefined}
|
||||
>
|
||||
<DropdownMenu>
|
||||
<DropdownMenuTrigger
|
||||
onPointerEnter={openHoverMenu}
|
||||
onPointerLeave={closeHoverMenu}
|
||||
render={
|
||||
trigger ?? <Button variant="ghost" className={triggerClassName} />
|
||||
}
|
||||
@@ -151,8 +110,6 @@ export function WorkspaceSwitcher({
|
||||
align="start"
|
||||
side={variant === "sidebar" || variant === "rail" ? "right" : "bottom"}
|
||||
sideOffset={8}
|
||||
onPointerEnter={openHoverMenu}
|
||||
onPointerLeave={closeHoverMenu}
|
||||
className="w-60 min-w-60"
|
||||
>
|
||||
<DropdownMenuGroup>
|
||||
|
||||
Reference in New Issue
Block a user