History

fix: reconcile rebase with latest main

maria-rcks committed 3 months ago

Commit 378615b1 parent 8a3d81d243 files · +27464 −37571Browse files

Showing the changes to apps/web/src/components/ProjectScriptsControl.tsx (1 of 243 files). Show all

Unified · Split

apps/web/src/components/ProjectScriptsControl.tsx+26−1
@@ -389,7 +389,11 @@ export default function ProjectScriptsControl({ · 388 unmodified lines
389389 ) : (
390390 <GroupSeparator className="hidden @3xl/header-actions:block" />
391391 )}
392− <Menu highlightItemOnHover={false}>
392+ <Menu
393+ highlightItemOnHover={false}
394+ open={actionsMenuOpen.scripts}
395+ onOpenChange={(open) => setActionsMenuOpen({ scripts: open, imports: false })}
396+ >
393397 <MenuTrigger
394398 render={
395399 <Button
@@ -460,6 +464,27 @@ export default function ProjectScriptsControl({ · 64 unmodified lines
460464 </MenuPopup>
461465 </Menu>
462466 </ActionGroup>
467+ ) : importableScripts.length > 0 ? (
468+ <Menu
469+ highlightItemOnHover={false}
470+ open={actionsMenuOpen.imports}
471+ onOpenChange={(open) => setActionsMenuOpen({ scripts: false, imports: open })}
472+ >
473+ <MenuTrigger render={<Button size="xs" variant="outline" aria-label="Project actions" />}>
474+ <PlusIcon className="size-3.5" />
475+ <span className="sr-only @3xl/header-actions:not-sr-only @3xl/header-actions:ml-0.5">
476+ Add action
477+ </span>
478+ <ChevronDownIcon className="size-3.5" />
479+ </MenuTrigger>
480+ <MenuPopup align="end">
481+ {importMenuItems}
482+ <MenuItem className={dropdownItemClassName} onClick={openAddDialog}>
483+ <PlusIcon className="size-4" />
484+ Add action
485+ </MenuItem>
486+ </MenuPopup>
487+ </Menu>
463488 ) : (
464489 <Tooltip>
465490 <TooltipTrigger