Skip to content

The open-source agent harness - the runtime layer that turns an LLM into a working agent.

feat(ui): Implement scrollable skill version menu (#717)

Vinit531f0ceaba62
diff --git a/.changeset/dropdown-scrollbar-click.md b/.changeset/dropdown-scrollbar-click.md
new file mode 100644
index 000000000..f5457b57d
--- /dev/null
+++ b/.changeset/dropdown-scrollbar-click.md
@@ -0,0 +1,5 @@
+---
+'@truefoundry/trueforge-ui': patch
+---
+
+Keep close-on-click dropdown menus and bottom sheets open when a click or drag lands on their own scrollbar, so scrolling a long menu no longer dismisses it before a choice is made.
diff --git a/.changeset/skill-version-menu-scroll.md b/.changeset/skill-version-menu-scroll.md
new file mode 100644
index 000000000..6c9b2483e
--- /dev/null
+++ b/.changeset/skill-version-menu-scroll.md
@@ -0,0 +1,5 @@
+---
+'@truefoundry/trueforge-ui': patch
+---
+
+Cap the skill version menu height and scroll it, so skills with many versions no longer run off screen. While it is open, scrolling is confined to the menu.
diff --git a/packages/trueforge-ui/src/atoms/draft/SkillVersionSelector.tsx b/packages/trueforge-ui/src/atoms/draft/SkillVersionSelector.tsx
index 55f54ae42..a3fb68fc9 100644
--- a/packages/trueforge-ui/src/atoms/draft/SkillVersionSelector.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/SkillVersionSelector.tsx
@@ -90,7 +90,8 @@ export function SkillVersionSelector({
onOpenChange={open => {
if (open) load();
}}
- className="min-w-40"
+ className="max-h-64 min-w-40 overflow-y-auto"
+ lockScroll
trigger={
<button
type="button"
diff --git a/packages/trueforge-ui/src/atoms/primitives/DropdownMenu.tsx b/packages/trueforge-ui/src/atoms/primitives/DropdownMenu.tsx
index e66739850..631ad2b5e 100644
--- a/packages/trueforge-ui/src/atoms/primitives/DropdownMenu.tsx
+++ b/packages/trueforge-ui/src/atoms/primitives/DropdownMenu.tsx
@@ -16,8 +16,14 @@ export type DropdownMenuProps = {
open?: boolean;
onOpenChange?: (open: boolean) => void;
closeOnClick?: boolean;
+ lockScroll?: boolean;
};
+// Returns true if the click was on the menu surface, not its contents or scrollbar.
+export function isSurfaceClick(event: React.MouseEvent<HTMLElement>): boolean {
+ return event.target === event.currentTarget;
+}
+
export function DropdownMenu({
trigger,
children,
@@ -28,6 +34,7 @@ export function DropdownMenu({
open: controlledOpen,
onOpenChange,
closeOnClick = true,
+ lockScroll = false,
}: DropdownMenuProps) {
const [internalOpen, setInternalOpen] = useState(false);
const open = controlledOpen ?? internalOpen;
@@ -82,6 +89,21 @@ export function DropdownMenu({
return () => document.removeEventListener('mousedown', handler);
}, [open]);
+ useEffect(() => {
+ if (!open || !lockScroll) return;
+ const block = (event: Event) => {
+ const target = event.target;
+ if (target instanceof Node && menuRef.current?.contains(target)) return;
+ event.preventDefault();
+ };
+ document.addEventListener('wheel', block, { passive: false, capture: true });
+ document.addEventListener('touchmove', block, { passive: false, capture: true });
+ return () => {
+ document.removeEventListener('wheel', block, { capture: true });
+ document.removeEventListener('touchmove', block, { capture: true });
+ };
+ }, [open, lockScroll]);
+
// Menu mounts only after `pos` is set; focus once per open, not on every scroll/resize pos rewrite.
useEffect(() => {
if (!open) {
@@ -161,12 +183,19 @@ export function DropdownMenu({
.join(' ') || undefined,
}}
className={cn(
- 'aui-popup-enter fixed z-[200] flex min-w-[8rem] flex-col rounded-md border border-border bg-card-bg p-1',
+ 'aui-popup-enter fixed z-[200] flex min-w-[8rem] flex-col overscroll-contain rounded-md border border-border bg-card-bg p-1',
'text-text-primary shadow-md',
className,
)}
onMouseDown={event => event.stopPropagation()}
- onClick={closeOnClick ? () => setOpen(false) : undefined}
+ onClick={
+ closeOnClick
+ ? event => {
+ if (isSurfaceClick(event)) return;
+ setOpen(false);
+ }
+ : undefined
+ }
>
{children}
</div>,
diff --git a/packages/trueforge-ui/src/atoms/primitives/ResponsiveDropdownMenu.tsx b/packages/trueforge-ui/src/atoms/primitives/ResponsiveDropdownMenu.tsx
index 9eca3a0dc..8d84b474f 100644
--- a/packages/trueforge-ui/src/atoms/primitives/ResponsiveDropdownMenu.tsx
+++ b/packages/trueforge-ui/src/atoms/primitives/ResponsiveDropdownMenu.tsx
@@ -13,7 +13,7 @@ import {
import { useCompactLayout } from '../lib/CompactLayoutContext.js';
import { cn } from '../lib/cn.js';
import { BottomSheet } from './BottomSheet.js';
-import { DropdownMenu, type DropdownMenuProps } from './DropdownMenu.js';
+import { DropdownMenu, isSurfaceClick, type DropdownMenuProps } from './DropdownMenu.js';
type ResponsiveDropdownTriggerProps = {
'aria-controls'?: string;
@@ -89,7 +89,14 @@ export function ResponsiveDropdownMenu({
<BottomSheet id={sheetId} open onOpenChange={setOpen} aria-label={sheetLabel} className={sheetClassName}>
<div
className="flex min-h-0 flex-1 flex-col overflow-x-hidden overflow-y-auto"
- onClick={closeOnClick ? () => setOpen(false) : undefined}
+ onClick={
+ closeOnClick
+ ? event => {
+ if (isSurfaceClick(event)) return;
+ setOpen(false);
+ }
+ : undefined
+ }
>
{children}
</div>