Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

fix(desktop): match GFS action menu styling

M2da8c5cc6c78
diff --git a/desktop-app/ui/src/components/GfsResourceMenu/GfsResourceMenu.test.tsx b/desktop-app/ui/src/components/GfsResourceMenu/GfsResourceMenu.test.tsx
index 537338bd9..f9df8c469 100644
--- a/desktop-app/ui/src/components/GfsResourceMenu/GfsResourceMenu.test.tsx
+++ b/desktop-app/ui/src/components/GfsResourceMenu/GfsResourceMenu.test.tsx
@@ -8,7 +8,7 @@ describe('GfsResourceMenu', () => {
cleanup()
})
- it('uses a vertical kebab and presents a compact menu panel', () => {
+ it('uses a vertical kebab and presents an icon-led menu panel', () => {
render(
<GfsResourceMenu
onCopyLink={vi.fn()}
@@ -34,6 +34,8 @@ describe('GfsResourceMenu', () => {
const menu = screen.getByRole('menu')
expect(menu.tagName).toBe('DIV')
expect(menu.classList.contains('da-gfs-resource-menu__panel')).toBe(true)
+ expect(menu.querySelectorAll('[role="separator"]')).toHaveLength(2)
+ expect(menu.querySelectorAll('.ui-menu-item__icon')).toHaveLength(3)
expect(screen.getByRole('menuitem', { name: 'Preview' })).toBeTruthy()
})
})
diff --git a/desktop-app/ui/src/components/GfsResourceMenu/index.tsx b/desktop-app/ui/src/components/GfsResourceMenu/index.tsx
index 67d3c86c1..ebc78306d 100644
--- a/desktop-app/ui/src/components/GfsResourceMenu/index.tsx
+++ b/desktop-app/ui/src/components/GfsResourceMenu/index.tsx
@@ -1,10 +1,43 @@
-import { useCallback, useEffect, useRef, useState } from 'react'
-import type { KeyboardEvent as ReactKeyboardEvent } from 'react'
+import { Fragment, useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react'
+import type { KeyboardEvent as ReactKeyboardEvent, ReactNode } from 'react'
+import { createPortal } from 'react-dom'
import { IconButton, MenuItem } from '@components/Common'
-import { IconMoreVertical } from '@components/SidebarNav/icons'
-import { useClickOutside } from '@hooks/useClickOutside'
+import {
+ IconConnectors,
+ IconContexts,
+ IconCopy,
+ IconDownload,
+ IconEdit,
+ IconEye,
+ IconMoreVertical,
+ IconPlus,
+ IconSettings,
+ IconTrash,
+} from '@components/SidebarNav/icons'
import type { GfsResourceMenuProps } from './types'
+type GfsResourceMenuAction = {
+ color?: 'neutral' | 'danger'
+ icon: ReactNode
+ key: string
+ label: string
+ onClick: () => void
+}
+
+function menuAction(
+ key: string,
+ label: string,
+ icon: ReactNode,
+ onClick: (() => void) | undefined,
+ color?: GfsResourceMenuAction['color']
+): GfsResourceMenuAction | null {
+ return onClick ? { color, icon, key, label, onClick } : null
+}
+
+function isMenuAction(action: GfsResourceMenuAction | null): action is GfsResourceMenuAction {
+ return action !== null
+}
+
export function GfsResourceMenu({
resourceName,
onManage,
@@ -21,7 +54,9 @@ export function GfsResourceMenu({
}: GfsResourceMenuProps) {
const [open, setOpen] = useState(false)
const menuRef = useRef<HTMLSpanElement | null>(null)
+ const panelRef = useRef<HTMLDivElement | null>(null)
const triggerRef = useRef<HTMLButtonElement | null>(null)
+ const [panelPosition, setPanelPosition] = useState<{ left: number; top: number } | null>(null)
const closeMenu = useCallback(() => setOpen(false), [])
const onOpenChangeRef = useRef(onOpenChange)
const prevOpenRef = useRef(false)
@@ -43,11 +78,64 @@ export function GfsResourceMenu({
[]
)
- useClickOutside(menuRef, open, closeMenu)
+ useEffect(() => {
+ if (!open) return
+ const handlePointerDown = (event: MouseEvent) => {
+ const target = event.target as Node
+ if (menuRef.current?.contains(target) || panelRef.current?.contains(target)) return
+ closeMenu()
+ }
+ document.addEventListener('mousedown', handlePointerDown)
+ return () => document.removeEventListener('mousedown', handlePointerDown)
+ }, [closeMenu, open])
+
+ const positionPanel = useCallback(() => {
+ const trigger = triggerRef.current
+ const panel = panelRef.current
+ if (!trigger || !panel) return
+
+ const triggerRect = trigger.getBoundingClientRect()
+ const panelRect = panel.getBoundingClientRect()
+ const edgeInset = 8
+ const gap = 6
+ const viewportWidth = window.innerWidth
+ const viewportHeight = window.innerHeight
+ const left = Math.min(
+ Math.max(edgeInset, triggerRect.right - panelRect.width),
+ Math.max(edgeInset, viewportWidth - panelRect.width - edgeInset)
+ )
+ const opensAbove =
+ triggerRect.bottom + gap + panelRect.height > viewportHeight - edgeInset &&
+ triggerRect.top - gap - panelRect.height >= edgeInset
+ const unclampedTop = opensAbove
+ ? triggerRect.top - panelRect.height - gap
+ : triggerRect.bottom + gap
+ const top = Math.min(
+ Math.max(edgeInset, unclampedTop),
+ Math.max(edgeInset, viewportHeight - panelRect.height - edgeInset)
+ )
+
+ setPanelPosition({ left, top })
+ }, [])
+
+ useLayoutEffect(() => {
+ if (!open) {
+ setPanelPosition(null)
+ return
+ }
+
+ positionPanel()
+ window.addEventListener('resize', positionPanel)
+ window.addEventListener('scroll', positionPanel, true)
+ return () => {
+ window.removeEventListener('resize', positionPanel)
+ window.removeEventListener('scroll', positionPanel, true)
+ }
+ }, [open, positionPanel])
useEffect(() => {
if (!open) return
- menuRef.current?.querySelector<HTMLButtonElement>('[role="menuitem"]:not(:disabled)')?.focus()
+ panelRef.current?.querySelector<HTMLButtonElement>('[role="menuitem"]:not(:disabled)')?.focus()
const handleKeyDown = (event: KeyboardEvent) => {
if (event.key === 'Escape') {
closeMenu()
@@ -58,10 +146,10 @@ export function GfsResourceMenu({
return () => window.removeEventListener('keydown', handleKeyDown)
}, [closeMenu, open])
- const handleMenuKeyDown = (event: ReactKeyboardEvent<HTMLSpanElement>) => {
+ const handleMenuKeyDown = (event: ReactKeyboardEvent<HTMLElement>) => {
if (!open || !['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) return
const items = Array.from(
- menuRef.current?.querySelectorAll<HTMLButtonElement>('[role="menuitem"]:not(:disabled)') ?? []
+ event.currentTarget.querySelectorAll<HTMLButtonElement>('[role="menuitem"]:not(:disabled)')
)
if (!items.length) return
event.preventDefault()
@@ -79,6 +167,25 @@ export function GfsResourceMenu({
action()
}
+ const actionGroups = [
+ [
+ menuAction('manage', 'Manage', <IconSettings />, onManage),
+ menuAction('open-folder', 'Open folder', <IconContexts />, onOpen),
+ menuAction('open-gfs-link', 'Open GFS link', <IconConnectors />, onOpenGfsLink),
+ menuAction('preview', 'Preview', <IconEye />, onPreview),
+ ].filter(isMenuAction),
+ [
+ menuAction('new-folder', 'New folder', <IconPlus />, onCreateFolder),
+ menuAction('rename', 'Rename', <IconEdit />, onRename),
+ menuAction('move', 'Move to…', <IconContexts />, onMove),
+ ].filter(isMenuAction),
+ [
+ menuAction('download', 'Download', <IconDownload />, onDownload),
+ menuAction('copy-link', 'Copy GFS link', <IconCopy />, onCopyLink),
+ ].filter(isMenuAction),
+ [menuAction('delete', 'Delete', <IconTrash />, onDelete, 'danger')].filter(isMenuAction),
+ ].filter(group => group.length > 0)
+
return (
<span
className={`da-gfs-resource-menu${open ? ' is-open' : ''}`}
@@ -100,60 +207,41 @@ export function GfsResourceMenu({
>
<IconMoreVertical />
</IconButton>
- {open ? (
- <div className="da-gfs-resource-menu__panel" role="menu">
- {onManage ? (
- <MenuItem role="menuitem" onClick={() => runAction(onManage)}>
- Manage
- </MenuItem>
- ) : null}
- {onOpen ? (
- <MenuItem role="menuitem" onClick={() => runAction(onOpen)}>
- Open folder
- </MenuItem>
- ) : null}
- {onOpenGfsLink ? (
- <MenuItem role="menuitem" onClick={() => runAction(onOpenGfsLink)}>
- Open GFS link
- </MenuItem>
- ) : null}
- {onPreview ? (
- <MenuItem role="menuitem" onClick={() => runAction(onPreview)}>
- Preview
- </MenuItem>
- ) : null}
- {onCreateFolder ? (
- <MenuItem role="menuitem" onClick={() => runAction(onCreateFolder)}>
- New folder
- </MenuItem>
- ) : null}
- {onRename ? (
- <MenuItem role="menuitem" onClick={() => runAction(onRename)}>
- Rename
- </MenuItem>
- ) : null}
- {onMove ? (
- <MenuItem role="menuitem" onClick={() => runAction(onMove)}>
- Move to…
- </MenuItem>
- ) : null}
- {onDownload ? (
- <MenuItem role="menuitem" onClick={() => runAction(onDownload)}>
- Download
- </MenuItem>
- ) : null}
- {onCopyLink ? (
- <MenuItem role="menuitem" onClick={() => runAction(onCopyLink)}>
- Copy GFS link
- </MenuItem>
- ) : null}
- {onDelete ? (
- <MenuItem color="danger" role="menuitem" onClick={() => runAction(onDelete)}>
- Delete
- </MenuItem>
- ) : null}
- </div>
- ) : null}
+ {open
+ ? createPortal(
+ <div
+ className="da-gfs-resource-menu__panel"
+ ref={panelRef}
+ role="menu"
+ style={
+ panelPosition
+ ? { left: panelPosition.left, top: panelPosition.top }
+ : { left: 0, top: 0, visibility: 'hidden' }
+ }
+ onKeyDown={handleMenuKeyDown}
+ >
+ {actionGroups.map((group, groupIndex) => (
+ <Fragment key={`group-${groupIndex}`}>
+ {groupIndex > 0 ? (
+ <div className="da-gfs-resource-menu__separator" role="separator" />
+ ) : null}
+ {group.map(action => (
+ <MenuItem
+ color={action.color}
+ key={action.key}
+ leadingIcon={action.icon}
+ role="menuitem"
+ onClick={() => runAction(action.onClick)}
+ >
+ {action.label}
+ </MenuItem>
+ ))}
+ </Fragment>
+ ))}
+ </div>,
+ document.body
+ )
+ : null}
</span>
)
}
diff --git a/desktop-app/ui/src/styles.css b/desktop-app/ui/src/styles.css
index 608810a74..e089d19fd 100644
--- a/desktop-app/ui/src/styles.css
+++ b/desktop-app/ui/src/styles.css
@@ -14742,29 +14742,30 @@ pre {
}
.da-gfs-resource-menu__panel {
- position: absolute;
- top: calc(100% + var(--space-1));
- right: 0;
- z-index: calc(var(--layer-dropdown) + 30);
- width: max-content;
- min-width: 184px;
- max-width: min(260px, calc(100vw - var(--space-4)));
+ position: fixed;
+ z-index: calc(var(--layer-dropdown) + 60);
+ width: min(360px, calc(100vw - (var(--space-4) * 2)));
+ max-height: calc(100vh - (var(--space-4) * 2));
display: grid;
- gap: var(--space-0-5);
- padding: var(--space-1);
+ gap: 0;
+ overflow-y: auto;
+ padding: var(--space-1-5);
border: 1px solid rgba(var(--edge-rgb), 0.46);
- border-radius: var(--radius-sm);
+ border-radius: var(--radius-md);
background: var(--bg-elev-2);
box-shadow: var(--shadow-hard);
+ scrollbar-width: thin;
}
.da-gfs-resource-menu__panel .ui-menu-item {
- min-height: 34px;
- padding: var(--space-1-5) var(--space-2-5);
+ min-height: 44px;
+ padding: 0 var(--space-2-5);
+ gap: var(--space-2);
border-radius: calc(var(--radius-sm) - 2px);
color: var(--text);
- font-size: var(--font-size-md);
- line-height: var(--line-height-tight);
+ font-size: var(--font-size-lg);
+ font-weight: var(--font-weight-medium);
+ line-height: var(--line-height-normal);
}
.da-gfs-resource-menu__panel .ui-menu-item:hover:enabled,
@@ -14774,6 +14775,18 @@ pre {
color: var(--text);
}
+.da-gfs-resource-menu__panel .ui-menu-item__icon {
+ width: 24px;
+ height: 24px;
+ flex: 0 0 24px;
+ color: var(--text-dim);
+}
+
+.da-gfs-resource-menu__panel .ui-menu-item__icon svg {
+ width: 18px;
+ height: 18px;
+}
+
.da-gfs-resource-menu__panel .ui-menu-item--danger {
color: var(--danger);
}
@@ -14784,9 +14797,10 @@ pre {
color: var(--danger);
}
-.da-gfs-drive__grid .da-gfs-resource-menu__panel {
- top: auto;
- bottom: calc(100% + var(--space-1));
+.da-gfs-resource-menu__separator {
+ height: 1px;
+ margin: var(--space-1) 0;
+ background: rgba(var(--edge-rgb), 0.32);
}
.da-gfs-link-modal {