Skip to content

fix(flow-chat): prevent background activity menu clipping #1817

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

Merged
wsp1911 merged 1 commit into from
Jul 28, 2026
Merged

fix(flow-chat): prevent background activity menu clipping #1817

Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions src/web-ui/src/flow_chat/components/modern/FlowChatHeader.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,13 @@
&--compact {
min-width: 0;
}

&--portal {
position: fixed;
top: auto;
right: auto;
z-index: 10000;
}
}

&__background-command-menu-item {
Expand Down
52 changes: 52 additions & 0 deletions src/web-ui/src/flow_chat/components/modern/FlowChatHeader.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,4 +205,56 @@ describe('FlowChatHeader', () => {
expect(onJumpToTurn).toHaveBeenCalledWith('turn-2');
expect(container.querySelector('[role="dialog"]')).not.toBeNull();
});

it('renders background activity menus in a portal outside the scrollable panel', () => {
const onStopBackgroundCommand = vi.fn();

act(() => {
root.render(
<FlowChatHeader
{...createProps({
backgroundCommands: [{
execSessionKey: 'command-1',
execSessionId: 1,
title: 'Long-running command',
command: 'pnpm dev',
status: 'running',
}],
onStopBackgroundCommand,
})}
/>,
);
});

const activityButton = container.querySelector<HTMLButtonElement>(
'[data-testid="flowchat-header-background-activities"]',
);
act(() => {
activityButton?.click();
});

const panel = container.querySelector('.flowchat-header__background-activity-panel');
const menuButton = panel?.querySelector<HTMLButtonElement>(
'[aria-label="flowChatHeader.backgroundCommandActions"]',
);
act(() => {
menuButton?.click();
});

const menu = document.querySelector<HTMLDivElement>('[data-testid="flowchat-header-background-menu"]');
expect(menu).not.toBeNull();
expect(panel?.contains(menu ?? null)).toBe(false);

act(() => {
menu?.dispatchEvent(new MouseEvent('mousedown', { bubbles: true }));
});
expect(container.querySelector('.flowchat-header__background-activity-panel')).not.toBeNull();

const stopButton = menu?.querySelector<HTMLButtonElement>('[role="menuitem"]');
act(() => {
stopButton?.click();
});

expect(onStopBackgroundCommand).toHaveBeenCalledTimes(1);
});
});
117 changes: 104 additions & 13 deletions src/web-ui/src/flow_chat/components/modern/FlowChatHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@
*/

import React, { useEffect, useLayoutEffect, useMemo, useRef, useState, useCallback } from 'react';
import { createPortal } from 'react-dom';
import { Activity, Bot, ChevronDown, ChevronUp, GitPullRequest, Keyboard, List, MoreHorizontal, Search, Square, Terminal, X } from 'lucide-react';
import { Tooltip, IconButton, Input } from '@/component-library';
import { useTranslation } from 'react-i18next';
import { SessionFilesBadge } from './SessionFilesBadge';
import { useWorkspaceContext } from '@/infrastructure/contexts/WorkspaceContext';
import { computeFixedPopoverPosition } from '@/shared/utils/fixedPopoverViewport';
import { createReviewPlatformTab } from '@/shared/utils/tabUtils';
import './FlowChatHeader.scss';

Expand Down Expand Up @@ -145,8 +147,14 @@ export const FlowChatHeader: React.FC<FlowChatHeaderProps> = ({
const rightActionsRef = useRef<HTMLDivElement | null>(null);
const turnListRef = useRef<HTMLDivElement | null>(null);
const backgroundActivityPanelRef = useRef<HTMLDivElement | null>(null);
const backgroundActivityMenuAnchorRef = useRef<HTMLButtonElement | null>(null);
const backgroundActivityMenuRef = useRef<HTMLDivElement | null>(null);
const activeTurnItemRef = useRef<HTMLButtonElement | null>(null);
const searchInputRef = useRef<HTMLInputElement | null>(null);
const [backgroundActivityMenuPosition, setBackgroundActivityMenuPosition] = useState<{
top: number;
left: number;
} | null>(null);

// Truncate long messages.
const truncatedMessage = currentUserMessage.length > 50
Expand Down Expand Up @@ -183,6 +191,30 @@ export const FlowChatHeader: React.FC<FlowChatHeaderProps> = ({
}))
), [backgroundCommands, t]);
const hasNoResults = searchQuery.trim().length > 0 && searchMatchCount === 0;
const hasOpenBackgroundActivityMenu =
openBackgroundSectionMenuId !== null ||
openBackgroundSubagentMenuId !== null ||
openBackgroundCommandMenuId !== null;

