Skip to content

fix: 修复 Agent 探索/监督/自动模式互相切换后，弹窗立即消失的问题 #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Afeng01 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: 修复 Agent 探索/监督/自动模式互相切换后，弹窗立即消失的问题 #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions apps/electron/src/renderer/components/agent/PermissionModeSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ export function PermissionModeSelector(): React.ReactElement | null {
const [mode, setMode] = useAtom(agentPermissionModeAtom)
const currentWorkspaceId = useAtomValue(currentAgentWorkspaceIdAtom)
const workspaces = useAtomValue(agentWorkspacesAtom)
const [tooltipOpen, setTooltipOpen] = React.useState(false)
const keepOpenRef = React.useRef(false)

// 获取当前工作区的 slug
const workspaceSlug = React.useMemo(() => {
Expand Down Expand Up @@ -83,16 +85,36 @@ export function PermissionModeSelector(): React.ReactElement | null {
}
}, [mode, workspaceSlug, setMode])

/** 处理点击：切换模式并保持 tooltip 显示 */
const handleClick = React.useCallback(() => {
cycleMode()
keepOpenRef.current = true
setTooltipOpen(true)
// 短暂忽略点击后的关闭请求，之后允许正常 hover 行为
setTimeout(() => {
keepOpenRef.current = false
}, 100)
requestAnimationFrame(() => document.querySelector<HTMLElement>('.ProseMirror')?.focus())
}, [cycleMode])

/** 处理 tooltip 状态变化，点击后保持打开 */
const handleOpenChange = React.useCallback((open: boolean) => {
if (!open && keepOpenRef.current) {
return // 点击后保持打开，忽略关闭请求
}
setTooltipOpen(open)
}, [])

const config = MODE_CONFIG[mode]
const Icon = config.icon

return (
<TooltipProvider delayDuration={300}>
<Tooltip>
<Tooltip open={tooltipOpen} onOpenChange={handleOpenChange}>
<TooltipTrigger asChild>
<button
type="button"
onClick={() => { cycleMode(); requestAnimationFrame(() => document.querySelector<HTMLElement>('.ProseMirror')?.focus()) }}
onClick={handleClick}
className={`flex items-center gap-1 px-1.5 py-1 rounded text-xs font-medium transition-colors ${config.className}`}
>
<Icon className="size-3.5" />
Expand Down