Skip to content

fix(web): align dispatch popover with trigger right edge #1880

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
bobleer merged 1 commit into from
Jul 30, 2026
Merged

fix(web): align dispatch popover with trigger right edge #1880

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
10 changes: 7 additions & 3 deletions src/web-ui/src/features/dispatch/DispatchTargetPicker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@use '../../component-library/styles/tokens' as *;

.dispatch-target-picker {
position: relative;
display: inline-flex;
min-width: 0;
align-items: center;
Expand Down Expand Up @@ -54,16 +55,19 @@
}

&__menu {
position: fixed;
z-index: 1200;
position: absolute;
right: 0;
bottom: calc(100% + 7px);
z-index: 10;
box-sizing: border-box;
display: flex;
width: min(300px, calc(100vw - 24px));
max-height: min(410px, calc(100vh - 24px));
flex-direction: column;
gap: 4px;
padding: 6px;
overflow: auto;
overflow-x: hidden;
overflow-y: auto;
border: 1px solid var(--border-subtle);
border-radius: $size-radius-base;
background: var(--color-bg-elevated);
Expand Down
38 changes: 3 additions & 35 deletions src/web-ui/src/features/dispatch/DispatchTargetPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import React, {
lazy,
Suspense,
useCallback,
useEffect,
useMemo,
useRef,
useState,
} from 'react';
import { createPortal } from 'react-dom';
import {
Check,
ChevronDown,
Expand All @@ -21,7 +19,6 @@ import { Tooltip } from '@/component-library';
import { SSHConnectionDialog } from '@/features/ssh-remote/SSHConnectionDialog';
import { useAccountLoginState } from '@/infrastructure/account/useAccountLoginState';
import { useI18n } from '@/infrastructure/i18n';
import { computeFixedPopoverPosition } from '@/shared/utils/fixedPopoverViewport';
import { DispatchInstallDialog } from './DispatchInstallDialog';
import type {
DispatchSelection,
Expand Down Expand Up @@ -54,10 +51,7 @@ export const DispatchTargetPicker: React.FC<DispatchTargetPickerProps> = ({
}) => {
const { t } = useI18n('flow-chat');
const rootRef = useRef<HTMLDivElement>(null);
const triggerRef = useRef<HTMLButtonElement>(null);
const menuRef = useRef<HTMLDivElement>(null);
const [open, setOpen] = useState(false);
const [menuPosition, setMenuPosition] = useState({ top: 0, left: 0 });
const [configureTarget, setConfigureTarget] = useState<DispatchTargetOption | null>(null);
const [sshDialogOpen, setSshDialogOpen] = useState(false);
const [accountDialogOpen, setAccountDialogOpen] = useState(false);
Expand All @@ -71,32 +65,10 @@ export const DispatchTargetPicker: React.FC<DispatchTargetPickerProps> = ({
? t('chatInput.dispatch.locked', { target: displayLabel })
: t('chatInput.dispatch.current', { target: displayLabel });

const updatePosition = useCallback(() => {
const rect = triggerRef.current?.getBoundingClientRect();
if (!rect) return;
const width = menuRef.current?.offsetWidth ?? 300;
const height = menuRef.current?.offsetHeight ?? 340;
setMenuPosition(computeFixedPopoverPosition(rect, width, height, 7, 8));
}, []);

useEffect(() => {
if (!open) return;
updatePosition();
const frame = requestAnimationFrame(updatePosition);
window.addEventListener('resize', updatePosition);
window.addEventListener('scroll', updatePosition, true);
return () => {
cancelAnimationFrame(frame);
window.removeEventListener('resize', updatePosition);
window.removeEventListener('scroll', updatePosition, true);
};
}, [open, updatePosition]);

useEffect(() => {
if (!open) return;
const handlePointerDown = (event: PointerEvent) => {
const node = event.target as Node;
if (!rootRef.current?.contains(node) && !menuRef.current?.contains(node)) {
if (!rootRef.current?.contains(event.target as Node)) {
setOpen(false);
}
};
Expand Down Expand Up @@ -126,13 +98,11 @@ export const DispatchTargetPicker: React.FC<DispatchTargetPickerProps> = ({
[targets],
);

const menu = open ? createPortal(
const menu = open ? (
<div
ref={menuRef}
className="dispatch-target-picker__menu"
role="menu"
aria-label={t('chatInput.dispatch.menuLabel')}
style={{ top: menuPosition.top, left: menuPosition.left }}
data-testid="dispatch-target-menu"
>
<div className="dispatch-target-picker__header">
Expand Down Expand Up @@ -272,16 +242,14 @@ export const DispatchTargetPicker: React.FC<DispatchTargetPickerProps> = ({
<Plus size={14} aria-hidden />
<span>{t('chatInput.dispatch.addSsh')}</span>
</button>
</div>,
document.body,
</div>
) : null;

return (
<>
<div ref={rootRef} className="dispatch-target-picker">
<Tooltip content={tooltip} placement="top">
<button
ref={triggerRef}
type="button"
className="dispatch-target-picker__trigger"
aria-haspopup="menu"
Expand Down