const updateBackgroundActivityMenuPosition = useCallback(() => {
const anchor = backgroundActivityMenuAnchorRef.current;
if (!anchor) return;

const menu = backgroundActivityMenuRef.current;
const { top, left } = computeFixedPopoverPosition(
anchor.getBoundingClientRect(),
menu?.offsetWidth ?? 200,
menu?.offsetHeight ?? 96,
4,
8,
);
setBackgroundActivityMenuPosition({ top, left });
}, []);

const prepareBackgroundActivityMenu = useCallback((anchor: HTMLButtonElement) => {
backgroundActivityMenuAnchorRef.current = anchor;
updateBackgroundActivityMenuPosition();
}, [updateBackgroundActivityMenuPosition]);

useEffect(() => {
if (!isTurnListOpen && !isBackgroundActivityPanelOpen) return;
Expand All @@ -191,7 +223,8 @@ export const FlowChatHeader: React.FC<FlowChatHeaderProps> = ({
const target = event.target as Node;
if (
!turnListRef.current?.contains(target) &&
!backgroundActivityPanelRef.current?.contains(target)
!backgroundActivityPanelRef.current?.contains(target) &&
!backgroundActivityMenuRef.current?.contains(target)
) {
setIsTurnListOpen(false);
setIsBackgroundActivityPanelOpen(false);
Expand Down Expand Up @@ -220,6 +253,28 @@ export const FlowChatHeader: React.FC<FlowChatHeaderProps> = ({
};
}, [isBackgroundActivityPanelOpen, isTurnListOpen]);

useLayoutEffect(() => {
if (!hasOpenBackgroundActivityMenu) {
setBackgroundActivityMenuPosition(null);
return;
}

updateBackgroundActivityMenuPosition();
window.addEventListener('resize', updateBackgroundActivityMenuPosition);
window.addEventListener('scroll', updateBackgroundActivityMenuPosition, true);

return () => {
window.removeEventListener('resize', updateBackgroundActivityMenuPosition);
window.removeEventListener('scroll', updateBackgroundActivityMenuPosition, true);
};
}, [
hasOpenBackgroundActivityMenu,
openBackgroundCommandMenuId,
openBackgroundSectionMenuId,
openBackgroundSubagentMenuId,
updateBackgroundActivityMenuPosition,
]);

const prevSearchOpenRequestRef = useRef(0);
useEffect(() => {
if (searchOpenRequest > 0 && searchOpenRequest !== prevSearchOpenRequestRef.current) {
Expand Down Expand Up @@ -361,6 +416,11 @@ export const FlowChatHeader: React.FC<FlowChatHeaderProps> = ({
) => {
event.preventDefault();
event.stopPropagation();
if (openBackgroundSubagentMenuId === subagent.sessionId) {
setBackgroundActivityMenuPosition(null);
} else {
prepareBackgroundActivityMenu(event.currentTarget);
}
setOpenBackgroundSectionMenuId(null);
setOpenBackgroundCommandMenuId(null);
setOpenBackgroundSubagentMenuId(previous => previous === subagent.sessionId ? null : subagent.sessionId);
Expand All @@ -387,6 +447,11 @@ export const FlowChatHeader: React.FC<FlowChatHeaderProps> = ({
const handleCommandSectionMenuToggle = (event: React.MouseEvent<HTMLButtonElement>) => {
event.preventDefault();
event.stopPropagation();
if (openBackgroundSectionMenuId === 'commands') {
setBackgroundActivityMenuPosition(null);
} else {
prepareBackgroundActivityMenu(event.currentTarget);
}
setOpenBackgroundSubagentMenuId(null);
setOpenBackgroundCommandMenuId(null);
setOpenBackgroundSectionMenuId(previous => previous === 'commands' ? null : 'commands');
Expand All @@ -395,6 +460,11 @@ export const FlowChatHeader: React.FC<FlowChatHeaderProps> = ({
const handleSubagentSectionMenuToggle = (event: React.MouseEvent<HTMLButtonElement>) => {
event.preventDefault();
event.stopPropagation();
if (openBackgroundSectionMenuId === 'subagents') {
setBackgroundActivityMenuPosition(null);
} else {
prepareBackgroundActivityMenu(event.currentTarget);
}
setOpenBackgroundSubagentMenuId(null);
setOpenBackgroundCommandMenuId(null);
setOpenBackgroundSectionMenuId(previous => previous === 'subagents' ? null : 'subagents');
Expand All @@ -411,6 +481,11 @@ export const FlowChatHeader: React.FC<FlowChatHeaderProps> = ({
) => {
event.preventDefault();
event.stopPropagation();
if (openBackgroundCommandMenuId === command.execSessionKey) {
setBackgroundActivityMenuPosition(null);
} else {
prepareBackgroundActivityMenu(event.currentTarget);
}
setOpenBackgroundSectionMenuId(null);
setOpenBackgroundSubagentMenuId(null);
setOpenBackgroundCommandMenuId(previous => previous === command.execSessionKey ? null : command.execSessionKey);
Expand Down Expand Up @@ -463,11 +538,14 @@ export const FlowChatHeader: React.FC<FlowChatHeaderProps> = ({
>
<MoreHorizontal size={13} aria-hidden="true" />
</IconButton>
{openBackgroundSubagentMenuId === subagent.sessionId ? (
{openBackgroundSubagentMenuId === subagent.sessionId && backgroundActivityMenuPosition ? createPortal(
<div
className="flowchat-header__background-command-menu flowchat-header__background-command-menu--compact"
ref={backgroundActivityMenuRef}
className="flowchat-header__background-command-menu flowchat-header__background-command-menu--compact flowchat-header__background-command-menu--portal"
role="menu"
aria-label={t('flowChatHeader.backgroundSubagentActions')}
style={backgroundActivityMenuPosition}
data-testid="flowchat-header-background-menu"
>
<button
type="button"
Expand All @@ -483,7 +561,8 @@ export const FlowChatHeader: React.FC<FlowChatHeaderProps> = ({
: t('flowChatHeader.backgroundSubagentStop')}
</span>
</button>
</div>
</div>,
document.body,
) : null}
</div>
);
Expand Down Expand Up @@ -516,11 +595,14 @@ export const FlowChatHeader: React.FC<FlowChatHeaderProps> = ({
>
<MoreHorizontal size={13} aria-hidden="true" />
</IconButton>
{openBackgroundCommandMenuId === command.execSessionKey ? (
{openBackgroundCommandMenuId === command.execSessionKey && backgroundActivityMenuPosition ? createPortal(
<div
className="flowchat-header__background-command-menu"
ref={backgroundActivityMenuRef}
className="flowchat-header__background-command-menu flowchat-header__background-command-menu--portal"
role="menu"
aria-label={t('flowChatHeader.backgroundCommandActions')}
style={backgroundActivityMenuPosition}
data-testid="flowchat-header-background-menu"
>
{canSendBackgroundCommandInput ? (
<button
Expand Down Expand Up @@ -549,7 +631,8 @@ export const FlowChatHeader: React.FC<FlowChatHeaderProps> = ({
</span>
</button>
) : null}
</div>
</div>,
document.body,
) : null}
</div>
);
Expand Down Expand Up @@ -658,11 +741,14 @@ export const FlowChatHeader: React.FC<FlowChatHeaderProps> = ({
>
<MoreHorizontal size={13} aria-hidden="true" />
</IconButton>
{openBackgroundSectionMenuId === 'subagents' ? (
{openBackgroundSectionMenuId === 'subagents' && backgroundActivityMenuPosition ? createPortal(
<div
className="flowchat-header__background-command-menu"
ref={backgroundActivityMenuRef}
className="flowchat-header__background-command-menu flowchat-header__background-command-menu--portal"
role="menu"
aria-label={t('flowChatHeader.backgroundSubagentActions')}
style={backgroundActivityMenuPosition}
data-testid="flowchat-header-background-menu"
>
<button
type="button"
Expand All @@ -673,7 +759,8 @@ export const FlowChatHeader: React.FC<FlowChatHeaderProps> = ({
<Square size={12} aria-hidden="true" />
<span>{t('flowChatHeader.backgroundSubagentStopAll')}</span>
</button>
</div>
</div>,
document.body,
) : null}
</div>
) : null}
Expand Down Expand Up @@ -731,11 +818,14 @@ export const FlowChatHeader: React.FC<FlowChatHeaderProps> = ({
>
<MoreHorizontal size={13} aria-hidden="true" />
</IconButton>
{openBackgroundSectionMenuId === 'commands' ? (
{openBackgroundSectionMenuId === 'commands' && backgroundActivityMenuPosition ? createPortal(
<div
className="flowchat-header__background-command-menu"
ref={backgroundActivityMenuRef}
className="flowchat-header__background-command-menu flowchat-header__background-command-menu--portal"
role="menu"
aria-label={t('flowChatHeader.backgroundCommandActions')}
style={backgroundActivityMenuPosition}
data-testid="flowchat-header-background-menu"
>
<button
type="button"
Expand All @@ -746,7 +836,8 @@ export const FlowChatHeader: React.FC<FlowChatHeaderProps> = ({
<Square size={12} aria-hidden="true" />
<span>{t('flowChatHeader.backgroundCommandStopAll')}</span>
</button>
</div>
</div>,
document.body,
) : null}
</div>
) : null}
Expand Down