Skip to content

The VS Code of video editing, built for agents.

TypeScript

feat: enhance context and dropdown menus with grouping and improved item alignment

konstantin-paulus9ccaac43cebc
diff --git a/apps/web/src/components/sidebar-left/asset-item.tsx b/apps/web/src/components/sidebar-left/asset-item.tsx
index fe01be29..a5ad3a95 100644
--- a/apps/web/src/components/sidebar-left/asset-item.tsx
+++ b/apps/web/src/components/sidebar-left/asset-item.tsx
@@ -8,6 +8,7 @@ import { replaceAssetSource, saveAssetAs } from "@/engine/asset-actions";
import {
ContextMenu,
ContextMenuContent,
+ ContextMenuGroup,
ContextMenuItem,
ContextMenuPortal,
ContextMenuSeparator,
@@ -158,28 +159,32 @@ export function LazyAssetItem(props: LazyAssetItemProps) {
<ContextMenuSubTrigger>Insert...</ContextMenuSubTrigger>
<ContextMenuPortal>
<ContextMenuSubContent class="w-[180px]">
- <ContextMenuItem onSelect={props.onInsertAtStart}>
- Insert at start
- <ContextMenuShortcut>⇧,</ContextMenuShortcut>
- </ContextMenuItem>
- <ContextMenuItem onSelect={props.onInsertAtPlayhead}>
- Insert at playhead
- <ContextMenuShortcut>,</ContextMenuShortcut>
- </ContextMenuItem>
+ <ContextMenuGroup>
+ <ContextMenuItem onSelect={props.onInsertAtStart}>
+ Insert at start
+ <ContextMenuShortcut>⇧,</ContextMenuShortcut>
+ </ContextMenuItem>
+ <ContextMenuItem onSelect={props.onInsertAtPlayhead}>
+ Insert at playhead
+ <ContextMenuShortcut>,</ContextMenuShortcut>
+ </ContextMenuItem>
+ </ContextMenuGroup>
</ContextMenuSubContent>
</ContextMenuPortal>
</ContextMenuSub>
<Show when={!props.multiple}>
<ContextMenuSeparator />
- <ContextMenuItem onSelect={() => setIsRenaming(true)}>
- Rename
- </ContextMenuItem>
- <ContextMenuItem onSelect={handleReplaceMedia}>
- Replace
- </ContextMenuItem>
- <ContextMenuItem onSelect={handleSaveAs}>
- Save as
- </ContextMenuItem>
+ <ContextMenuGroup>
+ <ContextMenuItem onSelect={() => setIsRenaming(true)}>
+ Rename
+ </ContextMenuItem>
+ <ContextMenuItem onSelect={handleReplaceMedia}>
+ Replace
+ </ContextMenuItem>
+ <ContextMenuItem onSelect={handleSaveAs}>
+ Save as
+ </ContextMenuItem>
+ </ContextMenuGroup>
</Show>
<ContextMenuSeparator />
<ContextMenuItem onSelect={props.onDelete}>
diff --git a/apps/web/src/components/timeline/layers/layers.tsx b/apps/web/src/components/timeline/layers/layers.tsx
index 1ab30d69..eea447e1 100644
--- a/apps/web/src/components/timeline/layers/layers.tsx
+++ b/apps/web/src/components/timeline/layers/layers.tsx
@@ -21,7 +21,9 @@ import {
DropdownMenu,
DropdownMenuCheckboxItem,
DropdownMenuContent,
+ DropdownMenuGroup,
DropdownMenuItem,
+ DropdownMenuItemDetail,
DropdownMenuPortal,
DropdownMenuRadioGroup,
DropdownMenuRadioItem,
@@ -218,47 +220,48 @@ export function Layers() {
<DropdownMenuContent class="w-[180px]">
<DropdownMenuItem onSelect={addLayer}>Add layer</DropdownMenuItem>
<DropdownMenuSeparator />
- <DropdownMenuSub>
- <DropdownMenuSubTrigger>Layer height</DropdownMenuSubTrigger>
- <DropdownMenuPortal>
- <DropdownMenuSubContent class="w-[140px]">
- <Index each={HEIGHT_PRESETS}>
- {(preset) => (
- <DropdownMenuCheckboxItem
- onSelect={() => setCommonHeight(preset().height)}
- checked={commonHeight() === preset().height}
- >
- {preset().label}
- <span class="text-xxs text-muted-foreground ml-auto">{preset().height}</span>
- </DropdownMenuCheckboxItem>
- )}
- </Index>
- </DropdownMenuSubContent>
- </DropdownMenuPortal>
- </DropdownMenuSub>
- <DropdownMenuSeparator />
- <DropdownMenuSub>
- <DropdownMenuSubTrigger>Time format</DropdownMenuSubTrigger>
- <DropdownMenuPortal>
- <DropdownMenuSubContent class="w-[200px]">
- <DropdownMenuRadioGroup
- value={timeFormat()}
- onChange={(value) => setTimeFormat(value as TimeFormat)}
- >
- <Index each={TIME_FORMAT_OPTIONS}>
- {(option) => (
- <DropdownMenuRadioItem value={option().value}>
- {option().label}
- <span class="text-xxs text-muted-foreground ml-auto">
- {option().example}
- </span>
- </DropdownMenuRadioItem>
- )}
- </Index>
- </DropdownMenuRadioGroup>
- </DropdownMenuSubContent>
- </DropdownMenuPortal>
- </DropdownMenuSub>
+ <DropdownMenuGroup>
+ <DropdownMenuSub>
+ <DropdownMenuSubTrigger>Layer height</DropdownMenuSubTrigger>
+ <DropdownMenuPortal>
+ <DropdownMenuSubContent class="w-[160px]">
+ <DropdownMenuGroup>
+ <Index each={HEIGHT_PRESETS}>
+ {(preset) => (
+ <DropdownMenuCheckboxItem
+ onSelect={() => setCommonHeight(preset().height)}
+ checked={commonHeight() === preset().height}
+ >
+ {preset().label}
+ <DropdownMenuItemDetail class="ml-auto">{preset().height}</DropdownMenuItemDetail>
+ </DropdownMenuCheckboxItem>
+ )}
+ </Index>
+ </DropdownMenuGroup>
+ </DropdownMenuSubContent>
+ </DropdownMenuPortal>
+ </DropdownMenuSub>
+ <DropdownMenuSub>
+ <DropdownMenuSubTrigger>Time format</DropdownMenuSubTrigger>
+ <DropdownMenuPortal>
+ <DropdownMenuSubContent class="w-[200px]">
+ <DropdownMenuRadioGroup
+ value={timeFormat()}
+ onChange={(value) => setTimeFormat(value as TimeFormat)}
+ >
+ <Index each={TIME_FORMAT_OPTIONS}>
+ {(option) => (
+ <DropdownMenuRadioItem value={option().value}>
+ {option().label}
+ <DropdownMenuItemDetail class="ml-auto">{option().example}</DropdownMenuItemDetail>
+ </DropdownMenuRadioItem>
+ )}
+ </Index>
+ </DropdownMenuRadioGroup>
+ </DropdownMenuSubContent>
+ </DropdownMenuPortal>
+ </DropdownMenuSub>
+ </DropdownMenuGroup>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenu>
diff --git a/apps/web/src/components/ui/context-menu.tsx b/apps/web/src/components/ui/context-menu.tsx
index 3c155a9e..b82d52f8 100644
--- a/apps/web/src/components/ui/context-menu.tsx
+++ b/apps/web/src/components/ui/context-menu.tsx
@@ -5,13 +5,16 @@
// Copied from https://shadcn-solid.netlify.app/docs/components/context-menu
import type { Accessor, ComponentProps, ValidComponent } from "solid-js"
-import { createContext, splitProps, useContext } from "solid-js"
+import { createContext, mergeProps, splitProps, useContext } from "solid-js"
import { ContextMenu as ContextMenuPrimitive } from "@kobalte/core/context-menu"
import { Icon } from "@/components/ui/icon"
import { cx } from "@/lib/cva"
export const ContextMenuPortal = ContextMenuPrimitive.Portal
+
+/** Lifts a submenu by its padding + border so its first item lines up with the trigger. */
+const SUB_SHIFT = -9
const ContextMenuContentDisabledContext = createContext<Accessor<boolean>>()
const useContextMenuContentDisabled = () => {
@@ -51,7 +54,12 @@ export type ContextMenuSubProps = ComponentProps<
>
export const ContextMenuSub = (props: ContextMenuSubProps) => {
- return <ContextMenuPrimitive.Sub data-slot="context-menu-sub" {...props} />
+ const merge = mergeProps<ContextMenuSubProps[]>(
+ { shift: SUB_SHIFT },
+ props,
+ )
+
+ return <ContextMenuPrimitive.Sub data-slot="context-menu-sub" {...merge} />
}
export type ContextMenuRadioGroupProps<T extends ValidComponent = "div"> =
diff --git a/apps/web/src/components/ui/dropdown-menu.tsx b/apps/web/src/components/ui/dropdown-menu.tsx
index 00ed7a89..f6906874 100644
--- a/apps/web/src/components/ui/dropdown-menu.tsx
+++ b/apps/web/src/components/ui/dropdown-menu.tsx
@@ -13,6 +13,11 @@ import { Icon } from "@/components/ui/icon"
export const DropdownMenuPortal = DropdownMenuPrimitive.Portal
+/** Keeps the horizontal offset the submenu had as a `translate-x-2.5` class. */
+const SUB_GUTTER = 10
+/** Lifts a submenu by its padding + border so its first item lines up with the trigger. */
+const SUB_SHIFT = -9
+
export type DropdownMenuProps = ComponentProps<typeof DropdownMenuPrimitive>
export const DropdownMenu = (props: DropdownMenuProps) => {
@@ -63,7 +68,12 @@ export type DropdownMenuSubProps = ComponentProps<
>
export const DropdownMenuSub = (props: DropdownMenuSubProps) => {
- return <DropdownMenuPrimitive.Sub data-slot="dropdown-menu-sub" {...props} />
+ const merge = mergeProps<DropdownMenuSubProps[]>(
+ { gutter: SUB_GUTTER, shift: SUB_SHIFT },
+ props,
+ )
+
+ return <DropdownMenuPrimitive.Sub data-slot="dropdown-menu-sub" {...merge} />
}
export type DropdownMenuRadioGroupProps<T extends ValidComponent = "div"> =
@@ -126,7 +136,7 @@ export const DropdownMenuSubContent = <T extends ValidComponent = "div">(
<DropdownMenuPrimitive.SubContent
data-slot="dropdown-menu-sub-content"
class={cx(
- "bg-popover translate-x-2.5 -translate-y-2 text-popover-foreground data-[expanded]:animate-in data-[closed]:animate-out data-[closed]:fade-out-0 data-[expanded]:fade-in-0 data-[closed]:zoom-out-95 data-[expanded]:zoom-in-95 z-[10000] min-w-[8rem] origin-(--kb-menu-content-transform-origin) overflow-x-hidden overflow-y-auto flex flex-col gap-2 rounded-xl border border-border p-2 shadow-[0px_0px_1px_2px_rgba(0,0,0,0.12),0px_4px_12px_8px_rgba(0,0,0,0.12),0px_12px_16px_0px_rgba(0,0,0,0.16)] outline-none max-h-[var(--kb-popper-content-available-height)]",
+ "bg-popover text-popover-foreground data-[expanded]:animate-in data-[closed]:animate-out data-[closed]:fade-out-0 data-[expanded]:fade-in-0 data-[closed]:zoom-out-95 data-[expanded]:zoom-in-95 z-[10000] min-w-[8rem] origin-(--kb-menu-content-transform-origin) overflow-x-hidden overflow-y-auto flex flex-col gap-2 rounded-xl border border-border p-2 shadow-[0px_0px_1px_2px_rgba(0,0,0,0.12),0px_4px_12px_8px_rgba(0,0,0,0.12),0px_12px_16px_0px_rgba(0,0,0,0.16)] outline-none max-h-[var(--kb-popper-content-available-height)]",
"[[data-popper-positioner][style*='--kb-popper-content-transform-origin:_top']>[data-slot=dropdown-menu-sub-content]]:slide-in-from-top-2 [[data-popper-positioner][style*='--kb-popper-content-transform-origin:_bottom']>[data-slot=dropdown-menu-sub-content]]:slide-in-from-bottom-2 [[data-popper-positioner][style*='--kb-popper-content-transform-origin:_left']>[data-slot=dropdown-menu-sub-content]]:slide-in-from-left-2 [[data-popper-positioner][style*='--kb-popper-content-transform-origin:_right']>[data-slot=dropdown-menu-sub-content]]:slide-in-from-right-2",
props.class,
)}
@@ -206,14 +216,14 @@ export const DropdownMenuCheckboxItem = <T extends ValidComponent = "div">(
<DropdownMenuPrimitive.CheckboxItem
data-slot="dropdown-menu-checkbox-item"
class={cx(
- "h-7 group data-highlighted:bg-primary data-highlighted:text-foreground relative flex cursor-default items-center gap-0 rounded-sm py-1.5 pr-2 pl-7 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-6",
+ "group data-[highlighted]:bg-primary data-[highlighted]:text-primary-foreground relative flex cursor-default items-center gap-1 rounded-md bg-popover pr-2 pl-7 py-0 text-xs outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 h-7 w-full",
props.class,
)}
{...rest}
>
- <span class="pointer-events-none absolute left-0 flex size-6 items-center justify-center">
+ <span class="pointer-events-none absolute left-0.5 flex size-6 items-center justify-center">
<DropdownMenuPrimitive.ItemIndicator>
- <Icon name="confirm-check" class="text-foreground" />
+ <Icon name="confirm-check" class="text-foreground group-data-[highlighted]:text-primary-foreground" />
</DropdownMenuPrimitive.ItemIndicator>
</span>
{props.children}
@@ -236,28 +246,14 @@ export const DropdownMenuRadioItem = <T extends ValidComponent = "div">(
<DropdownMenuPrimitive.RadioItem
data-slot="dropdown-menu-radio-item"
class={cx(
- "group data-[highlighted]:bg-primary relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+ "group data-[highlighted]:bg-primary data-[highlighted]:text-primary-foreground relative flex cursor-default items-center gap-1 rounded-md bg-popover pr-2 pl-7 py-0 text-xs outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 h-7 w-full",
props.class,
)}
{...rest}
>
- <span class="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
- <DropdownMenuPrimitive.ItemIndicator
- as="svg"
- xmlns="http://www.w3.org/2000/svg"
- class="size-1"
- viewBox="0 0 24 24"
- >
- <circle
- cx="12"
- cy="12"
- r="10"
- fill="currentColor"
- stroke="currentColor"
- stroke-linecap="round"
- stroke-linejoin="round"
- stroke-width="2"
- />
+ <span class="pointer-events-none absolute left-0.5 flex size-6 items-center justify-center">
+ <DropdownMenuPrimitive.ItemIndicator>
+ <Icon name="confirm-check" class="text-foreground group-data-[highlighted]:text-primary-foreground" />
</DropdownMenuPrimitive.ItemIndicator>
</span>
{props.children}