feat: implement hover functionality for workspace switcher in WorkspaceSwitcher component
This commit is contained in:
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
import { CheckIcon, ChevronsUpDownIcon } from "lucide-react"
|
import { CheckIcon, ChevronsUpDownIcon } from "lucide-react"
|
||||||
import Link from "next/link"
|
import Link from "next/link"
|
||||||
|
import { useRef, useState } from "react"
|
||||||
import type { ReactElement } from "react"
|
import type { ReactElement } from "react"
|
||||||
|
|
||||||
import { useI18n } from "@/i18n/provider"
|
import { useI18n } from "@/i18n/provider"
|
||||||
@@ -51,8 +52,36 @@ export function WorkspaceSwitcher({
|
|||||||
trigger,
|
trigger,
|
||||||
}: WorkspaceSwitcherProps) {
|
}: WorkspaceSwitcherProps) {
|
||||||
const t = useI18n()
|
const t = useI18n()
|
||||||
|
const [hoverOpen, setHoverOpen] = useState(false)
|
||||||
|
const closeTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
|
||||||
|
const isRail = variant === "rail"
|
||||||
const currentOption =
|
const currentOption =
|
||||||
workspaceOptions.find((item) => item.key === currentWorkspace) ?? workspaceOptions[0]
|
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)
|
||||||
|
}
|
||||||
|
|
||||||
const triggerClassName = cn(
|
const triggerClassName = cn(
|
||||||
"gap-2 text-left",
|
"gap-2 text-left",
|
||||||
variant === "header" &&
|
variant === "header" &&
|
||||||
@@ -97,8 +126,15 @@ export function WorkspaceSwitcher({
|
|||||||
)
|
)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<DropdownMenu>
|
<DropdownMenu
|
||||||
|
open={isRail ? hoverOpen : undefined}
|
||||||
|
onOpenChange={isRail ? setHoverOpen : undefined}
|
||||||
|
>
|
||||||
<DropdownMenuTrigger
|
<DropdownMenuTrigger
|
||||||
|
onPointerEnter={openHoverMenu}
|
||||||
|
onPointerLeave={closeHoverMenu}
|
||||||
|
onFocus={openHoverMenu}
|
||||||
|
onBlur={closeHoverMenu}
|
||||||
render={
|
render={
|
||||||
trigger ?? <Button variant="ghost" className={triggerClassName} />
|
trigger ?? <Button variant="ghost" className={triggerClassName} />
|
||||||
}
|
}
|
||||||
@@ -109,6 +145,8 @@ export function WorkspaceSwitcher({
|
|||||||
align="start"
|
align="start"
|
||||||
side={variant === "sidebar" || variant === "rail" ? "right" : "bottom"}
|
side={variant === "sidebar" || variant === "rail" ? "right" : "bottom"}
|
||||||
sideOffset={8}
|
sideOffset={8}
|
||||||
|
onPointerEnter={openHoverMenu}
|
||||||
|
onPointerLeave={closeHoverMenu}
|
||||||
className="w-60 min-w-60"
|
className="w-60 min-w-60"
|
||||||
>
|
>
|
||||||
<DropdownMenuGroup>
|
<DropdownMenuGroup>
|
||||||
|
|||||||
@@ -82,8 +82,7 @@ test.describe("support workbench", () => {
|
|||||||
await conversationsEntry.hover();
|
await conversationsEntry.hover();
|
||||||
await expect(page.getByText(/会话|Conversations/).last()).toBeVisible();
|
await expect(page.getByText(/会话|Conversations/).last()).toBeVisible();
|
||||||
await screenshot(page, "04-workbench-rail-tooltip");
|
await screenshot(page, "04-workbench-rail-tooltip");
|
||||||
await page.getByRole("button", { name: /贝壳AGENT|Agent Desk/i }).first().click();
|
await page.getByRole("button", { name: /贝壳AGENT|Agent Desk/i }).first().hover();
|
||||||
await expect(page.getByText(/切换工作区|Switch workspace/)).toBeVisible();
|
|
||||||
await expect(page.getByRole("menuitem", { name: /管理后台|Admin Dashboard/ })).toBeVisible();
|
await expect(page.getByRole("menuitem", { name: /管理后台|Admin Dashboard/ })).toBeVisible();
|
||||||
await page.waitForTimeout(300);
|
await page.waitForTimeout(300);
|
||||||
await screenshot(page, "05-workbench-switcher-open");
|
await screenshot(page, "05-workbench-switcher-open");
|
||||||
|
|||||||
Reference in New Issue
Block a user