Skip to content

AI-native design editor. Open-source Figma alternative.

feat: add Figma's layer, frame, and page navigation keys (#1202)

Danila Poyarkovb1997c540b8d
diff --git a/changes/1202/added.md b/changes/1202/added.md
new file mode 100644
index 000000000..d3f71e6f3
--- /dev/null
+++ b/changes/1202/added.md
@@ -0,0 +1 @@
+- Figma's navigation keys move through layers and the document: Enter selects children, Shift+Enter or \ selects the parent, Tab and Shift+Tab select siblings, N and Shift+N zoom to the next or previous frame, Page Down and Page Up switch pages, and Shift+0 zooms to 100%.
diff --git a/changes/1202/fixed.md b/changes/1202/fixed.md
new file mode 100644
index 000000000..15762f803
--- /dev/null
+++ b/changes/1202/fixed.md
@@ -0,0 +1,2 @@
+- Menus taller than the window scroll instead of running off its edge.
+- The mobile file menu lines its labels up beside their icons instead of at the far edge.
diff --git a/desktop/generated/menu.json b/desktop/generated/menu.json
index b7dcef1cc..4cb929905 100644
--- a/desktop/generated/menu.json
+++ b/desktop/generated/menu.json
@@ -187,6 +187,29 @@
{
"type": "separator"
},
+ {
+ "id": "view.zoomPreviousFrame",
+ "label": "Zoom to Previous Frame",
+ "accelerator": "Shift+N"
+ },
+ {
+ "id": "view.zoomNextFrame",
+ "label": "Zoom to Next Frame",
+ "accelerator": "N"
+ },
+ {
+ "id": "view.previousPage",
+ "label": "Previous Page",
+ "accelerator": "PageUp"
+ },
+ {
+ "id": "view.nextPage",
+ "label": "Next Page",
+ "accelerator": "PageDown"
+ },
+ {
+ "type": "separator"
+ },
{
"id": "view-split-right",
"label": "Split Right"
diff --git a/packages/core/src/editor/bridges/frames.ts b/packages/core/src/editor/bridges/frames.ts
new file mode 100644
index 000000000..a02097268
--- /dev/null
+++ b/packages/core/src/editor/bridges/frames.ts
@@ -0,0 +1,52 @@
+import type { SceneNode, NodeType } from '@open-pencil/scene-graph'
+
+import type { createSelectionActions } from '#core/editor/selection'
+import type { EditorContext } from '#core/editor/types'
+import type { createViewportActions } from '#core/editor/viewport'
+
+type SelectionActions = ReturnType<typeof createSelectionActions>
+type ViewportActions = ReturnType<typeof createViewportActions>
+
+const FRAME_TYPES = new Set<NodeType>(['FRAME', 'COMPONENT', 'COMPONENT_SET', 'INSTANCE'])
+
+/**
+ * Figma's N and Shift+N: zoom to the next or previous top-level frame, including frames placed
+ * in sections. Frames go left to right, then top to bottom, the order Figma documents for them.
+ */
+export function createFrameNavigationBridge(
+ ctx: EditorContext,
+ selection: SelectionActions,
+ viewport: ViewportActions
+) {
+ function topLevelFrames(parentId: string): SceneNode[] {
+ return ctx.graph.getChildren(parentId).flatMap((node) => {
+ if (!node.visible) return []
+ if (node.type === 'SECTION') return topLevelFrames(node.id)
+ return FRAME_TYPES.has(node.type) ? [node] : []
+ })
+ }
+
+ function zoomToAdjacentFrame(step: 1 | -1) {
+ const frames = topLevelFrames(ctx.state.currentPageId)
+ .map((node) => ({ node, position: ctx.graph.getAbsolutePosition(node.id) }))
+ .sort((a, b) => a.position.x - b.position.x || a.position.y - b.position.y)
+ .map(({ node }) => node)
+ if (frames.length === 0) return
+ const ids = new Set(frames.map((frame) => frame.id))
+ const [selectedId] = ctx.state.selectedIds
+ const current = selectedId
+ ? ctx.graph.closest(selectedId, (node) => ids.has(node.id))
+ : undefined
+ // Without a frame selected, next starts at the first frame and previous at the last.
+ const start = step > 0 ? -1 : frames.length
+ const index = current ? frames.findIndex((frame) => frame.id === current.id) : start
+ const target = frames[(index + step + frames.length) % frames.length]
+ selection.select([target.id])
+ viewport.zoomToSelection()
+ }
+
+ return {
+ zoomToNextFrame: () => zoomToAdjacentFrame(1),
+ zoomToPreviousFrame: () => zoomToAdjacentFrame(-1)
+ }
+}
diff --git a/packages/core/src/editor/create.ts b/packages/core/src/editor/create.ts
index d4f091299..d28364d75 100644
--- a/packages/core/src/editor/create.ts
+++ b/packages/core/src/editor/create.ts
@@ -26,6 +26,7 @@ import { fontResolver } from '#core/text/resolver'
import { createAlignmentActions } from './alignment'
import { createClipboardBridge } from './bridges/clipboard'
import { createComponentBridge } from './bridges/components'
+import { createFrameNavigationBridge } from './bridges/frames'
import { createLintFixBridge } from './bridges/lint'
import { createStructureBridge } from './bridges/structure'
import { createUndoBridge } from './bridges/undo'
@@ -284,6 +285,7 @@ export function createEditor(options?: EditorOptions) {
const clipboardBridge = createClipboardBridge(clipboard, selection)
const componentBridge = createComponentBridge(components, selection, structure, pages)
const structureBridge = createStructureBridge(structure, selection)
+ const frameNavigation = createFrameNavigationBridge(ctx, selection, viewport)
const undoBridge = createUndoBridge(undoActions, selection, nodes.flushNudge)
const lintFixBridge = createLintFixBridge(ctx, nodes, structure, clipboard)
const textSelectionStyle = createTextSelectionStyle(ctx, text.runTextEditStep)
@@ -447,6 +449,7 @@ export function createEditor(options?: EditorOptions) {
// Viewport
...viewport,
+ ...frameNavigation,
// Undo — bridge functions that need cross-module refs
...undoBridge,
diff --git a/packages/core/src/editor/pages.ts b/packages/core/src/editor/pages.ts
index fa5e60939..0504067ff 100644
--- a/packages/core/src/editor/pages.ts
+++ b/packages/core/src/editor/pages.ts
@@ -308,6 +308,15 @@ export function createPageActions(ctx: EditorContext, drawing?: PageDrawing) {
if (prepared) commitPageSwitch(prepared)
}
+ /** Opens the page before or after the current one in the pages panel, stopping at the ends. */
+ async function switchToAdjacentPage(step: 1 | -1): Promise<void> {
+ const pages = ctx.graph.getPages()
+ const index = pages.findIndex((page) => page.id === ctx.state.currentPageId)
+ const next = index + step
+ if (index === -1 || next < 0 || next >= pages.length) return
+ await switchPage(pages[next].id)
+ }
+
function clearPageViewports() {
populationWorkerGeneration++
pageSwitchGeneration++
@@ -375,6 +384,8 @@ export function createPageActions(ctx: EditorContext, drawing?: PageDrawing) {
preparePage,
commitPageSwitch,
switchPage,
+ switchToNextPage: () => switchToAdjacentPage(1),
+ switchToPreviousPage: () => switchToAdjacentPage(-1),
addPage,
deletePage,
movePage,
diff --git a/packages/core/src/editor/selection.ts b/packages/core/src/editor/selection.ts
index c3fb111a7..086500afd 100644
--- a/packages/core/src/editor/selection.ts
+++ b/packages/core/src/editor/selection.ts
@@ -1,5 +1,6 @@
import { createSelectionContainerActions } from './selection/container'
import { createSelectionHitTestActions } from './selection/hit-test'
+import { createSelectionNavigationActions } from './selection/navigation'
import { createSelectionOverlayActions } from './selection/overlays'
import { createSelectionReadActions } from './selection/read'
import type { EditorContext } from './types'
@@ -59,6 +60,7 @@ export function createSelectionActions(ctx: EditorContext) {
const containerActions = createSelectionContainerActions(ctx)
const hitTestActions = createSelectionHitTestActions(ctx, select, clearSelection)
+ const navigationActions = createSelectionNavigationActions(ctx, select)
const overlayActions = createSelectionOverlayActions(ctx)
const readActions = createSelectionReadActions(ctx)
@@ -67,6 +69,7 @@ export function createSelectionActions(ctx: EditorContext) {
clearSelection,
selectAll,
selectInverse,
+ ...navigationActions,
...overlayActions,
...containerActions,
...readActions,
diff --git a/packages/core/src/editor/selection/navigation.ts b/packages/core/src/editor/selection/navigation.ts
new file mode 100644
index 000000000..b76b0e812
--- /dev/null
+++ b/packages/core/src/editor/selection/navigation.ts
@@ -0,0 +1,53 @@
+import type { EditorContext } from '#core/editor/types'
+
+type Select = (ids: string[]) => void
+
+/** Figma's keyboard moves through the layer tree: Enter, Shift+Enter, Tab, and Shift+Tab. */
+export function createSelectionNavigationActions(ctx: EditorContext, select: Select) {
+ function selectedNodes() {
+ return [...ctx.state.selectedIds].flatMap((id) => {
+ const node = ctx.graph.getNode(id)
+ return node ? [node] : []
+ })
+ }
+
+ /** Selects the children of every selected layer that has any; a selection without any stays. */
+ function selectChildren() {
+ const children = selectedNodes().flatMap((node) => node.childIds)
+ if (children.length > 0) select(children)
+ }
+
+ /** Selects the parents of the selected layers; layers directly on the page stay selected. */
+ function selectParent() {
+ const nodes = selectedNodes()
+ const parents = nodes.map((node) => {
+ const parent = node.parentId ? ctx.graph.getNode(node.parentId) : undefined
+ return parent && parent.type !== 'CANVAS' ? parent.id : node.id
+ })
+ if (parents.some((id, index) => id !== nodes[index].id)) select(parents)
+ }
+
+ /**
+ * Moves each selected layer to its sibling, wrapping at the ends. Next goes down the layers
+ * panel, which lists the topmost layer first, so it steps back through the children.
+ */
+ function selectSibling(step: 1 | -1) {
+ const nodes = selectedNodes()
+ if (nodes.length === 0) return
+ select(
+ nodes.map((node) => {
+ const siblings = node.parentId ? (ctx.graph.getNode(node.parentId)?.childIds ?? []) : []
+ const index = siblings.indexOf(node.id)
+ if (index === -1) return node.id
+ return siblings[(index - step + siblings.length) % siblings.length]
+ })
+ )
+ }
+
+ return {
+ selectChildren,
+ selectParent,
+ selectNextSibling: () => selectSibling(1),
+ selectPreviousSibling: () => selectSibling(-1)
+ }
+}
diff --git a/packages/core/tests/editor/bridges/frames.test.ts b/packages/core/tests/editor/bridges/frames.test.ts
new file mode 100644
index 000000000..3ff5fcafc
--- /dev/null
+++ b/packages/core/tests/editor/bridges/frames.test.ts
@@ -0,0 +1,60 @@
+import { describe, expect, test } from 'bun:test'
+
+import { createEditor } from '@open-pencil/core/editor'
+
+const VIEWPORT = { width: 800, height: 600 }
+
+// Figma's N and Shift+N.
+describe('frame navigation', () => {
+ function frames() {
+ const editor = createEditor({ getViewportSize: () => VIEWPORT })
+ const pageId = editor.state.currentPageId
+ const right = editor.graph.createNode('FRAME', pageId, { x: 600, y: 0, width: 100, height: 100 })
+ const left = editor.graph.createNode('FRAME', pageId, { x: 0, y: 0, width: 100, height: 100 })
+ const section = editor.graph.createNode('SECTION', pageId, { x: 200, y: 0, width: 300 })
+ const inSection = editor.graph.createNode('COMPONENT', section.id, {
+ x: 100,
+ y: 0,
+ width: 100,
+ height: 100
+ })
+ editor.graph.createNode('RECTANGLE', pageId, { x: 100, y: 0, width: 10, height: 10 })
+ editor.graph.createNode('FRAME', pageId, { x: 50, y: 0, visible: false })
+ return { editor, left, inSection, right }
+ }
+
+ test('steps through visible top-level frames left to right, into sections, and wraps', () => {
+ const { editor, left, inSection, right } = frames()
+
+ editor.zoomToNextFrame()
+ expect(editor.state.selectedIds).toEqual(new Set([left.id]))
+ editor.zoomToNextFrame()
+ expect(editor.state.selectedIds).toEqual(new Set([inSection.id]))
+ editor.zoomToNextFrame()
+ expect(editor.state.selectedIds).toEqual(new Set([right.id]))
+ editor.zoomToNextFrame()
+ expect(editor.state.selectedIds).toEqual(new Set([left.id]))
+ })
+
+ test('previous starts at the last frame and continues from a selected child', () => {
+ const { editor, inSection, right } = frames()
+
+ editor.zoomToPreviousFrame()
+ expect(editor.state.selectedIds).toEqual(new Set([right.id]))
+
+ const child = editor.graph.createNode('RECTANGLE', right.id, { width: 10, height: 10 })
+ editor.select([child.id])
+ editor.zoomToPreviousFrame()
+ expect(editor.state.selectedIds).toEqual(new Set([inSection.id]))
+ })
+
+ test('zooms to the frame it selects', () => {
+ const { editor, right } = frames()
+ editor.zoomToPreviousFrame()
+ const { panX, panY, zoom } = editor.state
+ const centerX = (VIEWPORT.width / 2 - panX) / zoom
+ const centerY = (VIEWPORT.height / 2 - panY) / zoom
+ expect(centerX).toBeCloseTo(right.x + right.width / 2)
+ expect(centerY).toBeCloseTo(right.y + right.height / 2)
+ })
+})
diff --git a/packages/core/tests/editor/pages/navigation.test.ts b/packages/core/tests/editor/pages/navigation.test.ts
new file mode 100644
index 000000000..7ddf975b0
--- /dev/null
+++ b/packages/core/tests/editor/pages/navigation.test.ts
@@ -0,0 +1,26 @@
+import { describe, expect, test } from 'bun:test'
+
+import { createEditor } from '@open-pencil/core/editor'
+
+const VIEWPORT = { width: 800, height: 600 }
+
+// Figma's Page Down and Page Up.
+describe('page navigation', () => {
+ test('moves to the next and previous page and stops at the ends', async () => {
+ const editor = createEditor({ getViewportSize: () => VIEWPORT })
+ const first = editor.state.currentPageId
+ const second = editor.graph.addPage('Second').id
+
+ await editor.switchToPreviousPage()
+ expect(editor.state.currentPageId).toBe(first)
+
+ await editor.switchToNextPage()
+ expect(editor.state.currentPageId).toBe(second)
+
+ await editor.switchToNextPage()
+ expect(editor.state.currentPageId).toBe(second)
+
+ await editor.switchToPreviousPage()
+ expect(editor.state.currentPageId).toBe(first)
+ })
+})
diff --git a/packages/core/tests/editor/selection/navigation.test.ts b/packages/core/tests/editor/selection/navigation.test.ts
new file mode 100644
index 000000000..da38eecd2
--- /dev/null
+++ b/packages/core/tests/editor/selection/navigation.test.ts
@@ -0,0 +1,67 @@
+import { describe, expect, test } from 'bun:test'
+
+import { createEditor } from '@open-pencil/core/editor'
+
+const VIEWPORT = { width: 800, height: 600 }
+
+function layerTree() {
+ const editor = createEditor({ getViewportSize: () => VIEWPORT })
+ const pageId = editor.state.currentPageId
+ const frame = editor.graph.createNode('FRAME', pageId, { name: 'Frame' })
+ const bottom = editor.graph.createNode('RECTANGLE', frame.id, { name: 'Bottom' })
+ const middle = editor.graph.createNode('ELLIPSE', frame.id, { name: 'Middle' })
+ const top = editor.graph.createNode('TEXT', frame.id, { name: 'Top' })
+ return { editor, pageId, frame, bottom, middle, top }
+}
+
+// Figma help, Select layers and objects: Enter, Shift+Enter, Tab, and Shift+Tab.
+describe('keyboard layer navigation', () => {
+ test('selectChildren selects every child of the selected layer', () => {
+ const { editor, frame, bottom, middle, top } = layerTree()
+ editor.select([frame.id])
+
+ editor.selectChildren()
+
+ expect(editor.state.selectedIds).toEqual(new Set([bottom.id, middle.id, top.id]))
+ })
+
+ test('selectChildren keeps a selection without children', () => {
+ const { editor, middle } = layerTree()
+ editor.select([middle.id])
+
+ editor.selectChildren()
+
+ expect(editor.state.selectedIds).toEqual(new Set([middle.id]))
+ })
+
+ test('selectParent selects the parent and stops at the page', () => {
+ const { editor, frame, middle } = layerTree()
+ editor.select([middle.id])
+
+ editor.selectParent()
+ expect(editor.state.selectedIds).toEqual(new Set([frame.id]))
+
+ editor.selectParent()
+ expect(editor.state.selectedIds).toEqual(new Set([frame.id]))
+ })
+
+ test('next sibling goes down the layers panel and wraps', () => {
+ const { editor, bottom, middle, top } = layerTree()
+ editor.select([top.id])
+
+ editor.selectNextSibling()
+ expect(editor.state.selectedIds).toEqual(new Set([middle.id]))
+ editor.selectNextSibling()
+ expect(editor.state.selectedIds).toEqual(new Set([bottom.id]))
+ editor.selectNextSibling()
+ expect(editor.state.selectedIds).toEqual(new Set([top.id]))
+ })
+
+ test('previous sibling goes up the layers panel and wraps', () => {
+ const { editor, bottom, top } = layerTree()
+ editor.select([top.id])
+
+ editor.selectPreviousSibling()
+ expect(editor.state.selectedIds).toEqual(new Set([bottom.id]))
+ })
+})
diff --git a/packages/docs/reference/figma-compatibility.md b/packages/docs/reference/figma-compatibility.md
index da293cf4e..80ada88cf 100644
--- a/packages/docs/reference/figma-compatibility.md
+++ b/packages/docs/reference/figma-compatibility.md
@@ -22,7 +22,7 @@ Feature-by-feature comparison of Figma Design capabilities with Open Pencil's cu
| Canvas guides | 🔲 | Figma supports draggable guides from rulers |
| Actions menu / command palette | 🔲 | Figma's quick actions search |
| Context menu | ✅ | Right-click with clipboard, z-order, grouping, component, visibility, lock, move-to-page actions |
-| Keyboard shortcuts | 🟡 | Core shortcuts + components + z-order + visibility/lock implemented; Scale, Arrow, Pencil, flip, text formatting not yet wired |
+| Keyboard shortcuts | 🟡 | Tools, editing, components, z-order, visibility/lock, flip, text formatting, and canvas and layer navigation implemented; Scale, Arrow, Eyedropper, and the zoom tool not yet wired |
| Find and replace | 🔲 | Text search/replace across document |
| Layer outlines view | 🔲 | Wireframe view of all layers |
| Custom file thumbnails | 🔲 | Thumbnail generated on export, but no custom thumbnail picker |
diff --git a/packages/docs/reference/keyboard-shortcuts.md b/packages/docs/reference/keyboard-shortcuts.md
index 0458a7900..4fc8e0a1b 100644
--- a/packages/docs/reference/keyboard-shortcuts.md
+++ b/packages/docs/reference/keyboard-shortcuts.md
@@ -66,21 +66,38 @@ Full Figma-compatible shortcut map. ✅ = implemented.
| Shortcut | Action | Status |
|----------|--------|--------|
-| <kbd>⌘</kbd><kbd>'</kbd> | Pixel Grid | 🔲 |
+| <kbd>⇧</kbd><kbd>'</kbd> | Pixel Grid | ✅ |
+| <kbd>⇧</kbd><kbd>⌘</kbd><kbd>'</kbd> | Snap to Pixel Grid | ✅ |
| <kbd>⌃</kbd><kbd>G</kbd> | Layout Guides | 🔲 |
-| <kbd>⇧</kbd><kbd>R</kbd> | Rulers | 🔲 |
+| <kbd>⇧</kbd><kbd>R</kbd> | Rulers | ✅ |
| <kbd>⇧</kbd><kbd>C</kbd> | Show/Hide Comments | ✅ |
| <kbd>⌘</kbd><kbd>\\</kbd> | Show/Hide UI | ✅ |
| <kbd>⌥</kbd><kbd>⌘</kbd><kbd>↩</kbd> | Preview controls | ✅ |
| <kbd>⌘</kbd><kbd>=</kbd> | Zoom In | ✅ |
| <kbd>⌘</kbd><kbd>-</kbd> | Zoom Out | ✅ |
+| <kbd>+</kbd> / <kbd>-</kbd> | Zoom In / Out | ✅ |
| <kbd>⌘</kbd><kbd>0</kbd> | Zoom to 100% | ✅ |
+| <kbd>⇧</kbd><kbd>0</kbd> | Zoom to 100% (alt) | ✅ |
| <kbd>⌘</kbd><kbd>1</kbd> | Zoom to Fit | ✅ |
| <kbd>⌘</kbd><kbd>2</kbd> | Zoom to Selection | ✅ |
| <kbd>⇧</kbd><kbd>1</kbd> | Zoom to Fit (alt) | ✅ |
| <kbd>⇧</kbd><kbd>2</kbd> | Zoom to Selection (alt) | ✅ |
+| <kbd>N</kbd> | Zoom to Next Frame | ✅ |
+| <kbd>⇧</kbd><kbd>N</kbd> | Zoom to Previous Frame | ✅ |
+| <kbd>Page Down</kbd> | Next Page | ✅ |
+| <kbd>Page Up</kbd> | Previous Page | ✅ |
+| <kbd>Z</kbd> | Zoom Tool | 🔲 |
| <kbd>⌘</kbd><kbd>J</kbd> | Toggle AI Chat | ✅ |
+## Selection
+
+| Shortcut | Action | Status |
+|----------|--------|--------|
+| <kbd>↩</kbd> | Select Children | ✅ |
+| <kbd>⇧</kbd><kbd>↩</kbd> or <kbd>\\</kbd> | Select Parent | ✅ |
+| <kbd>⇥</kbd> | Select Next Sibling | ✅ |
+| <kbd>⇧</kbd><kbd>⇥</kbd> | Select Previous Sibling | ✅ |
+
## Object
| Shortcut | Action | Status |
diff --git a/packages/docs/user-guide/canvas-navigation.md b/packages/docs/user-guide/canvas-navigation.md
index 9e29689b9..cd601da2f 100644
--- a/packages/docs/user-guide/canvas-navigation.md
+++ b/packages/docs/user-guide/canvas-navigation.md
@@ -38,14 +38,23 @@ Pinch-to-zoom on UI panels (layers, properties) is prevented so it doesn't accid
| Hand tool | <kbd>H</kbd> | <kbd>H</kbd> |
| Zoom in | <kbd>⌘</kbd><kbd>+</kbd> | <kbd>Ctrl</kbd> + <kbd>+</kbd> |
| Zoom out | <kbd>⌘</kbd><kbd>−</kbd> | <kbd>Ctrl</kbd> + <kbd>−</kbd> |
-| Zoom to 100% | <kbd>⌘</kbd><kbd>0</kbd> | <kbd>Ctrl</kbd> + <kbd>0</kbd> |
+| Zoom in / out | <kbd>+</kbd> / <kbd>−</kbd> | <kbd>+</kbd> / <kbd>−</kbd> |
+| Zoom to 100% | <kbd>⇧</kbd><kbd>0</kbd> or <kbd>⌘</kbd><kbd>0</kbd> | <kbd>Shift</kbd> + <kbd>0</kbd> or <kbd>Ctrl</kbd> + <kbd>0</kbd> |
| Zoom to fit | <kbd>⇧</kbd><kbd>1</kbd> | <kbd>Shift</kbd> + <kbd>1</kbd> |
| Zoom to selection | <kbd>⇧</kbd><kbd>2</kbd> | <kbd>Shift</kbd> + <kbd>2</kbd> |
+| Zoom to next / previous frame | <kbd>N</kbd> / <kbd>⇧</kbd><kbd>N</kbd> | <kbd>N</kbd> / <kbd>Shift</kbd> + <kbd>N</kbd> |
+| Next / previous page | <kbd>Page Down</kbd> / <kbd>Page Up</kbd> | <kbd>Page Down</kbd> / <kbd>Page Up</kbd> |
| Pixel grid | <kbd>⇧</kbd><kbd>'</kbd> | <kbd>Shift</kbd> + <kbd>'</kbd> |
| Snap to pixel grid | <kbd>⇧</kbd><kbd>⌘</kbd><kbd>'</kbd> | <kbd>Shift</kbd> + <kbd>Ctrl</kbd> + <kbd>'</kbd> |
| Rulers | <kbd>⇧</kbd><kbd>R</kbd> | <kbd>Shift</kbd> + <kbd>R</kbd> |
| Multiplayer cursors | <kbd>⌥</kbd><kbd>⌘</kbd><kbd>\\</kbd> | <kbd>Alt</kbd> + <kbd>Ctrl</kbd> + <kbd>\\</kbd> |
+## Frames and Pages
+
+<kbd>N</kbd> selects the next top-level frame on the page and zooms to it; <kbd>Shift</kbd> + <kbd>N</kbd> goes back. Frames inside sections count, hidden ones do not, and the order runs left to right, then top to bottom, wrapping at the ends. With a layer inside a frame selected, the step starts from that frame.
+
+<kbd>Page Down</kbd> and <kbd>Page Up</kbd> open the next and previous page in the Pages panel's order.
+
## Pixel Grid
Zoomed in far enough that each document pixel covers eight screen pixels (800% on a standard display, 400% on a Retina one), the canvas shows a line at every pixel, as in Figma. Turn it off or on with **View → Pixel Grid**.
diff --git a/packages/docs/user-guide/selection-and-manipulation.md b/packages/docs/user-guide/selection-and-manipulation.md
index a2e650bb1..23e3cd2dd 100644
--- a/packages/docs/user-guide/selection-and-manipulation.md
+++ b/packages/docs/user-guide/selection-and-manipulation.md
@@ -16,6 +16,9 @@ Select objects to move, resize, rotate, duplicate, and organize them on the canv
- **Double-click a frame's or component's name** above it on the canvas to rename it in place
- **Marquee drag** — drag on empty canvas to draw a selection rectangle; intersecting nodes are selected on release. Started inside a top-level frame without auto layout or a section, it selects that container's layers; from the page, a frame or section that holds layers is selected only when fully enclosed
- <kbd>⌘</kbd><kbd>A</kbd> — select all nodes on the current page
+- <kbd>Enter</kbd> — select the children of the selected layers; on a vector it edits the path and on text it edits the text
+- <kbd>Shift</kbd> + <kbd>Enter</kbd> or <kbd>\\</kbd> — select the parent of the selected layers
+- <kbd>Tab</kbd> / <kbd>Shift</kbd> + <kbd>Tab</kbd> — select the next or previous sibling, going down or up the layers panel and wrapping at the ends
- **Click empty canvas** — deselect all
## Moving
diff --git a/packages/vue/src/editor/commands/registry.ts b/packages/vue/src/editor/commands/registry.ts
index 3822c9012..5fadd57a8 100644
--- a/packages/vue/src/editor/commands/registry.ts
+++ b/packages/vue/src/editor/commands/registry.ts
@@ -11,6 +11,14 @@ export const EDITOR_COMMAND_METADATA = {
'edit.redo': { shortcut: 'MOD+SHIFT+Z', keybinding: ['$mod+Shift+KeyZ', '$mod+KeyY'] },
'selection.selectAll': { shortcut: 'MOD+A', keybinding: '$mod+KeyA' },
'selection.selectInverse': { shortcut: 'MOD+SHIFT+A', keybinding: '$mod+Shift+KeyA' },
+ // Enter also opens a vector's path or a text layer, so the app binds it with that.
+ 'selection.selectChildren': { shortcut: '↵' },
+ 'selection.selectParent': {
+ shortcut: 'SHIFT+↵',
+ keybinding: ['Shift+Enter', 'Backslash']
+ },
+ 'selection.selectNextSibling': { shortcut: '⇥', keybinding: 'Tab' },
+ 'selection.selectPreviousSibling': { shortcut: 'SHIFT+⇥', keybinding: 'Shift+Tab' },
'selection.duplicate': {
shortcut: 'MOD+D',
keybinding: '$mod+KeyD',
@@ -112,9 +120,13 @@ export const EDITOR_COMMAND_METADATA = {
'selection.outlineStroke': { contextTestId: 'context-outline-stroke' },
'selection.moveToPage': {},
'selection.setOpacity': { shortcut: '1-9, 0' },
- 'view.zoom100': { shortcut: 'MOD+0', keybinding: '$mod+Digit0' },
+ 'view.zoom100': { shortcut: 'MOD+0', keybinding: ['$mod+Digit0', 'Shift+Digit0'] },
'view.zoomFit': { shortcut: 'SHIFT+1', keybinding: ['$mod+Digit1', 'Shift+Digit1'] },
- 'view.zoomSelection': { shortcut: 'SHIFT+2', keybinding: ['$mod+Digit2', 'Shift+Digit2'] }
+ 'view.zoomSelection': { shortcut: 'SHIFT+2', keybinding: ['$mod+Digit2', 'Shift+Digit2'] },
+ 'view.zoomNextFrame': { shortcut: 'N', keybinding: 'KeyN' },
+ 'view.zoomPreviousFrame': { shortcut: 'SHIFT+N', keybinding: 'Shift+KeyN' },
+ 'view.nextPage': { shortcut: '⇟', keybinding: 'PageDown' },
+ 'view.previousPage': { shortcut: '⇞', keybinding: 'PageUp' }
} satisfies Record<EditorCommandId, EditorCommandMetadata>
export function editorCommandMetadata(id: EditorCommandId): EditorCommandMetadata {
diff --git a/packages/vue/src/editor/commands/selection.ts b/packages/vue/src/editor/commands/selection.ts
index ed7f22d8d..bd784061c 100644
--- a/packages/vue/src/editor/commands/selection.ts
+++ b/packages/vue/src/editor/commands/selection.ts
@@ -49,6 +49,38 @@ export function createSelectionCommands({
enabled: capabilities.canSelectAll,
run: () => editor.selectInverse()
},
+ 'selection.selectChildren': {
+ id: 'selection.selectChildren',
+ get label() {
+ return t.value.selectChildren
+ },
+ enabled: selection.hasSelection,
+ run: () => editor.selectChildren()
+ },
+ 'selection.selectParent': {
+ id: 'selection.selectParent',
+ get label() {
+ return t.value.selectParent
+ },
+ enabled: selection.hasSelection,
+ run: () => editor.selectParent()
+ },
+ 'selection.selectNextSibling': {
+ id: 'selection.selectNextSibling',
+ get label() {
+ return t.value.selectNextSibling
+ },
+ enabled: selection.hasSelection,
+ run: () => editor.selectNextSibling()
+ },
+ 'selection.selectPreviousSibling': {
+ id: 'selection.selectPreviousSibling',
+ get label() {
+ return t.value.selectPreviousSibling
+ },
+ enabled: selection.hasSelection,
+ run: () => editor.selectPreviousSibling()
+ },
'selection.duplicate': {
id: 'selection.duplicate',
get label() {
diff --git a/packages/vue/src/editor/commands/types.ts b/packages/vue/src/editor/commands/types.ts
index 4bacacb62..c6c68773c 100644
--- a/packages/vue/src/editor/commands/types.ts
+++ b/packages/vue/src/editor/commands/types.ts
@@ -5,6 +5,10 @@ export type EditorCommandId =
| 'edit.redo'
| 'selection.selectAll'
| 'selection.selectInverse'
+ | 'selection.selectChildren'
+ | 'selection.selectParent'
+ | 'selection.selectNextSibling'
+ | 'selection.selectPreviousSibling'
| 'selection.duplicate'
| 'selection.delete'
| 'selection.group'
@@ -41,6 +45,10 @@ export type EditorCommandId =
| 'view.zoom100'
| 'view.zoomFit'
| 'view.zoomSelection'
+ | 'view.zoomNextFrame'
+ | 'view.zoomPreviousFrame'
+ | 'view.nextPage'
+ | 'view.previousPage'
export interface EditorCommand {
id: EditorCommandId
diff --git a/packages/vue/src/editor/commands/view.ts b/packages/vue/src/editor/commands/view.ts
index 16c6a0cf9..e092ed69e 100644
--- a/packages/vue/src/editor/commands/view.ts
+++ b/packages/vue/src/editor/commands/view.ts
@@ -1,16 +1,13 @@
import { computed } from 'vue'
import type { EditorCommandMapOptions } from './context'
-import type { EditorCommand } from './types'
+import type { EditorCommand, EditorCommandId } from './types'
export function createViewCommands({
editor,
capabilities,
messages: t
-}: EditorCommandMapOptions): Pick<
- Record<'view.zoom100' | 'view.zoomFit' | 'view.zoomSelection', EditorCommand>,
- 'view.zoom100' | 'view.zoomFit' | 'view.zoomSelection'
-> {
+}: EditorCommandMapOptions): Record<Extract<EditorCommandId, `view.${string}`>, EditorCommand> {
return {
'view.zoom100': {
id: 'view.zoom100',
@@ -35,6 +32,38 @@ export function createViewCommands({
},
enabled: capabilities.canZoomToSelection,
run: () => editor.zoomToSelection()
+ },
+ 'view.zoomNextFrame': {
+ id: 'view.zoomNextFrame',
+ get label() {
+ return t.value.zoomToNextFrame
+ },
+ enabled: computed(() => true),
+ run: () => editor.zoomToNextFrame()
+ },
+ 'view.zoomPreviousFrame': {
+ id: 'view.zoomPreviousFrame',
+ get label() {
+ return t.value.zoomToPreviousFrame
+ },
+ enabled: computed(() => true),
+ run: () => editor.zoomToPreviousFrame()
+ },
+ 'view.nextPage': {
+ id: 'view.nextPage',
+ get label() {
+ return t.value.nextPage
+ },
+ enabled: computed(() => true),
+ run: () => void editor.switchToNextPage()
+ },
+ 'view.previousPage': {
+ id: 'view.previousPage',
+ get label() {
+ return t.value.previousPage
+ },
+ enabled: computed(() => true),
+ run: () => void editor.switchToPreviousPage()
}
}
}
diff --git a/packages/vue/src/editor/menu-model/command-groups.ts b/packages/vue/src/editor/menu-model/command-groups.ts
index b8486ab23..eb1373463 100644
--- a/packages/vue/src/editor/menu-model/command-groups.ts
+++ b/packages/vue/src/editor/menu-model/command-groups.ts
@@ -9,7 +9,11 @@ export const EDIT_MENU_COMMAND_GROUPS = [
export const VIEW_MENU_COMMANDS = [
'view.zoom100',
'view.zoomFit',
- 'view.zoomSelection'
+ 'view.zoomSelection',
+ 'view.zoomPreviousFrame',
+ 'view.zoomNextFrame',
+ 'view.previousPage',
+ 'view.nextPage'
] satisfies ReadonlyArray<EditorCommandId>
export const OBJECT_MENU_COMMAND_GROUPS = [
diff --git a/packages/vue/src/i18n/locales/de/commands.json b/packages/vue/src/i18n/locales/de/commands.json
index 0f4f5d223..82391e12b 100644
--- a/packages/vue/src/i18n/locales/de/commands.json
+++ b/packages/vue/src/i18n/locales/de/commands.json
@@ -23,6 +23,14 @@
"zoomTo200": "Zoom 200 %",
"zoomToFit": "Einpassen",
"zoomToSelection": "Auswahl einpassen",
+ "selectChildren": "Untergeordnete Ebenen auswählen",
+ "selectParent": "Übergeordnete Ebene auswählen",
+ "selectNextSibling": "Nächste Ebene auswählen",
+ "selectPreviousSibling": "Vorherige Ebene auswählen",
+ "zoomToNextFrame": "Zum nächsten Rahmen zoomen",
+ "zoomToPreviousFrame": "Zum vorherigen Rahmen zoomen",
+ "nextPage": "Nächste Seite",
+ "previousPage": "Vorherige Seite",
"groupSelection": "Gruppieren",
"frameSelection": "Auswahl in Rahmen setzen",
"showHide": "Ein-/Ausblenden",
diff --git a/packages/vue/src/i18n/locales/es/commands.json b/packages/vue/src/i18n/locales/es/commands.json
index c0c0a9e73..6e485b1fc 100644
--- a/packages/vue/src/i18n/locales/es/commands.json
+++ b/packages/vue/src/i18n/locales/es/commands.json
@@ -23,6 +23,14 @@
"zoomTo200": "Zoom 200 %",
"zoomToFit": "Ajustar a pantalla",
"zoomToSelection": "Zoom a selección",
+ "selectChildren": "Seleccionar hijos",
+ "selectParent": "Seleccionar padre",
+ "selectNextSibling": "Seleccionar siguiente hermano",
+ "selectPreviousSibling": "Seleccionar hermano anterior",
+ "zoomToNextFrame": "Zoom al siguiente marco",
+ "zoomToPreviousFrame": "Zoom al marco anterior",
+ "nextPage": "Página siguiente",
+ "previousPage": "Página anterior",
"groupSelection": "Agrupar",
"frameSelection": "Selección de marco",
"showHide": "Visibilidad",
diff --git a/packages/vue/src/i18n/locales/fr/commands.json b/packages/vue/src/i18n/locales/fr/commands.json
index 1fde12222..12a83fe5c 100644
--- a/packages/vue/src/i18n/locales/fr/commands.json
+++ b/packages/vue/src/i18n/locales/fr/commands.json
@@ -23,6 +23,14 @@
"zoomTo200": "Zoom 200 %",
"zoomToFit": "Ajuster à l'écran",
"zoomToSelection": "Zoom sur la sélection",
+ "selectChildren": "Sélectionner les enfants",
+ "selectParent": "Sélectionner le parent",
+ "selectNextSibling": "Sélectionner le calque suivant",
+ "selectPreviousSibling": "Sélectionner le calque précédent",
+ "zoomToNextFrame": "Zoom sur le cadre suivant",
+ "zoomToPreviousFrame": "Zoom sur le cadre précédent",
+ "nextPage": "Page suivante",
+ "previousPage": "Page précédente",
"groupSelection": "Grouper",
"frameSelection": "Mettre la sélection dans un cadre",
"showHide": "Afficher/Masquer",
diff --git a/packages/vue/src/i18n/locales/it/commands.json b/packages/vue/src/i18n/locales/it/commands.json
index c71f14c08..a9a4cade2 100644
--- a/packages/vue/src/i18n/locales/it/commands.json
+++ b/packages/vue/src/i18n/locales/it/commands.json
@@ -23,6 +23,14 @@
"zoomTo200": "Zoom 200%",
"zoomToFit": "Adatta allo schermo",
"zoomToSelection": "Zoom sulla selezione",
+ "selectChildren": "Seleziona figli",
+ "selectParent": "Seleziona genitore",
+ "selectNextSibling": "Seleziona livello successivo",
+ "selectPreviousSibling": "Seleziona livello precedente",
+ "zoomToNextFrame": "Zoom sulla cornice successiva",
+ "zoomToPreviousFrame": "Zoom sulla cornice precedente",
+ "nextPage": "Pagina successiva",
+ "previousPage": "Pagina precedente",
"groupSelection": "Raggruppa",
"frameSelection": "Inserisci selezione in cornice",
"showHide": "Mostra/Nascondi",
diff --git a/packages/vue/src/i18n/locales/ja/commands.json b/packages/vue/src/i18n/locales/ja/commands.json
index 7437214d5..9257c531f 100644
--- a/packages/vue/src/i18n/locales/ja/commands.json
+++ b/packages/vue/src/i18n/locales/ja/commands.json
@@ -23,6 +23,14 @@
"zoomTo200": "200%にズーム",
"zoomToFit": "画面に合わせる",
"zoomToSelection": "選択範囲にズーム",
+ "selectChildren": "子を選択",
+ "selectParent": "親を選択",
+ "selectNextSibling": "次の兄弟を選択",
+ "selectPreviousSibling": "前の兄弟を選択",
+ "zoomToNextFrame": "次のフレームにズーム",
+ "zoomToPreviousFrame": "前のフレームにズーム",
+ "nextPage": "次のページ",
+ "previousPage": "前のページ",
"groupSelection": "グループ化",
"frameSelection": "選択範囲をフレーム化",
"showHide": "表示/非表示",
diff --git a/packages/vue/src/i18n/locales/pl/commands.json b/packages/vue/src/i18n/locales/pl/commands.json
index a83d974e4..69d23167d 100644
--- a/packages/vue/src/i18n/locales/pl/commands.json
+++ b/packages/vue/src/i18n/locales/pl/commands.json
@@ -23,6 +23,14 @@
"zoomTo200": "Zoom 200%",
"zoomToFit": "Dopasuj do ekranu",
"zoomToSelection": "Zoom do zaznaczenia",
+ "selectChildren": "Zaznacz elementy podrzędne",
+ "selectParent": "Zaznacz element nadrzędny",
+ "selectNextSibling": "Zaznacz następną warstwę",
+ "selectPreviousSibling": "Zaznacz poprzednią warstwę",
+ "zoomToNextFrame": "Zoom do następnej ramki",
+ "zoomToPreviousFrame": "Zoom do poprzedniej ramki",
+ "nextPage": "Następna strona",
+ "previousPage": "Poprzednia strona",
"groupSelection": "Grupuj",
"frameSelection": "Umieść zaznaczenie w ramce",
"showHide": "Pokaż/Ukryj",
diff --git a/packages/vue/src/i18n/locales/ru/commands.json b/packages/vue/src/i18n/locales/ru/commands.json
index 05f10acf3..309230b0d 100644
--- a/packages/vue/src/i18n/locales/ru/commands.json
+++ b/packages/vue/src/i18n/locales/ru/commands.json
@@ -23,6 +23,14 @@
"zoomTo200": "Масштаб 200%",
"zoomToFit": "Вписать в экран",
"zoomToSelection": "Масштаб по выделению",
+ "selectChildren": "Выбрать дочерние",
+ "selectParent": "Выбрать родителя",
+ "selectNextSibling": "Выбрать следующий слой",
+ "selectPreviousSibling": "Выбрать предыдущий слой",
+ "zoomToNextFrame": "Масштаб к следующему фрейму",
+ "zoomToPreviousFrame": "Масштаб к предыдущему фрейму",
+ "nextPage": "Следующая страница",
+ "previousPage": "Предыдущая страница",
"groupSelection": "Сгруппировать",
"frameSelection": "Поместить выделение во фрейм",
"showHide": "Показать/Скрыть",
diff --git a/packages/vue/src/i18n/locales/zh-cn/commands.json b/packages/vue/src/i18n/locales/zh-cn/commands.json
index 01310f5b3..750601ab6 100644
--- a/packages/vue/src/i18n/locales/zh-cn/commands.json
+++ b/packages/vue/src/i18n/locales/zh-cn/commands.json
@@ -23,6 +23,14 @@
"zoomTo200": "缩放到 200%",
"zoomToFit": "适应屏幕",
"zoomToSelection": "适应所选内容",
+ "selectChildren": "选择子级",
+ "selectParent": "选择父级",
+ "selectNextSibling": "选择下一个同级",
+ "selectPreviousSibling": "选择上一个同级",
+ "zoomToNextFrame": "缩放到下一个画框",
+ "zoomToPreviousFrame": "缩放到上一个画框",
+ "nextPage": "下一页",
+ "previousPage": "上一页",
"groupSelection": "编组所选内容",
"frameSelection": "为所选内容添加画框",
"showHide": "显示/隐藏",
diff --git a/packages/vue/src/i18n/messages/commands.ts b/packages/vue/src/i18n/messages/commands.ts
index 01a562a23..956429cb0 100644
--- a/packages/vue/src/i18n/messages/commands.ts
+++ b/packages/vue/src/i18n/messages/commands.ts
@@ -46,6 +46,14 @@ export const commandMessageDefaults = {
zoomTo200: 'Zoom to 200%',
zoomToFit: 'Zoom to fit',
zoomToSelection: 'Zoom to selection',
+ selectChildren: 'Select children',
+ selectParent: 'Select parent',
+ selectNextSibling: 'Select next sibling',
+ selectPreviousSibling: 'Select previous sibling',
+ zoomToNextFrame: 'Zoom to next frame',
+ zoomToPreviousFrame: 'Zoom to previous frame',
+ nextPage: 'Next page',
+ previousPage: 'Previous page',
paletteSearchPlaceholder: 'Type a command or search…',
paletteAriaLabel: 'Command palette',
paletteSearchAriaLabel: 'Search commands',
diff --git a/src/app/shell/keyboard/actions.ts b/src/app/shell/keyboard/actions.ts
index acf56ce65..fc1280814 100644
--- a/src/app/shell/keyboard/actions.ts
+++ b/src/app/shell/keyboard/actions.ts
@@ -60,7 +60,9 @@ export function createKeyboardActions({
store.textEditor?.selectAll()
store.requestRender()
})
+ return
}
+ runCommand('selection.selectChildren')
}
function escapeOrDeselect() {
diff --git a/src/app/shell/keyboard/registry.ts b/src/app/shell/keyboard/registry.ts
index f38b089df..820742d07 100644
--- a/src/app/shell/keyboard/registry.ts
+++ b/src/app/shell/keyboard/registry.ts
@@ -64,6 +64,27 @@ function opacityBindings(): ShortcutDefinition[] {
}))
}
+/**
+ * Tab steps through sibling layers only while nothing on the page holds focus, so it still
+ * moves focus through the panels' controls.
+ */
+function isCanvasFocus(event: KeyboardEvent) {
+ return event.target === document.body || event.target instanceof HTMLCanvasElement
+}
+
+function siblingShortcut(
+ command: 'selection.selectNextSibling' | 'selection.selectPreviousSibling'
+): ShortcutDefinition {
+ return {
+ id: command,
+ keys: editorCommandMetadata(command).keybinding ?? [],
+ run: ({ keyEvent, runCommand }) => {
+ if (isCanvasFocus(keyEvent)) runCommand(command)
+ },
+ shouldPreventDefault: isCanvasFocus
+ }
+}
+
const EDITOR_SHORTCUT_OVERLAY_SELECTOR =
'[data-picker-content], [role="dialog"], [role="listbox"], [role="menu"]'
const PICKER_SELECTOR = '[data-picker-content]'
@@ -248,6 +269,11 @@ export function registerKeyboardShortcuts(options: KeyboardShortcutOptions) {
'view.zoom100',
'view.zoomFit',
'view.zoomSelection',
+ 'view.zoomNextFrame',
+ 'view.zoomPreviousFrame',
+ 'view.nextPage',
+ 'view.previousPage',
+ 'selection.selectParent',
'selection.duplicate',
'selection.selectAll',
'selection.selectInverse'
@@ -284,6 +310,8 @@ export function registerKeyboardShortcuts(options: KeyboardShortcutOptions) {
run: ({ actions }) => actions.escapeOrDeselect(),
preview: true
},
+ siblingShortcut('selection.selectNextSibling'),
+ siblingShortcut('selection.selectPreviousSibling'),
...opacityBindings()
]
diff --git a/src/app/shell/menu/schema.ts b/src/app/shell/menu/schema.ts
index 643f619fb..3ebf06fda 100644
--- a/src/app/shell/menu/schema.ts
+++ b/src/app/shell/menu/schema.ts
@@ -185,6 +185,15 @@ export const APP_MENU_SCHEMA = [
{ id: 'zoom-in', label: 'Zoom In', shortcut: 'MOD+=' },
{ id: 'zoom-out', label: 'Zoom Out', shortcut: 'MOD+-' },
{ type: 'separator' },
+ {
+ id: 'view.zoomPreviousFrame',
+ label: 'Zoom to Previous Frame',
+ command: 'view.zoomPreviousFrame'
+ },
+ { id: 'view.zoomNextFrame', label: 'Zoom to Next Frame', command: 'view.zoomNextFrame' },
+ { id: 'view.previousPage', label: 'Previous Page', command: 'view.previousPage' },
+ { id: 'view.nextPage', label: 'Next Page', command: 'view.nextPage' },
+ { type: 'separator' },
{ id: 'view-split-right', label: 'Split Right' },
{ id: 'view-split-down', label: 'Split Down' },
{ type: 'separator' },
diff --git a/src/app/shell/menu/shortcut.ts b/src/app/shell/menu/shortcut.ts
index a1c37c4d0..292776a35 100644
--- a/src/app/shell/menu/shortcut.ts
+++ b/src/app/shell/menu/shortcut.ts
@@ -30,7 +30,9 @@ export function appMenuShortcut(id: string): string | undefined {
}
function normalizeShortcutToken(shortcut: string): string {
- return shortcut === '⌫' ? 'Backspace' : shortcut.replaceAll('↩', 'Enter')
+ return shortcut === '⌫'
+ ? 'Backspace'
+ : shortcut.replaceAll('↩', 'Enter').replaceAll('⇞', 'PageUp').replaceAll('⇟', 'PageDown')
}
export function shortcutTokenToTinykeys(shortcut: string | undefined): string | undefined {
diff --git a/src/components/MobileHud/MobileFileMenu.vue b/src/components/MobileHud/MobileFileMenu.vue
index 91fba08a5..4d920a00b 100644
--- a/src/components/MobileHud/MobileFileMenu.vue
+++ b/src/components/MobileHud/MobileFileMenu.vue
@@ -11,13 +11,15 @@ import { useMenuMessages } from '@open-pencil/vue'
import HudButton from '@/components/mobile-hud/HudButton.vue'
import { useMobileHudContext } from '@/components/MobileHud/context'
-import { menu, useMenuUI } from '@/components/ui/menu/menu'
+import { menuItem, useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
const menuMessages = useMenuMessages()
const hud = useMobileHudContext()
-const menuCls = useMenuUI({
- content: 'w-48 p-1.5',
- item: 'w-full gap-2.5 rounded-lg border-none bg-transparent px-2.5 py-2 active:bg-hover'
+const menuCls = useMenuUI({ content: 'w-48 p-1.5' })
+const itemCls = menuItem({
+ justify: 'start',
+ class: 'w-full gap-2.5 rounded-lg border-none bg-transparent px-2.5 py-2 active:bg-hover'
})
</script>
@@ -30,15 +32,17 @@ const menuCls = useMenuUI({
</DropdownMenuTrigger>
<DropdownMenuPortal>
<DropdownMenuContent :side-offset="8" side="bottom" align="end" :class="menuCls.content">
- <DropdownMenuItem
- v-for="item in hud.menuItems"
- :key="item.label"
- :class="menu({ justify: 'start' }).item({ class: menuCls.item })"
- @click="item.action()"
- >
- <component :is="item.icon" class="size-4 text-muted" />
- <span>{{ item.label }}</span>
- </DropdownMenuItem>
+ <MenuScrollArea>
+ <DropdownMenuItem
+ v-for="item in hud.menuItems"
+ :key="item.label"
+ :class="itemCls"
+ @click="item.action()"
+ >
+ <component :is="item.icon" class="size-4 text-muted" />
+ <span>{{ item.label }}</span>
+ </DropdownMenuItem>
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
diff --git a/src/components/PagesPanel.vue b/src/components/PagesPanel.vue
index d8e24f034..2e8b51ee9 100644
--- a/src/components/PagesPanel.vue
+++ b/src/components/PagesPanel.vue
@@ -21,6 +21,7 @@ import PagePresenceHover from '@/components/presence/PagePresenceHover.vue'
import PresenceMarkers from '@/components/presence/PresenceMarkers.vue'
import IconButton from '@/components/ui/button/IconButton.vue'
import { useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import pageListTheme from '@/theme/page-list'
type PageItem = Pick<SceneNode, 'id' | 'name' | 'childIds'>
@@ -175,23 +176,25 @@ function setupPageRowRef(
</ContextMenuTrigger>
<ContextMenuPortal>
<ContextMenuContent :class="menuCls.content" :side-offset="2" align="start">
- <ContextMenuItem
- data-test-id="pages-context-rename"
- :class="menuCls.item"
- @select="startRename(pg, actions.rename)"
- >
- <icon-lucide-pencil :class="menuCls.icon" />
- <span>{{ pageMessages.rename }}</span>
- </ContextMenuItem>
- <ContextMenuItem
- data-test-id="pages-context-delete"
- :class="menuCls.item"
- :disabled="pages.length <= 1"
- @select="actions.delete(pg.id)"
- >
- <icon-lucide-trash-2 :class="menuCls.icon" />
- <span>{{ pageMessages.delete }}</span>
- </ContextMenuItem>
+ <MenuScrollArea>
+ <ContextMenuItem
+ data-test-id="pages-context-rename"
+ :class="menuCls.item"
+ @select="startRename(pg, actions.rename)"
+ >
+ <icon-lucide-pencil :class="menuCls.icon" />
+ <span>{{ pageMessages.rename }}</span>
+ </ContextMenuItem>
+ <ContextMenuItem
+ data-test-id="pages-context-delete"
+ :class="menuCls.item"
+ :disabled="pages.length <= 1"
+ @select="actions.delete(pg.id)"
+ >
+ <icon-lucide-trash-2 :class="menuCls.icon" />
+ <span>{{ pageMessages.delete }}</span>
+ </ContextMenuItem>
+ </MenuScrollArea>
</ContextMenuContent>
</ContextMenuPortal>
</ContextMenuRoot>
diff --git a/src/components/assets-panel/AssetsPanel.vue b/src/components/assets-panel/AssetsPanel.vue
index 1c6e8bccf..44c5f262f 100644
--- a/src/components/assets-panel/AssetsPanel.vue
+++ b/src/components/assets-panel/AssetsPanel.vue
@@ -28,6 +28,7 @@ import { AppDialogRoot, useDialogUI } from '@/components/ui/dialog'
import AppPlaceholder from '@/components/ui/feedback/AppPlaceholder.vue'
import AppInput from '@/components/ui/input/AppInput.vue'
import { useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import Tip from '@/components/ui/overlay/Tip.vue'
import SegmentedControl from '@/components/ui/select/SegmentedControl.vue'
import { ASSET_GRID_THUMBNAIL_SIZE, ASSET_LIST_THUMBNAIL_SIZE } from '@/constants'
@@ -468,21 +469,23 @@ async function insertSelectedAsset() {
</ContextMenuTrigger>
<ContextMenuPortal>
<ContextMenuContent :class="contextMenu.content">
- <ContextMenuItem
- v-if="!asset.libraryId"
- data-test-id="asset-context-go-to-main"
- :class="contextMenu.item"
- @select="focusAsset(asset)"
- >
- {{ panels.goToMainComponent }}
- </ContextMenuItem>
- <ContextMenuItem
- data-test-id="asset-context-view-details"
- :class="contextMenu.item"
- @select="openDetails(asset)"
- >
- {{ panels.viewDetails }}
- </ContextMenuItem>
+ <MenuScrollArea>
+ <ContextMenuItem
+ v-if="!asset.libraryId"
+ data-test-id="asset-context-go-to-main"
+ :class="contextMenu.item"
+ @select="focusAsset(asset)"
+ >
+ {{ panels.goToMainComponent }}
+ </ContextMenuItem>
+ <ContextMenuItem
+ data-test-id="asset-context-view-details"
+ :class="contextMenu.item"
+ @select="openDetails(asset)"
+ >
+ {{ panels.viewDetails }}
+ </ContextMenuItem>
+ </MenuScrollArea>
</ContextMenuContent>
</ContextMenuPortal>
</ContextMenuRoot>
diff --git a/src/components/canvas/CanvasMenu.vue b/src/components/canvas/CanvasMenu.vue
index 3dcea7c9d..708f42c18 100644
--- a/src/components/canvas/CanvasMenu.vue
+++ b/src/components/canvas/CanvasMenu.vue
@@ -29,6 +29,7 @@ import { canvasMenuItemClass, canvasMenuShortcutClass } from '@/app/editor/canva
import { appMenuShortcutLabel } from '@/app/shell/menu/shortcut'
import AppShortcutText from '@/components/ui/menu/AppShortcutText.vue'
import { menu, useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
const store = useEditorStore()
@@ -73,108 +74,114 @@ function contextCommandTestId(id: EditorCommandId | undefined): string | undefin
<!-- Closing hands focus back to the canvas; when that lands just after a quick reopen, it
must not close the new menu. Clicks outside and Escape still close it. -->
<ContextMenuContent :class="cls.menu" :side-offset="2" align="start" @close-auto-focus.prevent>
- <template v-if="selectedGuide">
- <ContextMenuItem data-property="guide" :class="cls.item" @select="removeSelectedGuide">
- <span>{{ t.removeGuide }}</span>
- </ContextMenuItem>
- </template>
- <template v-else>
- <ContextMenuItem
- data-test-id="context-copy"
- :class="cls.item"
- :disabled="!hasSelection"
- @select="execCommand('copy')"
- >
- <span>{{ t.copy }}</span
- ><AppShortcutText>{{ appMenuShortcutLabel('copy') }}</AppShortcutText>
- </ContextMenuItem>
- <ContextMenuItem
- data-test-id="context-cut"
- :class="cls.item"
- :disabled="!hasSelection"
- @select="execCommand('cut')"
- >
- <span>{{ t.cut }}</span
- ><AppShortcutText>{{ appMenuShortcutLabel('cut') }}</AppShortcutText>
- </ContextMenuItem>
- <ContextMenuItem
- data-test-id="context-paste"
- :class="cls.item"
- @select="execCommand('paste')"
- >
- <span>{{ t.pasteHere }}</span
- ><AppShortcutText>{{ appMenuShortcutLabel('paste') }}</AppShortcutText>
- </ContextMenuItem>
- <ContextMenuItem
- data-test-id="context-paste-to-replace"
- :class="cls.item"
- :disabled="!hasSelection"
- @select="canvasMenuActions.pasteToReplace"
- >
- <span>{{ t.pasteToReplace }}</span>
- </ContextMenuItem>
- <ContextMenuItem
- data-test-id="context-duplicate"
- :class="cls.item"
- :disabled="!hasSelection"
- @select="getCommand('selection.duplicate').run()"
- >
- <span>{{ getCommand('selection.duplicate').label }}</span
- ><AppShortcutText>{{
- formatShortcut(editorCommandMetadata('selection.duplicate').shortcut)
- }}</AppShortcutText>
- </ContextMenuItem>
- <ContextMenuItem
- data-test-id="context-delete"
- :class="cls.item"
- :disabled="!hasSelection"
- @select="getCommand('selection.delete').run()"
- >
- <span>{{ getCommand('selection.delete').label }}</span
- ><AppShortcutText>{{ editorCommandMetadata('selection.delete').shortcut }}</AppShortcutText>
- </ContextMenuItem>
-
- <template v-for="(item, i) in contextMenu" :key="`menu-${i}`">
- <ContextMenuSeparator v-if="item.separator" :class="cls.sep" />
- <ContextMenuSub v-else-if="item.sub">
- <ContextMenuSubTrigger v-test-id="item.testId" :class="cls.item">
- <span>{{ item.label }}</span>
- <IconChevronRight class="size-3.5 text-muted" />
- </ContextMenuSubTrigger>
- <ContextMenuPortal>
- <ContextMenuSubContent :class="cls.submenu">
- <ContextMenuItem
- v-for="(sub, j) in item.sub"
- :key="j"
- :class="cls.item"
- v-test-id="sub.separator ? undefined : sub.testId"
- :disabled="sub.separator ? true : sub.disabled"
- @select="!sub.separator && sub.action?.()"
- >
- <template v-if="!sub.separator">
- <span class="min-w-0 flex-1 truncate">{{ sub.label }}</span>
- <AppShortcutText v-if="sub.shortcut">{{ sub.shortcut }}</AppShortcutText>
- </template>
- </ContextMenuItem>
- </ContextMenuSubContent>
- </ContextMenuPortal>
- </ContextMenuSub>
+ <MenuScrollArea>
+ <template v-if="selectedGuide">
+ <ContextMenuItem data-property="guide" :class="cls.item" @select="removeSelectedGuide">
+ <span>{{ t.removeGuide }}</span>
+ </ContextMenuItem>
+ </template>
+ <template v-else>
<ContextMenuItem
- v-else
- v-test-id="item.testId ?? contextCommandTestId(item.id)"
- :class="canvasMenuItemClass(item.label, cls)"
- :disabled="item.disabled"
- @select="item.action?.()"
+ data-test-id="context-copy"
+ :class="cls.item"
+ :disabled="!hasSelection"
+ @select="execCommand('copy')"
>
- <span class="min-w-0 flex-1 truncate">{{ item.label }}</span>
- <span
- v-if="item.shortcut"
- class="text-[11px]"
- :class="canvasMenuShortcutClass(item.label)"
- >{{ item.shortcut }}</span
- >
+ <span>{{ t.copy }}</span
+ ><AppShortcutText>{{ appMenuShortcutLabel('copy') }}</AppShortcutText>
</ContextMenuItem>
+ <ContextMenuItem
+ data-test-id="context-cut"
+ :class="cls.item"
+ :disabled="!hasSelection"
+ @select="execCommand('cut')"
+ >
+ <span>{{ t.cut }}</span
+ ><AppShortcutText>{{ appMenuShortcutLabel('cut') }}</AppShortcutText>
+ </ContextMenuItem>
+ <ContextMenuItem
+ data-test-id="context-paste"
+ :class="cls.item"
+ @select="execCommand('paste')"
+ >
+ <span>{{ t.pasteHere }}</span
+ ><AppShortcutText>{{ appMenuShortcutLabel('paste') }}</AppShortcutText>
+ </ContextMenuItem>
+ <ContextMenuItem
+ data-test-id="context-paste-to-replace"
+ :class="cls.item"
+ :disabled="!hasSelection"
+ @select="canvasMenuActions.pasteToReplace"
+ >
+ <span>{{ t.pasteToReplace }}</span>
+ </ContextMenuItem>
+ <ContextMenuItem
+ data-test-id="context-duplicate"
+ :class="cls.item"
+ :disabled="!hasSelection"
+ @select="getCommand('selection.duplicate').run()"
+ >
+ <span>{{ getCommand('selection.duplicate').label }}</span
+ ><AppShortcutText>{{
+ formatShortcut(editorCommandMetadata('selection.duplicate').shortcut)
+ }}</AppShortcutText>
+ </ContextMenuItem>
+ <ContextMenuItem
+ data-test-id="context-delete"
+ :class="cls.item"
+ :disabled="!hasSelection"
+ @select="getCommand('selection.delete').run()"
+ >
+ <span>{{ getCommand('selection.delete').label }}</span
+ ><AppShortcutText>{{
+ editorCommandMetadata('selection.delete').shortcut
+ }}</AppShortcutText>
+ </ContextMenuItem>
+
+ <template v-for="(item, i) in contextMenu" :key="`menu-${i}`">
+ <ContextMenuSeparator v-if="item.separator" :class="cls.sep" />
+ <ContextMenuSub v-else-if="item.sub">
+ <ContextMenuSubTrigger v-test-id="item.testId" :class="cls.item">
+ <span>{{ item.label }}</span>
+ <IconChevronRight class="size-3.5 text-muted" />
+ </ContextMenuSubTrigger>
+ <ContextMenuPortal>
+ <ContextMenuSubContent :class="cls.submenu">
+ <MenuScrollArea>
+ <ContextMenuItem
+ v-for="(sub, j) in item.sub"
+ :key="j"
+ :class="cls.item"
+ v-test-id="sub.separator ? undefined : sub.testId"
+ :disabled="sub.separator ? true : sub.disabled"
+ @select="!sub.separator && sub.action?.()"
+ >
+ <template v-if="!sub.separator">
+ <span class="min-w-0 flex-1 truncate">{{ sub.label }}</span>
+ <AppShortcutText v-if="sub.shortcut">{{ sub.shortcut }}</AppShortcutText>
+ </template>
+ </ContextMenuItem>
+ </MenuScrollArea>
+ </ContextMenuSubContent>
+ </ContextMenuPortal>
+ </ContextMenuSub>
+ <ContextMenuItem
+ v-else
+ v-test-id="item.testId ?? contextCommandTestId(item.id)"
+ :class="canvasMenuItemClass(item.label, cls)"
+ :disabled="item.disabled"
+ @select="item.action?.()"
+ >
+ <span class="min-w-0 flex-1 truncate">{{ item.label }}</span>
+ <span
+ v-if="item.shortcut"
+ class="text-[11px]"
+ :class="canvasMenuShortcutClass(item.label)"
+ >{{ item.shortcut }}</span
+ >
+ </ContextMenuItem>
+ </template>
</template>
- </template>
+ </MenuScrollArea>
</ContextMenuContent>
</template>
diff --git a/src/components/canvas/CanvasPaneHeader.vue b/src/components/canvas/CanvasPaneHeader.vue
index 140437495..92f0ec8c9 100644
--- a/src/components/canvas/CanvasPaneHeader.vue
+++ b/src/components/canvas/CanvasPaneHeader.vue
@@ -15,6 +15,7 @@ import { useEditorStore } from '@/app/editor/active-store'
import type { SplitDirection } from '@/app/editor/panes/split-tree'
import IconButton from '@/components/ui/button/IconButton.vue'
import { menuItem, useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import canvasPaneHeaderTheme from '@/theme/canvas-pane-header'
const { paneId } = defineProps<{
@@ -65,14 +66,20 @@ function split(direction: SplitDirection) {
</DropdownMenuTrigger>
<DropdownMenuPortal>
<DropdownMenuContent side="bottom" align="end" :side-offset="3" :class="menuCls.content">
- <DropdownMenuItem :disabled="!canSplit" :class="itemCls" @select="split('horizontal')">
- <icon-lucide-columns-2 :class="menuCls.icon" />
- <span>{{ menuText.splitRight }}</span>
- </DropdownMenuItem>
- <DropdownMenuItem :disabled="!canSplit" :class="itemCls" @select="split('vertical')">
- <icon-lucide-rows-2 :class="menuCls.icon" />
- <span>{{ menuText.splitDown }}</span>
- </DropdownMenuItem>
+ <MenuScrollArea>
+ <DropdownMenuItem
+ :disabled="!canSplit"
+ :class="itemCls"
+ @select="split('horizontal')"
+ >
+ <icon-lucide-columns-2 :class="menuCls.icon" />
+ <span>{{ menuText.splitRight }}</span>
+ </DropdownMenuItem>
+ <DropdownMenuItem :disabled="!canSplit" :class="itemCls" @select="split('vertical')">
+ <icon-lucide-rows-2 :class="menuCls.icon" />
+ <span>{{ menuText.splitDown }}</span>
+ </DropdownMenuItem>
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
diff --git a/src/components/chat/ChatHistory.vue b/src/components/chat/ChatHistory.vue
index d2ab8e49a..6da1cd105 100644
--- a/src/components/chat/ChatHistory.vue
+++ b/src/components/chat/ChatHistory.vue
@@ -20,6 +20,7 @@ import AppButton from '@/components/ui/button/AppButton.vue'
import IconButton from '@/components/ui/button/IconButton.vue'
import { AppConfirmationDialog } from '@/components/ui/dialog'
import { menuItem, useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import Tip from '@/components/ui/overlay/Tip.vue'
import iconButtonTheme from '@/theme/button/icon-button'
import { chatHistoryTheme } from '@/theme/chat/history'
@@ -182,13 +183,19 @@ function closeMenu(event: Event) {
:class="menu.content"
@close-auto-focus="closeMenu"
>
- <DropdownMenuItem :class="item" @select="rename">{{ ai.renameChat }}</DropdownMenuItem>
- <DropdownMenuItem :class="item" @select="selectedId && emit('saveTrace', selectedId)">{{
- ai.saveChatTrace
- }}</DropdownMenuItem>
- <DropdownMenuItem :class="item" @select="confirmDelete">{{
- ai.deleteChat
- }}</DropdownMenuItem>
+ <MenuScrollArea>
+ <DropdownMenuItem :class="item" @select="rename">{{
+ ai.renameChat
+ }}</DropdownMenuItem>
+ <DropdownMenuItem
+ :class="item"
+ @select="selectedId && emit('saveTrace', selectedId)"
+ >{{ ai.saveChatTrace }}</DropdownMenuItem
+ >
+ <DropdownMenuItem :class="item" @select="confirmDelete">{{
+ ai.deleteChat
+ }}</DropdownMenuItem>
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
diff --git a/src/components/comments/CommentThreadCard.vue b/src/components/comments/CommentThreadCard.vue
index 0d35961ec..cc1f6e89e 100644
--- a/src/components/comments/CommentThreadCard.vue
+++ b/src/components/comments/CommentThreadCard.vue
@@ -12,6 +12,7 @@ import { useCommentMessages, useCommonMessages } from '@open-pencil/vue'
import IconButton from '@/components/ui/button/IconButton.vue'
import { useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import PanelHeader from '@/components/ui/panel/PanelHeader.vue'
import { comments } from '@/theme/comments'
@@ -65,7 +66,9 @@ defineExpose({ focus: () => composer.value?.focus() })
</DropdownMenuTrigger>
<DropdownMenuPortal>
<DropdownMenuContent :class="menuCls.content" align="end" :side-offset="4">
- <slot name="menu" />
+ <MenuScrollArea>
+ <slot name="menu" />
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
diff --git a/src/components/comments/CommentsLayer.vue b/src/components/comments/CommentsLayer.vue
index 89f2849a3..ccf4b0bca 100644
--- a/src/components/comments/CommentsLayer.vue
+++ b/src/components/comments/CommentsLayer.vue
@@ -17,6 +17,7 @@ import { toolCursor, useCommentMessages } from '@open-pencil/vue'
import { useComments } from '@/app/comments/use'
import { useEditorStore } from '@/app/editor/active-store'
import { useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import { usePopoverUI } from '@/components/ui/overlay/popover'
import { COMMENT_PIN_SIZE, comments as commentsTheme } from '@/theme/comments'
@@ -206,7 +207,9 @@ function closeCard() {
</ContextMenuTrigger>
<ContextMenuPortal>
<ContextMenuContent :class="menuCls.content">
- <CommentActionsMenu :thread="pin.thread" kind="context" show-hide />
+ <MenuScrollArea>
+ <CommentActionsMenu :thread="pin.thread" kind="context" show-hide />
+ </MenuScrollArea>
</ContextMenuContent>
</ContextMenuPortal>
</ContextMenuRoot>
diff --git a/src/components/comments/CommentsPanel.vue b/src/components/comments/CommentsPanel.vue
index 4e6861cb8..62e36658f 100644
--- a/src/components/comments/CommentsPanel.vue
+++ b/src/components/comments/CommentsPanel.vue
@@ -26,6 +26,7 @@ import IconButton from '@/components/ui/button/IconButton.vue'
import AppPlaceholder from '@/components/ui/feedback/AppPlaceholder.vue'
import AppInput from '@/components/ui/input/AppInput.vue'
import { menuItem, useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import PanelHeader from '@/components/ui/panel/PanelHeader.vue'
import { comments as commentsTheme } from '@/theme/comments'
@@ -82,39 +83,41 @@ function setSort(value: unknown) {
</DropdownMenuTrigger>
<DropdownMenuPortal>
<DropdownMenuContent :class="menuCls.content" align="end" :side-offset="4">
- <DropdownMenuRadioGroup :model-value="listSort" @update:model-value="setSort">
- <DropdownMenuRadioItem value="newest" :class="itemCls">
+ <MenuScrollArea>
+ <DropdownMenuRadioGroup :model-value="listSort" @update:model-value="setSort">
+ <DropdownMenuRadioItem value="newest" :class="itemCls">
+ <DropdownMenuItemIndicator :class="ui.menuIndicator()">
+ <icon-lucide-check class="size-3.5" />
+ </DropdownMenuItemIndicator>
+ {{ messages.newestFirst }}
+ </DropdownMenuRadioItem>
+ <DropdownMenuRadioItem value="oldest" :class="itemCls">
+ <DropdownMenuItemIndicator :class="ui.menuIndicator()">
+ <icon-lucide-check class="size-3.5" />
+ </DropdownMenuItemIndicator>
+ {{ messages.oldestFirst }}
+ </DropdownMenuRadioItem>
+ </DropdownMenuRadioGroup>
+ <DropdownMenuSeparator :class="menuCls.separator" />
+ <DropdownMenuCheckboxItem v-model="listShowResolved" :class="itemCls">
<DropdownMenuItemIndicator :class="ui.menuIndicator()">
<icon-lucide-check class="size-3.5" />
</DropdownMenuItemIndicator>
- {{ messages.newestFirst }}
- </DropdownMenuRadioItem>
- <DropdownMenuRadioItem value="oldest" :class="itemCls">
+ {{ messages.showResolved }}
+ </DropdownMenuCheckboxItem>
+ <DropdownMenuCheckboxItem v-model="listOnlyMine" :class="itemCls">
<DropdownMenuItemIndicator :class="ui.menuIndicator()">
<icon-lucide-check class="size-3.5" />
</DropdownMenuItemIndicator>
- {{ messages.oldestFirst }}
- </DropdownMenuRadioItem>
- </DropdownMenuRadioGroup>
- <DropdownMenuSeparator :class="menuCls.separator" />
- <DropdownMenuCheckboxItem v-model="listShowResolved" :class="itemCls">
- <DropdownMenuItemIndicator :class="ui.menuIndicator()">
- <icon-lucide-check class="size-3.5" />
- </DropdownMenuItemIndicator>
- {{ messages.showResolved }}
- </DropdownMenuCheckboxItem>
- <DropdownMenuCheckboxItem v-model="listOnlyMine" :class="itemCls">
- <DropdownMenuItemIndicator :class="ui.menuIndicator()">
- <icon-lucide-check class="size-3.5" />
- </DropdownMenuItemIndicator>
- {{ messages.onlyMine }}
- </DropdownMenuCheckboxItem>
- <DropdownMenuCheckboxItem v-model="listOnlyPage" :class="itemCls">
- <DropdownMenuItemIndicator :class="ui.menuIndicator()">
- <icon-lucide-check class="size-3.5" />
- </DropdownMenuItemIndicator>
- {{ messages.onlyPage }}
- </DropdownMenuCheckboxItem>
+ {{ messages.onlyMine }}
+ </DropdownMenuCheckboxItem>
+ <DropdownMenuCheckboxItem v-model="listOnlyPage" :class="itemCls">
+ <DropdownMenuItemIndicator :class="ui.menuIndicator()">
+ <icon-lucide-check class="size-3.5" />
+ </DropdownMenuItemIndicator>
+ {{ messages.onlyPage }}
+ </DropdownMenuCheckboxItem>
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
@@ -157,7 +160,9 @@ function setSort(value: unknown) {
</DropdownMenuTrigger>
<DropdownMenuPortal>
<DropdownMenuContent :class="menuCls.content" align="end" :side-offset="4">
- <CommentActionsMenu :thread="thread" kind="dropdown" show-go-to />
+ <MenuScrollArea>
+ <CommentActionsMenu :thread="thread" kind="dropdown" show-go-to />
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
@@ -175,7 +180,9 @@ function setSort(value: unknown) {
</ContextMenuTrigger>
<ContextMenuPortal>
<ContextMenuContent :class="menuCls.content">
- <CommentActionsMenu :thread="thread" kind="context" show-go-to />
+ <MenuScrollArea>
+ <CommentActionsMenu :thread="thread" kind="context" show-go-to />
+ </MenuScrollArea>
</ContextMenuContent>
</ContextMenuPortal>
</ContextMenuRoot>
diff --git a/src/components/design-check/DesignCheckRulesMenu.vue b/src/components/design-check/DesignCheckRulesMenu.vue
index e6b3ab322..258debabb 100644
--- a/src/components/design-check/DesignCheckRulesMenu.vue
+++ b/src/components/design-check/DesignCheckRulesMenu.vue
@@ -24,6 +24,7 @@ import {
import { appPreferences, DESIGN_CHECK_PRESETS } from '@/app/settings/preferences/store'
import IconButton from '@/components/ui/button/IconButton.vue'
import { menuItem, useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import { usePresetLabels } from './usePresetLabels'
@@ -51,37 +52,39 @@ const presetModel = computed({
</DropdownMenuTrigger>
<DropdownMenuPortal>
<DropdownMenuContent side="bottom" align="end" :side-offset="4" :class="menuCls.content">
- <DropdownMenuLabel :class="menuCls.label">{{ messages.rules }}</DropdownMenuLabel>
- <DropdownMenuRadioGroup v-model="presetModel">
- <DropdownMenuRadioItem
- v-for="preset in DESIGN_CHECK_PRESETS"
- :key="preset"
- :value="preset"
+ <MenuScrollArea>
+ <DropdownMenuLabel :class="menuCls.label">{{ messages.rules }}</DropdownMenuLabel>
+ <DropdownMenuRadioGroup v-model="presetModel">
+ <DropdownMenuRadioItem
+ v-for="preset in DESIGN_CHECK_PRESETS"
+ :key="preset"
+ :value="preset"
+ :class="itemCls"
+ >
+ <DropdownMenuItemIndicator class="absolute left-2">
+ <icon-lucide-check class="size-3.5" />
+ </DropdownMenuItemIndicator>
+ {{ presetLabels[preset] }}
+ </DropdownMenuRadioItem>
+ </DropdownMenuRadioGroup>
+ <template v-if="preferences.disabledRules.length > 0">
+ <DropdownMenuSeparator :class="menuCls.separator" />
+ <DropdownMenuItem :class="itemCls" @select="turnOnDesignCheckRules">
+ {{ messages.turnOnRules({ count: preferences.disabledRules.length }) }}
+ </DropdownMenuItem>
+ </template>
+ <DropdownMenuSeparator :class="menuCls.separator" />
+ <DropdownMenuCheckboxItem
+ :model-value="preferences.showOnCanvas"
:class="itemCls"
+ @update:model-value="setDesignIssuesOnCanvas"
>
<DropdownMenuItemIndicator class="absolute left-2">
<icon-lucide-check class="size-3.5" />
</DropdownMenuItemIndicator>
- {{ presetLabels[preset] }}
- </DropdownMenuRadioItem>
- </DropdownMenuRadioGroup>
- <template v-if="preferences.disabledRules.length > 0">
- <DropdownMenuSeparator :class="menuCls.separator" />
- <DropdownMenuItem :class="itemCls" @select="turnOnDesignCheckRules">
- {{ messages.turnOnRules({ count: preferences.disabledRules.length }) }}
- </DropdownMenuItem>
- </template>
- <DropdownMenuSeparator :class="menuCls.separator" />
- <DropdownMenuCheckboxItem
- :model-value="preferences.showOnCanvas"
- :class="itemCls"
- @update:model-value="setDesignIssuesOnCanvas"
- >
- <DropdownMenuItemIndicator class="absolute left-2">
- <icon-lucide-check class="size-3.5" />
- </DropdownMenuItemIndicator>
- {{ messages.showOnCanvas }}
- </DropdownMenuCheckboxItem>
+ {{ messages.showOnCanvas }}
+ </DropdownMenuCheckboxItem>
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
diff --git a/src/components/design-check/IssueGroup.vue b/src/components/design-check/IssueGroup.vue
index 47a8c4ac3..610d38b5d 100644
--- a/src/components/design-check/IssueGroup.vue
+++ b/src/components/design-check/IssueGroup.vue
@@ -15,6 +15,7 @@ import IconButton from '@/components/ui/button/IconButton.vue'
import AppCollapsible from '@/components/ui/collapsible/AppCollapsible.vue'
import SeverityIcon from '@/components/ui/feedback/SeverityIcon.vue'
import { menuItem, useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import Tip from '@/components/ui/overlay/Tip.vue'
import { designCheck } from '@/theme/design-check'
@@ -82,10 +83,12 @@ const hiddenCount = computed(() => group.rows.length - visibleRows.value.length)
</DropdownMenuTrigger>
<DropdownMenuPortal>
<DropdownMenuContent side="bottom" align="end" :side-offset="4" :class="menuCls.content">
- <DropdownMenuItem :class="itemCls" @select="emit('turnOff')">
- <icon-lucide-eye-off class="size-3.5 text-muted" aria-hidden="true" />
- {{ messages.turnOffRule }}
- </DropdownMenuItem>
+ <MenuScrollArea>
+ <DropdownMenuItem :class="itemCls" @select="emit('turnOff')">
+ <icon-lucide-eye-off class="size-3.5 text-muted" aria-hidden="true" />
+ {{ messages.turnOffRule }}
+ </DropdownMenuItem>
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
diff --git a/src/components/editor/ZoomDropdown.vue b/src/components/editor/ZoomDropdown.vue
index 8b30d5b43..65def72b6 100644
--- a/src/components/editor/ZoomDropdown.vue
+++ b/src/components/editor/ZoomDropdown.vue
@@ -21,6 +21,7 @@ import { appPreferences } from '@/app/settings/preferences/store'
import { appMenuShortcutLabel } from '@/app/shell/menu/shortcut'
import AppShortcutText from '@/components/ui/menu/AppShortcutText.vue'
import { menuItem, useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
const store = useEditorStore()
const { getCommand } = useEditorCommands()
@@ -119,109 +120,116 @@ watch(open, (v) => {
:class="menuCls.content"
@escape-key-down="cancelInput"
>
- <div class="px-1 py-1">
- <input
- v-if="editing"
- ref="inputRef"
- v-model="inputValue"
- data-test-id="zoom-input"
- class="w-full rounded border border-accent bg-input px-2 py-1 text-xs text-surface outline-none"
- @blur="commitInput"
- @keydown.enter="commitInput"
- @keydown.escape.stop="cancelInput"
- />
- <button
- v-else
- data-test-id="zoom-input-trigger"
- class="w-full cursor-pointer rounded border border-border bg-input px-2 py-1 text-left text-xs text-surface hover:border-muted"
- @click="startEditing"
+ <MenuScrollArea>
+ <div class="px-1 py-1">
+ <input
+ v-if="editing"
+ ref="inputRef"
+ v-model="inputValue"
+ data-test-id="zoom-input"
+ class="w-full rounded border border-accent bg-input px-2 py-1 text-xs text-surface outline-none"
+ @blur="commitInput"
+ @keydown.enter="commitInput"
+ @keydown.escape.stop="cancelInput"
+ />
+ <button
+ v-else
+ data-test-id="zoom-input-trigger"
+ class="w-full cursor-pointer rounded border border-border bg-input px-2 py-1 text-left text-xs text-surface hover:border-muted"
+ @click="startEditing"
+ >
+ {{ zoomPercent() }}%
+ </button>
+ </div>
+
+ <DropdownMenuSeparator :class="menuCls.separator" />
+
+ <DropdownMenuItem :class="itemCls" @select="zoomIn">
+ <span class="flex-1">{{ menuText.zoomIn }}</span>
+ <AppShortcutText>{{ appMenuShortcutLabel('zoom-in') }}</AppShortcutText>
+ </DropdownMenuItem>
+ <DropdownMenuItem :class="itemCls" @select="zoomOut">
+ <span class="flex-1">{{ menuText.zoomOut }}</span>
+ <AppShortcutText>{{ appMenuShortcutLabel('zoom-out') }}</AppShortcutText>
+ </DropdownMenuItem>
+ <DropdownMenuItem :class="itemCls" @select="getCommand('view.zoomFit').run()">
+ <span class="flex-1">{{ commands.zoomToFit }}</span>
+ <AppShortcutText>{{ appMenuShortcutLabel('view.zoomFit') }}</AppShortcutText>
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ v-for="preset in ZOOM_PRESETS"
+ :key="preset.level"
+ :class="itemCls"
+ @select="store.zoomToLevel(preset.level)"
>
- {{ zoomPercent() }}%
- </button>
- </div>
-
- <DropdownMenuSeparator :class="menuCls.separator" />
-
- <DropdownMenuItem :class="itemCls" @select="zoomIn">
- <span class="flex-1">{{ menuText.zoomIn }}</span>
- <AppShortcutText>{{ appMenuShortcutLabel('zoom-in') }}</AppShortcutText>
- </DropdownMenuItem>
- <DropdownMenuItem :class="itemCls" @select="zoomOut">
- <span class="flex-1">{{ menuText.zoomOut }}</span>
- <AppShortcutText>{{ appMenuShortcutLabel('zoom-out') }}</AppShortcutText>
- </DropdownMenuItem>
- <DropdownMenuItem :class="itemCls" @select="getCommand('view.zoomFit').run()">
- <span class="flex-1">{{ commands.zoomToFit }}</span>
- <AppShortcutText>{{ appMenuShortcutLabel('view.zoomFit') }}</AppShortcutText>
- </DropdownMenuItem>
- <DropdownMenuItem
- v-for="preset in ZOOM_PRESETS"
- :key="preset.level"
- :class="itemCls"
- @select="store.zoomToLevel(preset.level)"
- >
- <icon-lucide-check v-if="isActivePreset(preset.level)" class="absolute left-2 size-3.5" />
- <span class="flex-1">{{ preset.label() }}</span>
- <AppShortcutText v-if="preset.shortcut">{{ preset.shortcut }}</AppShortcutText>
- </DropdownMenuItem>
-
- <DropdownMenuSeparator :class="menuCls.separator" />
-
- <DropdownMenuItem :class="itemCls" @select.prevent="togglePixelGrid">
- <icon-lucide-check
- v-if="store.state.showPixelGrid !== false"
- class="absolute left-2 size-3.5"
- />
- <span class="flex-1">{{ menuText.pixelGrid }}</span>
- <AppShortcutText>{{ appMenuShortcutLabel('view-pixel-grid') }}</AppShortcutText>
- </DropdownMenuItem>
- <DropdownMenuItem
- :class="itemCls"
- @select.prevent="
- setSnappingPreference('pixelGrid', !store.state.snappingPreferences.pixelGrid)
- "
- >
- <icon-lucide-check
- v-if="store.state.snappingPreferences.pixelGrid"
- class="absolute left-2 size-3.5"
- />
- <span class="flex-1">{{ menuText.snapToPixelGrid }}</span>
- <AppShortcutText>{{ appMenuShortcutLabel('snap-pixel-grid') }}</AppShortcutText>
- </DropdownMenuItem>
- <DropdownMenuItem :class="itemCls" @select.prevent="toggleRulers">
- <icon-lucide-check v-if="store.state.showRulers" class="absolute left-2 size-3.5" />
- <span class="flex-1">{{ panels.rulers }}</span>
- <AppShortcutText>{{ appMenuShortcutLabel('view-rulers') }}</AppShortcutText>
- </DropdownMenuItem>
- <DropdownMenuItem :class="itemCls" @select.prevent="toggleRemoteCursors">
- <icon-lucide-check
- v-if="store.state.showRemoteCursors"
- class="absolute left-2 size-3.5"
- />
- <span class="flex-1">{{ panels.multiplayerCursors }}</span>
- <AppShortcutText>{{ appMenuShortcutLabel('view-multiplayer-cursors') }}</AppShortcutText>
- </DropdownMenuItem>
- <DropdownMenuItem
- :class="itemCls"
- @select.prevent="setDesignIssuesOnCanvas(!appPreferences.designCheck.showOnCanvas)"
- >
- <icon-lucide-check
- v-if="appPreferences.designCheck.showOnCanvas"
- class="absolute left-2 size-3.5"
- />
- <span class="flex-1">{{ menuText.designIssues }}</span>
- </DropdownMenuItem>
- <DropdownMenuItem
- :class="itemCls"
- @select.prevent="setCommentsOnCanvas(!appPreferences.comments.showOnCanvas)"
- >
- <icon-lucide-check
- v-if="appPreferences.comments.showOnCanvas"
- class="absolute left-2 size-3.5"
- />
- <span class="flex-1">{{ menuText.comments }}</span>
- <AppShortcutText>{{ appMenuShortcutLabel('view-comments') }}</AppShortcutText>
- </DropdownMenuItem>
+ <icon-lucide-check
+ v-if="isActivePreset(preset.level)"
+ class="absolute left-2 size-3.5"
+ />
+ <span class="flex-1">{{ preset.label() }}</span>
+ <AppShortcutText v-if="preset.shortcut">{{ preset.shortcut }}</AppShortcutText>
+ </DropdownMenuItem>
+
+ <DropdownMenuSeparator :class="menuCls.separator" />
+
+ <DropdownMenuItem :class="itemCls" @select.prevent="togglePixelGrid">
+ <icon-lucide-check
+ v-if="store.state.showPixelGrid !== false"
+ class="absolute left-2 size-3.5"
+ />
+ <span class="flex-1">{{ menuText.pixelGrid }}</span>
+ <AppShortcutText>{{ appMenuShortcutLabel('view-pixel-grid') }}</AppShortcutText>
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ :class="itemCls"
+ @select.prevent="
+ setSnappingPreference('pixelGrid', !store.state.snappingPreferences.pixelGrid)
+ "
+ >
+ <icon-lucide-check
+ v-if="store.state.snappingPreferences.pixelGrid"
+ class="absolute left-2 size-3.5"
+ />
+ <span class="flex-1">{{ menuText.snapToPixelGrid }}</span>
+ <AppShortcutText>{{ appMenuShortcutLabel('snap-pixel-grid') }}</AppShortcutText>
+ </DropdownMenuItem>
+ <DropdownMenuItem :class="itemCls" @select.prevent="toggleRulers">
+ <icon-lucide-check v-if="store.state.showRulers" class="absolute left-2 size-3.5" />
+ <span class="flex-1">{{ panels.rulers }}</span>
+ <AppShortcutText>{{ appMenuShortcutLabel('view-rulers') }}</AppShortcutText>
+ </DropdownMenuItem>
+ <DropdownMenuItem :class="itemCls" @select.prevent="toggleRemoteCursors">
+ <icon-lucide-check
+ v-if="store.state.showRemoteCursors"
+ class="absolute left-2 size-3.5"
+ />
+ <span class="flex-1">{{ panels.multiplayerCursors }}</span>
+ <AppShortcutText>{{
+ appMenuShortcutLabel('view-multiplayer-cursors')
+ }}</AppShortcutText>
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ :class="itemCls"
+ @select.prevent="setDesignIssuesOnCanvas(!appPreferences.designCheck.showOnCanvas)"
+ >
+ <icon-lucide-check
+ v-if="appPreferences.designCheck.showOnCanvas"
+ class="absolute left-2 size-3.5"
+ />
+ <span class="flex-1">{{ menuText.designIssues }}</span>
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ :class="itemCls"
+ @select.prevent="setCommentsOnCanvas(!appPreferences.comments.showOnCanvas)"
+ >
+ <icon-lucide-check
+ v-if="appPreferences.comments.showOnCanvas"
+ class="absolute left-2 size-3.5"
+ />
+ <span class="flex-1">{{ menuText.comments }}</span>
+ <AppShortcutText>{{ appMenuShortcutLabel('view-comments') }}</AppShortcutText>
+ </DropdownMenuItem>
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
diff --git a/src/components/properties/BooleanOperationsControl.vue b/src/components/properties/BooleanOperationsControl.vue
index a94710d70..aa63d942d 100644
--- a/src/components/properties/BooleanOperationsControl.vue
+++ b/src/components/properties/BooleanOperationsControl.vue
@@ -23,6 +23,7 @@ import {
import type { EditorCommandId } from '@open-pencil/vue'
import { menuItem, useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import Tip from '@/components/ui/overlay/Tip.vue'
const { getCommand, runCommand } = useEditorCommands()
@@ -56,22 +57,24 @@ const itemCls = menuItem({ justify: 'between' })
</Tip>
<DropdownMenuPortal v-if="portalActive">
<DropdownMenuContent align="end" side="bottom" :side-offset="4" :class="menuCls.content">
- <DropdownMenuItem
- v-for="operation in operations"
- :key="operation.id"
- :data-test-id="`boolean-operation-${operation.id.replace('selection.', '')}`"
- :class="itemCls"
- :disabled="!getCommand(operation.id).enabled.value"
- @select="runCommand(operation.id)"
- >
- <div class="flex min-w-0 items-center gap-2">
- <component :is="operation.icon" class="size-3.5 shrink-0 text-muted" />
- <span>{{ getCommand(operation.id).label }}</span>
- </div>
- <span class="ml-6 text-[11px] text-muted">{{
- formatShortcut(editorCommandMetadata(operation.id).shortcut)
- }}</span>
- </DropdownMenuItem>
+ <MenuScrollArea>
+ <DropdownMenuItem
+ v-for="operation in operations"
+ :key="operation.id"
+ :data-test-id="`boolean-operation-${operation.id.replace('selection.', '')}`"
+ :class="itemCls"
+ :disabled="!getCommand(operation.id).enabled.value"
+ @select="runCommand(operation.id)"
+ >
+ <div class="flex min-w-0 items-center gap-2">
+ <component :is="operation.icon" class="size-3.5 shrink-0 text-muted" />
+ <span>{{ getCommand(operation.id).label }}</span>
+ </div>
+ <span class="ml-6 text-[11px] text-muted">{{
+ formatShortcut(editorCommandMetadata(operation.id).shortcut)
+ }}</span>
+ </DropdownMenuItem>
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
diff --git a/src/components/properties/ExportScaleInput.vue b/src/components/properties/ExportScaleInput.vue
index 258228dc1..d8b119ad6 100644
--- a/src/components/properties/ExportScaleInput.vue
+++ b/src/components/properties/ExportScaleInput.vue
@@ -12,6 +12,7 @@ import { useRetainedPopup } from '@open-pencil/vue'
import { useInputUI } from '@/components/ui/input/input'
import { menuItem, useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import Tip from '@/components/ui/overlay/Tip.vue'
interface ExportScaleInputProps {
@@ -94,15 +95,17 @@ function isActive(scale: number) {
</DropdownMenuTrigger>
<DropdownMenuPortal v-if="portalActive">
<DropdownMenuContent side="bottom" align="end" :side-offset="4" :class="menuCls.content">
- <DropdownMenuItem
- v-for="scale in presets"
- :key="scale"
- :class="itemCls"
- @select="pick(scale)"
- >
- <span>{{ scale }}x</span>
- <icon-lucide-check v-if="isActive(scale)" class="size-3 text-primary" />
- </DropdownMenuItem>
+ <MenuScrollArea>
+ <DropdownMenuItem
+ v-for="scale in presets"
+ :key="scale"
+ :class="itemCls"
+ @select="pick(scale)"
+ >
+ <span>{{ scale }}x</span>
+ <icon-lucide-check v-if="isActive(scale)" class="size-3 text-primary" />
+ </DropdownMenuItem>
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
diff --git a/src/components/properties/LayerTypeMenu.vue b/src/components/properties/LayerTypeMenu.vue
index 0d77be6db..c045e6609 100644
--- a/src/components/properties/LayerTypeMenu.vue
+++ b/src/components/properties/LayerTypeMenu.vue
@@ -17,6 +17,7 @@ import { useI18n, useRetainedPopup } from '@open-pencil/vue'
import { useEditorStore } from '@/app/editor/active-store'
import { NODE_ICONS } from '@/app/editor/icons'
import { menuItem, useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import Tip from '@/components/ui/overlay/Tip.vue'
// Figma's layer type menu: a frame, a group, and a section switch to one another in place.
@@ -54,19 +55,21 @@ const itemCls = menuItem({ justify: 'between' })
</Tip>
<DropdownMenuPortal v-if="portalActive">
<DropdownMenuContent align="start" side="bottom" :side-offset="4" :class="menuCls.content">
- <DropdownMenuItem
- v-for="item in types"
- :key="item.type"
- :class="itemCls"
- :disabled="disabled(item.type)"
- @select="item.type !== node.type && store.convertLayerType(node.id, item.type)"
- >
- <div class="flex min-w-0 items-center gap-2">
- <component :is="item.icon" class="size-3.5 shrink-0 text-muted" />
- <span>{{ item.label() }}</span>
- </div>
- <IconCheck v-if="item.type === node.type" class="ml-4 size-3.5" />
- </DropdownMenuItem>
+ <MenuScrollArea>
+ <DropdownMenuItem
+ v-for="item in types"
+ :key="item.type"
+ :class="itemCls"
+ :disabled="disabled(item.type)"
+ @select="item.type !== node.type && store.convertLayerType(node.id, item.type)"
+ >
+ <div class="flex min-w-0 items-center gap-2">
+ <component :is="item.icon" class="size-3.5 shrink-0 text-muted" />
+ <span>{{ item.label() }}</span>
+ </div>
+ <IconCheck v-if="item.type === node.type" class="ml-4 size-3.5" />
+ </DropdownMenuItem>
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
diff --git a/src/components/properties/component-properties/ComponentPropertyListSection.vue b/src/components/properties/component-properties/ComponentPropertyListSection.vue
index 0bd498bcb..f16a45fa0 100644
--- a/src/components/properties/component-properties/ComponentPropertyListSection.vue
+++ b/src/components/properties/component-properties/ComponentPropertyListSection.vue
@@ -19,6 +19,7 @@ import { useComponentPropertyAuthoring, useFlatReorderDrag, useI18n } from '@ope
import AppButton from '@/components/ui/button/AppButton.vue'
import IconButton from '@/components/ui/button/IconButton.vue'
import { menuItem, useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import { usePopoverUI } from '@/components/ui/overlay/popover'
import Tip from '@/components/ui/overlay/Tip.vue'
import PanelFieldGroup from '@/components/ui/panel/PanelFieldGroup.vue'
@@ -132,36 +133,38 @@ function valueLabel(type: ComponentPropertyType, value: string) {
:class="menu.content"
@close-auto-focus="openNestedAfterMenu"
>
- <DropdownMenuItem
- v-for="option in NEW_PROPERTIES"
- :key="option.type"
- :class="item"
- :data-property-type="option.type"
- @select="addProperty(option.type, option.label())"
- >
- <PropertyTypeIcon :kind="option.type" />
- {{ option.label() }}
- </DropdownMenuItem>
- <DropdownMenuItem
- v-if="componentSet"
- :class="item"
- data-property-type="VARIANT"
- @select="authoring.addVariantProperty()"
- >
- <PropertyTypeIcon kind="VARIANT" />
- {{ panels.componentPropertyVariant }}
- </DropdownMenuItem>
- <template v-if="nestedInstances.length">
- <DropdownMenuSeparator :class="menu.separator" />
+ <MenuScrollArea>
<DropdownMenuItem
+ v-for="option in NEW_PROPERTIES"
+ :key="option.type"
:class="item"
- data-property-type="nested"
- @select="nestedRequested = true"
+ :data-property-type="option.type"
+ @select="addProperty(option.type, option.label())"
>
- <icon-lucide-component :class="menu.icon" />
- {{ panels.nestedInstances }}…
+ <PropertyTypeIcon :kind="option.type" />
+ {{ option.label() }}
</DropdownMenuItem>
- </template>
+ <DropdownMenuItem
+ v-if="componentSet"
+ :class="item"
+ data-property-type="VARIANT"
+ @select="authoring.addVariantProperty()"
+ >
+ <PropertyTypeIcon kind="VARIANT" />
+ {{ panels.componentPropertyVariant }}
+ </DropdownMenuItem>
+ <template v-if="nestedInstances.length">
+ <DropdownMenuSeparator :class="menu.separator" />
+ <DropdownMenuItem
+ :class="item"
+ data-property-type="nested"
+ @select="nestedRequested = true"
+ >
+ <icon-lucide-component :class="menu.icon" />
+ {{ panels.nestedInstances }}…
+ </DropdownMenuItem>
+ </template>
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
diff --git a/src/components/properties/component-properties/PropertyBindButton.vue b/src/components/properties/component-properties/PropertyBindButton.vue
index 6cce01727..c1b7771d4 100644
--- a/src/components/properties/component-properties/PropertyBindButton.vue
+++ b/src/components/properties/component-properties/PropertyBindButton.vue
@@ -13,6 +13,7 @@ import { usePanelMessages } from '@open-pencil/vue'
import IconButton from '@/components/ui/button/IconButton.vue'
import { menuItem, useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import PropertyTypeIcon from './PropertyTypeIcon.vue'
import { usePropertyBinding, type BindableField } from './usePropertyBinding'
@@ -38,23 +39,25 @@ const item = menuItem({ justify: 'start' })
</DropdownMenuTrigger>
<DropdownMenuPortal>
<DropdownMenuContent side="bottom" align="end" :side-offset="4" :class="menu.content">
- <DropdownMenuItem :class="item" @select="binding.create()">
- <icon-lucide-plus :class="menu.icon" />
- {{ panels.createComponentProperty }}
- </DropdownMenuItem>
- <template v-if="binding.compatible.value.length">
- <DropdownMenuSeparator :class="menu.separator" />
- <DropdownMenuLabel :class="menu.label">{{ panels.properties }}</DropdownMenuLabel>
- <DropdownMenuItem
- v-for="definition in binding.compatible.value"
- :key="definition.id"
- :class="item"
- @select="binding.bind(definition.id)"
- >
- <PropertyTypeIcon :kind="definition.type" />
- {{ definition.name }}
+ <MenuScrollArea>
+ <DropdownMenuItem :class="item" @select="binding.create()">
+ <icon-lucide-plus :class="menu.icon" />
+ {{ panels.createComponentProperty }}
</DropdownMenuItem>
- </template>
+ <template v-if="binding.compatible.value.length">
+ <DropdownMenuSeparator :class="menu.separator" />
+ <DropdownMenuLabel :class="menu.label">{{ panels.properties }}</DropdownMenuLabel>
+ <DropdownMenuItem
+ v-for="definition in binding.compatible.value"
+ :key="definition.id"
+ :class="item"
+ @select="binding.bind(definition.id)"
+ >
+ <PropertyTypeIcon :kind="definition.type" />
+ {{ definition.name }}
+ </DropdownMenuItem>
+ </template>
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
diff --git a/src/components/properties/component-properties/PropertyBoundField.vue b/src/components/properties/component-properties/PropertyBoundField.vue
index 3b8c5bf6a..00cc33fec 100644
--- a/src/components/properties/component-properties/PropertyBoundField.vue
+++ b/src/components/properties/component-properties/PropertyBoundField.vue
@@ -11,6 +11,7 @@ import { usePanelMessages } from '@open-pencil/vue'
import IconButton from '@/components/ui/button/IconButton.vue'
import { menuItem, useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import PanelFieldGroup from '@/components/ui/panel/PanelFieldGroup.vue'
import PropertyTypeIcon from './PropertyTypeIcon.vue'
@@ -49,18 +50,20 @@ const chip =
</DropdownMenuTrigger>
<DropdownMenuPortal>
<DropdownMenuContent side="bottom" align="end" :side-offset="4" :class="menu.content">
- <DropdownMenuItem :class="item" @select="binding.goToProperty()">
- <icon-lucide-crosshair :class="menu.icon" />
- {{ panels.goToComponentProperty }}
- </DropdownMenuItem>
- <DropdownMenuItem
- :class="item"
- :disabled="!binding.editable.value"
- @select="binding.bind(null)"
- >
- <icon-lucide-unlink :class="menu.icon" />
- {{ panels.detachComponentProperty }}
- </DropdownMenuItem>
+ <MenuScrollArea>
+ <DropdownMenuItem :class="item" @select="binding.goToProperty()">
+ <icon-lucide-crosshair :class="menu.icon" />
+ {{ panels.goToComponentProperty }}
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ :class="item"
+ :disabled="!binding.editable.value"
+ @select="binding.bind(null)"
+ >
+ <icon-lucide-unlink :class="menu.icon" />
+ {{ panels.detachComponentProperty }}
+ </DropdownMenuItem>
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
diff --git a/src/components/properties/component-properties/instance-update/InstanceUpdateAction.vue b/src/components/properties/component-properties/instance-update/InstanceUpdateAction.vue
index 349fc603d..8ff610e50 100644
--- a/src/components/properties/component-properties/instance-update/InstanceUpdateAction.vue
+++ b/src/components/properties/component-properties/instance-update/InstanceUpdateAction.vue
@@ -15,6 +15,7 @@ import type { EditorStore } from '@/app/editor/session'
import type { LibraryService } from '@/app/libraries'
import { useInstanceUpdate } from '@/components/properties/component-properties/instance-update/use'
import { useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import Tip from '@/components/ui/overlay/Tip.vue'
const { node, editor, service } = defineProps<{
@@ -53,21 +54,23 @@ const { available, updating, updateSelectedInstance } = useInstanceUpdate(
</Tip>
<DropdownMenuPortal v-if="portalActive">
<DropdownMenuContent align="end" side="bottom" :side-offset="4" :class="menu.content">
- <DropdownMenuItem
- data-test-id="instance-update-selected"
- :class="menu.item"
- :disabled="updating"
- @select="updateSelectedInstance"
- >
- {{ panels.updateSelectedInstance }}
- </DropdownMenuItem>
- <DropdownMenuItem
- data-test-id="instance-review-update"
- :class="menu.item"
- @select="emit('review')"
- >
- {{ panels.reviewLibraryUpdate }}
- </DropdownMenuItem>
+ <MenuScrollArea>
+ <DropdownMenuItem
+ data-test-id="instance-update-selected"
+ :class="menu.item"
+ :disabled="updating"
+ @select="updateSelectedInstance"
+ >
+ {{ panels.updateSelectedInstance }}
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ data-test-id="instance-review-update"
+ :class="menu.item"
+ @select="emit('review')"
+ >
+ {{ panels.reviewLibraryUpdate }}
+ </DropdownMenuItem>
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
diff --git a/src/components/properties/component-properties/slot/SlotPropertyRow.vue b/src/components/properties/component-properties/slot/SlotPropertyRow.vue
index 609073781..0a9557784 100644
--- a/src/components/properties/component-properties/slot/SlotPropertyRow.vue
+++ b/src/components/properties/component-properties/slot/SlotPropertyRow.vue
@@ -12,6 +12,7 @@ import type { SlotInstanceOption, SlotLimit } from '@open-pencil/vue'
import IconButton from '@/components/ui/button/IconButton.vue'
import { menuItem, useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import PanelFieldGroup from '@/components/ui/panel/PanelFieldGroup.vue'
import { panelFieldBase } from '@/theme/panel/field'
@@ -79,18 +80,20 @@ const item = menuItem({ justify: 'start' })
</DropdownMenuTrigger>
<DropdownMenuPortal>
<DropdownMenuContent side="bottom" align="end" :side-offset="4" :class="menu.content">
- <DropdownMenuItem :class="item" :disabled="!modified" @select="emit('reset')">
- <icon-lucide-rotate-ccw :class="menu.icon" />
- {{ panels.resetSlot }}
- </DropdownMenuItem>
- <DropdownMenuItem
- :class="item"
- :disabled="itemCount === 0"
- @select="emit('deleteContents')"
- >
- <icon-lucide-trash-2 :class="menu.icon" />
- {{ panels.deleteSlotContents }}
- </DropdownMenuItem>
+ <MenuScrollArea>
+ <DropdownMenuItem :class="item" :disabled="!modified" @select="emit('reset')">
+ <icon-lucide-rotate-ccw :class="menu.icon" />
+ {{ panels.resetSlot }}
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ :class="item"
+ :disabled="itemCount === 0"
+ @select="emit('deleteContents')"
+ >
+ <icon-lucide-trash-2 :class="menu.icon" />
+ {{ panels.deleteSlotContents }}
+ </DropdownMenuItem>
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
diff --git a/src/components/properties/variable-modes/VariableModeMenu.vue b/src/components/properties/variable-modes/VariableModeMenu.vue
index 2fa3b7dd0..33bf5fd02 100644
--- a/src/components/properties/variable-modes/VariableModeMenu.vue
+++ b/src/components/properties/variable-modes/VariableModeMenu.vue
@@ -19,6 +19,7 @@ import { MIXED, usePanelMessages, type VariableModeChoice } from '@open-pencil/v
import IconButton from '@/components/ui/button/IconButton.vue'
import { menuItem, useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import { AUTO_MODE, autoModeLabel } from './labels'
@@ -56,50 +57,54 @@ function select(choice: VariableModeChoice, value: string) {
</DropdownMenuTrigger>
<DropdownMenuPortal>
<DropdownMenuContent side="bottom" align="end" :side-offset="4" :class="menu.content">
- <template v-for="(group, index) in groups" :key="group.label">
- <DropdownMenuSeparator v-if="index > 0" :class="menu.separator" />
- <DropdownMenuLabel :class="menu.label">{{ group.label }}</DropdownMenuLabel>
- <DropdownMenuSub v-for="choice in group.choices" :key="choice.collectionId">
- <DropdownMenuSubTrigger
- :class="[menu.subTrigger, 'justify-between data-[highlighted]:bg-hover']"
- >
- {{ choice.name }}
- <icon-lucide-chevron-right :class="menu.icon" />
- </DropdownMenuSubTrigger>
- <DropdownMenuPortal>
- <DropdownMenuSubContent :side-offset="4" :class="menu.content">
- <DropdownMenuRadioGroup
- :model-value="current(choice)"
- @update:model-value="
- (value) => typeof value === 'string' && select(choice, value)
- "
- >
- <DropdownMenuRadioItem :value="AUTO_MODE" :class="item">
- <DropdownMenuItemIndicator class="absolute left-1.5">
- <icon-lucide-check :class="menu.icon" />
- </DropdownMenuItemIndicator>
- {{ autoModeLabel(panels, choice) }}
- </DropdownMenuRadioItem>
- <DropdownMenuSeparator :class="menu.separator" />
- <DropdownMenuLabel :class="menu.label">
- {{ panels.variableModeHeading }}
- </DropdownMenuLabel>
- <DropdownMenuRadioItem
- v-for="mode in choice.modes"
- :key="mode.modeId"
- :value="mode.modeId"
- :class="item"
- >
- <DropdownMenuItemIndicator class="absolute left-1.5">
- <icon-lucide-check :class="menu.icon" />
- </DropdownMenuItemIndicator>
- {{ mode.name }}
- </DropdownMenuRadioItem>
- </DropdownMenuRadioGroup>
- </DropdownMenuSubContent>
- </DropdownMenuPortal>
- </DropdownMenuSub>
- </template>
+ <MenuScrollArea>
+ <template v-for="(group, index) in groups" :key="group.label">
+ <DropdownMenuSeparator v-if="index > 0" :class="menu.separator" />
+ <DropdownMenuLabel :class="menu.label">{{ group.label }}</DropdownMenuLabel>
+ <DropdownMenuSub v-for="choice in group.choices" :key="choice.collectionId">
+ <DropdownMenuSubTrigger
+ :class="[menu.subTrigger, 'justify-between data-[highlighted]:bg-hover']"
+ >
+ {{ choice.name }}
+ <icon-lucide-chevron-right :class="menu.icon" />
+ </DropdownMenuSubTrigger>
+ <DropdownMenuPortal>
+ <DropdownMenuSubContent :side-offset="4" :class="menu.content">
+ <MenuScrollArea>
+ <DropdownMenuRadioGroup
+ :model-value="current(choice)"
+ @update:model-value="
+ (value) => typeof value === 'string' && select(choice, value)
+ "
+ >
+ <DropdownMenuRadioItem :value="AUTO_MODE" :class="item">
+ <DropdownMenuItemIndicator class="absolute left-1.5">
+ <icon-lucide-check :class="menu.icon" />
+ </DropdownMenuItemIndicator>
+ {{ autoModeLabel(panels, choice) }}
+ </DropdownMenuRadioItem>
+ <DropdownMenuSeparator :class="menu.separator" />
+ <DropdownMenuLabel :class="menu.label">
+ {{ panels.variableModeHeading }}
+ </DropdownMenuLabel>
+ <DropdownMenuRadioItem
+ v-for="mode in choice.modes"
+ :key="mode.modeId"
+ :value="mode.modeId"
+ :class="item"
+ >
+ <DropdownMenuItemIndicator class="absolute left-1.5">
+ <icon-lucide-check :class="menu.icon" />
+ </DropdownMenuItemIndicator>
+ {{ mode.name }}
+ </DropdownMenuRadioItem>
+ </DropdownMenuRadioGroup>
+ </MenuScrollArea>
+ </DropdownMenuSubContent>
+ </DropdownMenuPortal>
+ </DropdownMenuSub>
+ </template>
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
diff --git a/src/components/settings/toolbar/ToolbarLayoutRow.vue b/src/components/settings/toolbar/ToolbarLayoutRow.vue
index 745f58032..29c0a81dd 100644
--- a/src/components/settings/toolbar/ToolbarLayoutRow.vue
+++ b/src/components/settings/toolbar/ToolbarLayoutRow.vue
@@ -15,6 +15,7 @@ import { useI18n } from '@open-pencil/vue'
import IconButton from '@/components/ui/button/IconButton.vue'
import AppShortcutText from '@/components/ui/menu/AppShortcutText.vue'
import { useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import AppSwitch from '@/components/ui/toggle/AppSwitch.vue'
import theme from '@/theme/settings/toolbar/row'
@@ -120,33 +121,35 @@ function onGripKey(event: KeyboardEvent) {
:side-offset="4"
@close-auto-focus.prevent
>
- <DropdownMenuItem
- :class="menu.item"
- :disabled="!canMoveUp"
- @select="emit('move', -1, 'options')"
- >
- <icon-lucide-arrow-up :class="menu.icon" />
- {{ settings.toolbarMoveUp }}
- </DropdownMenuItem>
- <DropdownMenuItem
- :class="menu.item"
- :disabled="!canMoveDown"
- @select="emit('move', 1, 'options')"
- >
- <icon-lucide-arrow-down :class="menu.icon" />
- {{ settings.toolbarMoveDown }}
- </DropdownMenuItem>
- <template v-if="groupWith || inFlyout">
- <DropdownMenuSeparator :class="menu.separator" />
- <DropdownMenuItem v-if="groupWith" :class="menu.item" @select="emit('group')">
- <icon-lucide-link-2 :class="menu.icon" />
- {{ settings.toolbarGroupWith({ tool: groupWith }) }}
+ <MenuScrollArea>
+ <DropdownMenuItem
+ :class="menu.item"
+ :disabled="!canMoveUp"
+ @select="emit('move', -1, 'options')"
+ >
+ <icon-lucide-arrow-up :class="menu.icon" />
+ {{ settings.toolbarMoveUp }}
</DropdownMenuItem>
- <DropdownMenuItem v-if="inFlyout" :class="menu.item" @select="emit('ungroup')">
- <icon-lucide-unlink-2 :class="menu.icon" />
- {{ settings.toolbarUngroup }}
+ <DropdownMenuItem
+ :class="menu.item"
+ :disabled="!canMoveDown"
+ @select="emit('move', 1, 'options')"
+ >
+ <icon-lucide-arrow-down :class="menu.icon" />
+ {{ settings.toolbarMoveDown }}
</DropdownMenuItem>
- </template>
+ <template v-if="groupWith || inFlyout">
+ <DropdownMenuSeparator :class="menu.separator" />
+ <DropdownMenuItem v-if="groupWith" :class="menu.item" @select="emit('group')">
+ <icon-lucide-link-2 :class="menu.icon" />
+ {{ settings.toolbarGroupWith({ tool: groupWith }) }}
+ </DropdownMenuItem>
+ <DropdownMenuItem v-if="inFlyout" :class="menu.item" @select="emit('ungroup')">
+ <icon-lucide-unlink-2 :class="menu.icon" />
+ {{ settings.toolbarUngroup }}
+ </DropdownMenuItem>
+ </template>
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
diff --git a/src/components/shell/AppMenu.vue b/src/components/shell/AppMenu.vue
index 8ff481731..5cce99b84 100644
--- a/src/components/shell/AppMenu.vue
+++ b/src/components/shell/AppMenu.vue
@@ -42,6 +42,7 @@ import { useScrollOverflow } from '@/components/shell/useScrollOverflow'
import IconButton from '@/components/ui/button/IconButton.vue'
import AppShortcutText from '@/components/ui/menu/AppShortcutText.vue'
import { useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import { IS_TAURI } from '@/constants'
const store = useEditorStore()
@@ -123,69 +124,73 @@ const { overflowStart, overflowEnd, scrollTowardHidden } = useScrollOverflow(men
<MenubarPortal>
<MenubarContent :side-offset="4" align="start" :class="mainMenuCls.content">
- <template v-for="(item, i) in menu.items" :key="i">
- <MenubarSeparator v-if="isMenuSeparator(item)" :class="menuCls.separator" />
- <MenubarSub v-else-if="hasMenuSubItems(item)">
- <MenubarSubTrigger :class="menuCls.item" :disabled="menuDisabled(item)">
+ <MenuScrollArea>
+ <template v-for="(item, i) in menu.items" :key="i">
+ <MenubarSeparator v-if="isMenuSeparator(item)" :class="menuCls.separator" />
+ <MenubarSub v-else-if="hasMenuSubItems(item)">
+ <MenubarSubTrigger :class="menuCls.item" :disabled="menuDisabled(item)">
+ <span class="flex-1">{{ menuLabel(item) }}</span>
+ <IconChevronRight class="size-3 text-muted" />
+ </MenubarSubTrigger>
+ <MenubarPortal>
+ <MenubarSubContent :side-offset="4" :class="subMenuCls.content">
+ <MenuScrollArea>
+ <template v-for="(sub, j) in menuSubItems(item)" :key="j">
+ <MenubarSeparator
+ v-if="isMenuSeparator(sub)"
+ :class="menuCls.separator"
+ />
+ <MenubarCheckboxItem
+ v-else-if="isMenuCheckbox(sub)"
+ :model-value="menuChecked(sub)"
+ :class="menuCls.item"
+ @update:model-value="updateMenuChecked(sub, $event as boolean)"
+ >
+ <span class="flex-1">{{ menuLabel(sub) }}</span>
+ <MenubarItemIndicator class="text-surface">
+ <icon-lucide-check class="size-3.5" />
+ </MenubarItemIndicator>
+ </MenubarCheckboxItem>
+ <MenubarItem
+ v-else
+ :class="menuCls.item"
+ :disabled="menuDisabled(sub)"
+ @select="runMenuAction(sub)"
+ >
+ <span class="flex-1">{{ menuLabel(sub) }}</span>
+ <AppShortcutText v-if="menuShortcut(sub)">{{
+ menuShortcut(sub)
+ }}</AppShortcutText>
+ </MenubarItem>
+ </template>
+ </MenuScrollArea>
+ </MenubarSubContent>
+ </MenubarPortal>
+ </MenubarSub>
+ <MenubarCheckboxItem
+ v-else-if="isMenuCheckbox(item)"
+ :model-value="menuChecked(item)"
+ :class="menuCls.item"
+ @update:model-value="updateMenuChecked(item, $event as boolean)"
+ >
<span class="flex-1">{{ menuLabel(item) }}</span>
- <IconChevronRight class="size-3 text-muted" />
- </MenubarSubTrigger>
- <MenubarPortal>
- <MenubarSubContent :side-offset="4" :class="subMenuCls.content">
- <template v-for="(sub, j) in menuSubItems(item)" :key="j">
- <MenubarSeparator
- v-if="isMenuSeparator(sub)"
- :class="menuCls.separator"
- />
- <MenubarCheckboxItem
- v-else-if="isMenuCheckbox(sub)"
- :model-value="menuChecked(sub)"
- :class="menuCls.item"
- @update:model-value="updateMenuChecked(sub, $event as boolean)"
- >
- <span class="flex-1">{{ menuLabel(sub) }}</span>
- <MenubarItemIndicator class="text-surface">
- <icon-lucide-check class="size-3.5" />
- </MenubarItemIndicator>
- </MenubarCheckboxItem>
- <MenubarItem
- v-else
- :class="menuCls.item"
- :disabled="menuDisabled(sub)"
- @select="runMenuAction(sub)"
- >
- <span class="flex-1">{{ menuLabel(sub) }}</span>
- <AppShortcutText v-if="menuShortcut(sub)">{{
- menuShortcut(sub)
- }}</AppShortcutText>
- </MenubarItem>
- </template>
- </MenubarSubContent>
- </MenubarPortal>
- </MenubarSub>
- <MenubarCheckboxItem
- v-else-if="isMenuCheckbox(item)"
- :model-value="menuChecked(item)"
- :class="menuCls.item"
- @update:model-value="updateMenuChecked(item, $event as boolean)"
- >
- <span class="flex-1">{{ menuLabel(item) }}</span>
- <MenubarItemIndicator class="text-surface">
- <icon-lucide-check class="size-3.5" />
- </MenubarItemIndicator>
- </MenubarCheckboxItem>
- <MenubarItem
- v-else
- :class="menuCls.item"
- :disabled="menuDisabled(item)"
- @select="runMenuAction(item)"
- >
- <span class="flex-1">{{ menuLabel(item) }}</span>
- <AppShortcutText v-if="menuShortcut(item)">{{
- menuShortcut(item)
- }}</AppShortcutText>
- </MenubarItem>
- </template>
+ <MenubarItemIndicator class="text-surface">
+ <icon-lucide-check class="size-3.5" />
+ </MenubarItemIndicator>
+ </MenubarCheckboxItem>
+ <MenubarItem
+ v-else
+ :class="menuCls.item"
+ :disabled="menuDisabled(item)"
+ @select="runMenuAction(item)"
+ >
+ <span class="flex-1">{{ menuLabel(item) }}</span>
+ <AppShortcutText v-if="menuShortcut(item)">{{
+ menuShortcut(item)
+ }}</AppShortcutText>
+ </MenubarItem>
+ </template>
+ </MenuScrollArea>
</MenubarContent>
</MenubarPortal>
</MenubarMenu>
diff --git a/src/components/toolbar/ToolFlyout.vue b/src/components/toolbar/ToolFlyout.vue
index d44e51102..e754f6922 100644
--- a/src/components/toolbar/ToolFlyout.vue
+++ b/src/components/toolbar/ToolFlyout.vue
@@ -29,6 +29,7 @@ import ToolButton from '@/components/toolbar/ToolButton.vue'
import type { ToolbarUI, ToolIconMap, ToolLabels } from '@/components/toolbar/types'
import AppShortcutText from '@/components/ui/menu/AppShortcutText.vue'
import { menu } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import toolbarTheme from '@/theme/toolbar'
const {
@@ -104,37 +105,39 @@ function flyoutItemClass() {
align="start"
:class="styles.flyoutContent({ class: ui?.flyoutContent })"
>
- <DropdownMenuRadioGroup :model-value="selectedTool">
- <DropdownMenuRadioItem
- v-for="sub in tool.flyout"
- :key="sub"
- v-test-id="toolbarFlyoutItemTestId(sub, mobile)"
- :value="sub"
- :data-active="sub === selectedTool || undefined"
- :class="flyoutItemClass()"
- @select="emit('select', sub)"
- >
- <span
- data-slot="flyout-item-indicator"
- :class="styles.flyoutItemIndicator({ class: ui?.flyoutItemIndicator })"
- aria-hidden="true"
+ <MenuScrollArea>
+ <DropdownMenuRadioGroup :model-value="selectedTool">
+ <DropdownMenuRadioItem
+ v-for="sub in tool.flyout"
+ :key="sub"
+ v-test-id="toolbarFlyoutItemTestId(sub, mobile)"
+ :value="sub"
+ :data-active="sub === selectedTool || undefined"
+ :class="flyoutItemClass()"
+ @select="emit('select', sub)"
>
- <DropdownMenuItemIndicator>
- <icon-lucide-check class="size-3.5" />
- </DropdownMenuItemIndicator>
- </span>
- <component
- :is="toolIcons[sub]"
- :class="styles.flyoutItemIcon({ class: ui?.flyoutItemIcon })"
- />
- <span :class="styles.flyoutItemLabel({ class: ui?.flyoutItemLabel })">
- {{ toolLabels[sub] }}
- </span>
- <AppShortcutText v-if="!mobile && toolShortcuts[sub]">
- {{ toolShortcuts[sub] }}
- </AppShortcutText>
- </DropdownMenuRadioItem>
- </DropdownMenuRadioGroup>
+ <span
+ data-slot="flyout-item-indicator"
+ :class="styles.flyoutItemIndicator({ class: ui?.flyoutItemIndicator })"
+ aria-hidden="true"
+ >
+ <DropdownMenuItemIndicator>
+ <icon-lucide-check class="size-3.5" />
+ </DropdownMenuItemIndicator>
+ </span>
+ <component
+ :is="toolIcons[sub]"
+ :class="styles.flyoutItemIcon({ class: ui?.flyoutItemIcon })"
+ />
+ <span :class="styles.flyoutItemLabel({ class: ui?.flyoutItemLabel })">
+ {{ toolLabels[sub] }}
+ </span>
+ <AppShortcutText v-if="!mobile && toolShortcuts[sub]">
+ {{ toolShortcuts[sub] }}
+ </AppShortcutText>
+ </DropdownMenuRadioItem>
+ </DropdownMenuRadioGroup>
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
diff --git a/src/components/toolbar/ToolbarContextMenu.vue b/src/components/toolbar/ToolbarContextMenu.vue
index 6abdb14d0..5cb466491 100644
--- a/src/components/toolbar/ToolbarContextMenu.vue
+++ b/src/components/toolbar/ToolbarContextMenu.vue
@@ -11,6 +11,7 @@ import { useI18n } from '@open-pencil/vue'
import { openSettingsDialog } from '@/app/settings/dialog'
import { useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
/** Right-clicking the toolbar offers its Settings page. */
const { settings } = useI18n()
@@ -24,10 +25,12 @@ const menu = useMenuUI({ content: 'w-48', item: 'justify-start gap-2' })
</ContextMenuTrigger>
<ContextMenuPortal>
<ContextMenuContent :class="menu.content">
- <ContextMenuItem :class="menu.item" @select="openSettingsDialog('toolbar')">
- <icon-lucide-sliders-horizontal :class="menu.icon" />
- {{ settings.customizeToolbar }}
- </ContextMenuItem>
+ <MenuScrollArea>
+ <ContextMenuItem :class="menu.item" @select="openSettingsDialog('toolbar')">
+ <icon-lucide-sliders-horizontal :class="menu.icon" />
+ {{ settings.customizeToolbar }}
+ </ContextMenuItem>
+ </MenuScrollArea>
</ContextMenuContent>
</ContextMenuPortal>
</ContextMenuRoot>
diff --git a/src/components/ui/menu/MenuScrollArea.vue b/src/components/ui/menu/MenuScrollArea.vue
new file mode 100644
index 000000000..beef21a10
--- /dev/null
+++ b/src/components/ui/menu/MenuScrollArea.vue
@@ -0,0 +1,74 @@
+<script setup lang="ts">
+import { useRafFn, useResizeObserver, useScroll } from '@vueuse/core'
+import { ref, useTemplateRef, watch } from 'vue'
+
+import { useMenuUI } from '@/components/ui/menu/menu'
+
+/** Pixels per millisecond while the pointer rests on a chevron, about a row every 50 ms. */
+const SCROLL_SPEED = 0.5
+
+type Edge = 'top' | 'bottom'
+
+/**
+ * The body of a menu taller than the window. Like Figma's and native macOS menus, it shows no
+ * scrollbar: a chevron strip covers each end that has more, and resting the pointer on one
+ * scrolls the list; the wheel and the arrow keys scroll it too.
+ */
+const cls = useMenuUI()
+const viewport = useTemplateRef<HTMLElement>('viewport')
+const { arrivedState, measure } = useScroll(viewport, { offset: { top: 1, bottom: 1 } })
+useResizeObserver(viewport, () => measure())
+
+const scrolling = ref<Edge | null>(null)
+const { pause, resume } = useRafFn(
+ ({ delta }) => {
+ const step = SCROLL_SPEED * delta
+ viewport.value?.scrollBy({ top: scrolling.value === 'top' ? -step : step })
+ },
+ { immediate: false }
+)
+
+function startScrolling(edge: Edge) {
+ scrolling.value = edge
+ resume()
+}
+
+function stopScrolling() {
+ scrolling.value = null
+ pause()
+}
+
+// The strip goes away once its end is reached, so its pointerleave never comes.
+watch(
+ () => scrolling.value !== null && arrivedState[scrolling.value],
+ (arrived) => {
+ if (arrived) stopScrolling()
+ }
+)
+</script>
+
+<template>
+ <div :class="cls.scrollRoot">
+ <div ref="viewport" :class="cls.scrollViewport"><slot /></div>
+ <div
+ v-if="!arrivedState.top"
+ data-edge="top"
+ aria-hidden="true"
+ :class="cls.scrollButton"
+ @pointerenter="startScrolling('top')"
+ @pointerleave="stopScrolling"
+ >
+ <icon-lucide-chevron-up class="size-3" />
+ </div>
+ <div
+ v-if="!arrivedState.bottom"
+ data-edge="bottom"
+ aria-hidden="true"
+ :class="cls.scrollButton"
+ @pointerenter="startScrolling('bottom')"
+ @pointerleave="stopScrolling"
+ >
+ <icon-lucide-chevron-down class="size-3" />
+ </div>
+ </div>
+</template>
diff --git a/src/components/ui/menu/menu.ts b/src/components/ui/menu/menu.ts
index 36f741288..0fdac558b 100644
--- a/src/components/ui/menu/menu.ts
+++ b/src/components/ui/menu/menu.ts
@@ -5,14 +5,26 @@ import { floatingSurface } from '@/theme/overlay'
export const menu = tv({
slots: {
- content: ['z-50 p-1', floatingSurface, motionStyles.floating],
+ // Reka sets only the open menu's own variable, so one chain caps every kind of menu just short
+ // of the window edge; a `MenuScrollArea` inside scrolls a taller one.
+ content: [
+ 'z-50 flex max-h-[calc(var(--reka-menubar-content-available-height,var(--reka-dropdown-menu-content-available-height,var(--reka-context-menu-content-available-height)))-0.5rem)] flex-col p-1',
+ floatingSurface,
+ motionStyles.floating
+ ],
item: 'flex cursor-pointer items-center gap-2 rounded px-2 py-1.5 text-[11px] outline-none select-none data-[disabled]:cursor-default data-[disabled]:text-muted/50 data-[highlighted]:bg-hover',
separator: 'mx-1 my-1 h-px bg-border',
label: 'px-2 pt-1.5 pb-1 text-[11px] text-muted select-none',
shortcut: 'text-[11px] text-muted',
icon: 'size-3 text-muted',
subTrigger:
- 'flex cursor-pointer items-center gap-2 rounded px-2 py-1.5 text-[11px] outline-none select-none'
+ 'flex cursor-pointer items-center gap-2 rounded px-2 py-1.5 text-[11px] outline-none select-none',
+ // As in Figma and macOS menus: no scrollbar, a chevron strip over each end that has more.
+ // No overscroll: WebKit's bounce takes the top past zero, which kept the top strip showing.
+ scrollRoot: 'relative flex min-h-0 flex-col',
+ scrollViewport: 'scrollbar-none min-h-0 flex-1 scroll-py-5 overflow-y-auto overscroll-none',
+ scrollButton:
+ 'absolute inset-x-0 z-10 flex h-5 cursor-default items-center justify-center bg-panel text-muted data-[edge=bottom]:bottom-0 data-[edge=top]:top-0'
},
variants: {
tone: {
@@ -60,7 +72,10 @@ export function useMenuUI(ui?: MenuUI) {
label: cls.label({ class: ui?.label }),
shortcut: cls.shortcut({ class: ui?.shortcut }),
icon: cls.icon({ class: ui?.icon }),
- subTrigger: cls.subTrigger({ class: ui?.subTrigger })
+ subTrigger: cls.subTrigger({ class: ui?.subTrigger }),
+ scrollRoot: cls.scrollRoot(),
+ scrollViewport: cls.scrollViewport(),
+ scrollButton: cls.scrollButton()
}
}
diff --git a/src/components/variables/CollectionInspector.vue b/src/components/variables/CollectionInspector.vue
index b176a4bc2..cf93aec8d 100644
--- a/src/components/variables/CollectionInspector.vue
+++ b/src/components/variables/CollectionInspector.vue
@@ -31,6 +31,7 @@ import IconButton from '@/components/ui/button/IconButton.vue'
import AppBadge from '@/components/ui/feedback/AppBadge.vue'
import AppInput from '@/components/ui/input/AppInput.vue'
import { useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import Tip from '@/components/ui/overlay/Tip.vue'
import AppSelect from '@/components/ui/select/AppSelect.vue'
import { useConditionLabels } from '@/components/variables/useConditionLabels'
@@ -216,14 +217,16 @@ function attributeDone(event: KeyboardEvent) {
</DropdownMenuTrigger>
<DropdownMenuPortal>
<DropdownMenuContent side="bottom" :side-offset="4" align="end" :class="menu.content">
- <DropdownMenuItem
- :class="dangerItem"
- data-test-id="variables-delete-collection"
- @select="emit('remove')"
- >
- <icon-lucide-trash-2 :class="menu.icon" />
- {{ variables.deleteCollection }}
- </DropdownMenuItem>
+ <MenuScrollArea>
+ <DropdownMenuItem
+ :class="dangerItem"
+ data-test-id="variables-delete-collection"
+ @select="emit('remove')"
+ >
+ <icon-lucide-trash-2 :class="menu.icon" />
+ {{ variables.deleteCollection }}
+ </DropdownMenuItem>
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
@@ -288,27 +291,29 @@ function attributeDone(event: KeyboardEvent) {
</DropdownMenuTrigger>
<DropdownMenuPortal>
<DropdownMenuContent side="bottom" :side-offset="4" align="end" :class="menu.content">
- <DropdownMenuItem :class="menu.item" @select="emit('duplicateMode', item.modeId)">
- <icon-lucide-copy :class="menu.icon" />
- {{ variables.duplicateMode }}
- </DropdownMenuItem>
- <DropdownMenuItem
- v-if="item.modeId !== collection.defaultModeId"
- :class="menu.item"
- @select="emit('setDefaultMode', item.modeId)"
- >
- <icon-lucide-pin :class="menu.icon" />
- {{ variables.setDefaultMode }}
- </DropdownMenuItem>
- <DropdownMenuSeparator :class="menu.separator" />
- <DropdownMenuItem
- :class="dangerItem"
- :disabled="collection.modes.length <= 1"
- @select="emit('removeMode', item.modeId)"
- >
- <icon-lucide-trash-2 :class="menu.icon" />
- {{ variables.deleteMode }}
- </DropdownMenuItem>
+ <MenuScrollArea>
+ <DropdownMenuItem :class="menu.item" @select="emit('duplicateMode', item.modeId)">
+ <icon-lucide-copy :class="menu.icon" />
+ {{ variables.duplicateMode }}
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ v-if="item.modeId !== collection.defaultModeId"
+ :class="menu.item"
+ @select="emit('setDefaultMode', item.modeId)"
+ >
+ <icon-lucide-pin :class="menu.icon" />
+ {{ variables.setDefaultMode }}
+ </DropdownMenuItem>
+ <DropdownMenuSeparator :class="menu.separator" />
+ <DropdownMenuItem
+ :class="dangerItem"
+ :disabled="collection.modes.length <= 1"
+ @select="emit('removeMode', item.modeId)"
+ >
+ <icon-lucide-trash-2 :class="menu.icon" />
+ {{ variables.deleteMode }}
+ </DropdownMenuItem>
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
diff --git a/src/components/variables/TokenAddMenu.vue b/src/components/variables/TokenAddMenu.vue
index ffdb2756d..6696ae35a 100644
--- a/src/components/variables/TokenAddMenu.vue
+++ b/src/components/variables/TokenAddMenu.vue
@@ -14,6 +14,7 @@ import { useI18n, variablesAddTestId, vTestId } from '@open-pencil/vue'
import AppButton from '@/components/ui/button/AppButton.vue'
import IconButton from '@/components/ui/button/IconButton.vue'
import { useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import { VARIABLE_TYPE_ICONS, VARIABLE_TYPES } from '@/components/variables/type-icons'
/** `labelled` spells out "Create variable" where the toolbar has room for it. */
@@ -53,19 +54,21 @@ const items = computed(() => {
</DropdownMenuTrigger>
<DropdownMenuPortal>
<DropdownMenuContent side="bottom" :side-offset="4" align="end" :class="menu.content">
- <DropdownMenuItem
- v-for="item in items"
- :key="item.type"
- :class="menu.item"
- v-test-id="variablesAddTestId(item.type)"
- @select="emit('add', item.type)"
- >
- <component :is="item.icon" :class="menu.icon" />
- <span class="flex min-w-0 flex-1 flex-col">
- <span>{{ item.label }}</span>
- <span class="truncate text-[10px] text-muted">{{ item.hint }}</span>
- </span>
- </DropdownMenuItem>
+ <MenuScrollArea>
+ <DropdownMenuItem
+ v-for="item in items"
+ :key="item.type"
+ :class="menu.item"
+ v-test-id="variablesAddTestId(item.type)"
+ @select="emit('add', item.type)"
+ >
+ <component :is="item.icon" :class="menu.icon" />
+ <span class="flex min-w-0 flex-1 flex-col">
+ <span>{{ item.label }}</span>
+ <span class="truncate text-[10px] text-muted">{{ item.hint }}</span>
+ </span>
+ </DropdownMenuItem>
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
diff --git a/src/components/variables/TokenOutput.vue b/src/components/variables/TokenOutput.vue
index 3aef28f94..775c4a242 100644
--- a/src/components/variables/TokenOutput.vue
+++ b/src/components/variables/TokenOutput.vue
@@ -17,6 +17,7 @@ import { useEditor, useI18n, useSceneComputed } from '@open-pencil/vue'
import CodeViewer from '@/components/code-editor/CodeViewer.vue'
import IconButton from '@/components/ui/button/IconButton.vue'
import { useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import tokensPanelTheme from '@/theme/tokens-panel'
const { collectionId, layout = 'side' } = defineProps<{
@@ -64,31 +65,33 @@ const stylesheet = computedAsync(async () => {
</DropdownMenuTrigger>
<DropdownMenuPortal>
<DropdownMenuContent side="bottom" :side-offset="4" align="end" :class="menu.content">
- <DropdownMenuItem
- :class="menu.item"
- data-test-id="variables-copy-css"
- @select="emit('copy', 'css')"
- >
- <icon-lucide-braces :class="menu.icon" />
- {{ variables.copyAsCSS }}
- </DropdownMenuItem>
- <DropdownMenuItem
- :class="menu.item"
- data-test-id="variables-copy-tailwind"
- @select="emit('copy', 'tailwind')"
- >
- <icon-lucide-wind :class="menu.icon" />
- {{ variables.copyAsTailwindTheme }}
- </DropdownMenuItem>
- <DropdownMenuSeparator :class="menu.separator" />
- <DropdownMenuItem
- :class="menu.item"
- data-test-id="variables-export-tokens"
- @select="emit('export')"
- >
- <icon-lucide-file-archive :class="menu.icon" />
- {{ variables.exportDesignTokens }}
- </DropdownMenuItem>
+ <MenuScrollArea>
+ <DropdownMenuItem
+ :class="menu.item"
+ data-test-id="variables-copy-css"
+ @select="emit('copy', 'css')"
+ >
+ <icon-lucide-braces :class="menu.icon" />
+ {{ variables.copyAsCSS }}
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ :class="menu.item"
+ data-test-id="variables-copy-tailwind"
+ @select="emit('copy', 'tailwind')"
+ >
+ <icon-lucide-wind :class="menu.icon" />
+ {{ variables.copyAsTailwindTheme }}
+ </DropdownMenuItem>
+ <DropdownMenuSeparator :class="menu.separator" />
+ <DropdownMenuItem
+ :class="menu.item"
+ data-test-id="variables-export-tokens"
+ @select="emit('export')"
+ >
+ <icon-lucide-file-archive :class="menu.icon" />
+ {{ variables.exportDesignTokens }}
+ </DropdownMenuItem>
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
diff --git a/src/components/variables/TokenRowMenu.vue b/src/components/variables/TokenRowMenu.vue
index 64450c1f4..82ec0a45f 100644
--- a/src/components/variables/TokenRowMenu.vue
+++ b/src/components/variables/TokenRowMenu.vue
@@ -14,6 +14,7 @@ import {
import { useI18n } from '@open-pencil/vue'
import { useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
/**
* Right-click actions for the selected tokens. The list selects the row under the pointer before
@@ -45,58 +46,62 @@ const dangerItem = useMenuUI({ item: 'justify-start gap-2 text-error' }).item
</ContextMenuTrigger>
<ContextMenuPortal>
<ContextMenuContent :class="menu.content" data-test-id="variables-row-menu">
- <ContextMenuItem v-if="single" :class="menu.item" @select="emit('rename')">
- <icon-lucide-pencil :class="menu.icon" />
- {{ pages.rename }}
- </ContextMenuItem>
- <ContextMenuItem
- :class="menu.item"
- data-test-id="variables-duplicate"
- @select="emit('duplicate')"
- >
- <icon-lucide-copy :class="menu.icon" />
- {{ variables.duplicate }}
- </ContextMenuItem>
- <ContextMenuSub>
- <ContextMenuSubTrigger :class="menu.subTrigger" data-test-id="variables-move-to-group">
- <icon-lucide-folder-input :class="menu.icon" />
- <span class="flex-1">{{ variables.moveToGroup }}</span>
- <icon-lucide-chevron-right :class="menu.icon" />
- </ContextMenuSubTrigger>
- <ContextMenuPortal>
- <ContextMenuSubContent :class="menu.content">
- <ContextMenuItem :class="menu.item" @select="emit('moveToGroup', '')">
- {{ variables.noGroup }}
- </ContextMenuItem>
- <ContextMenuItem
- v-for="group in groups"
- :key="group"
- :class="menu.item"
- @select="emit('moveToGroup', group)"
- >
- {{ group }}
- </ContextMenuItem>
- <ContextMenuSeparator :class="menu.separator" />
- <ContextMenuItem
- :class="menu.item"
- data-test-id="variables-new-group"
- @select="emit('newGroup')"
- >
- <icon-lucide-folder-plus :class="menu.icon" />
- {{ variables.newGroup }}
- </ContextMenuItem>
- </ContextMenuSubContent>
- </ContextMenuPortal>
- </ContextMenuSub>
- <ContextMenuSeparator :class="menu.separator" />
- <ContextMenuItem
- :class="dangerItem"
- data-test-id="variables-delete-selected"
- @select="emit('remove')"
- >
- <icon-lucide-trash-2 :class="menu.icon" />
- {{ variables.deleteVariables }}
- </ContextMenuItem>
+ <MenuScrollArea>
+ <ContextMenuItem v-if="single" :class="menu.item" @select="emit('rename')">
+ <icon-lucide-pencil :class="menu.icon" />
+ {{ pages.rename }}
+ </ContextMenuItem>
+ <ContextMenuItem
+ :class="menu.item"
+ data-test-id="variables-duplicate"
+ @select="emit('duplicate')"
+ >
+ <icon-lucide-copy :class="menu.icon" />
+ {{ variables.duplicate }}
+ </ContextMenuItem>
+ <ContextMenuSub>
+ <ContextMenuSubTrigger :class="menu.subTrigger" data-test-id="variables-move-to-group">
+ <icon-lucide-folder-input :class="menu.icon" />
+ <span class="flex-1">{{ variables.moveToGroup }}</span>
+ <icon-lucide-chevron-right :class="menu.icon" />
+ </ContextMenuSubTrigger>
+ <ContextMenuPortal>
+ <ContextMenuSubContent :class="menu.content">
+ <MenuScrollArea>
+ <ContextMenuItem :class="menu.item" @select="emit('moveToGroup', '')">
+ {{ variables.noGroup }}
+ </ContextMenuItem>
+ <ContextMenuItem
+ v-for="group in groups"
+ :key="group"
+ :class="menu.item"
+ @select="emit('moveToGroup', group)"
+ >
+ {{ group }}
+ </ContextMenuItem>
+ <ContextMenuSeparator :class="menu.separator" />
+ <ContextMenuItem
+ :class="menu.item"
+ data-test-id="variables-new-group"
+ @select="emit('newGroup')"
+ >
+ <icon-lucide-folder-plus :class="menu.icon" />
+ {{ variables.newGroup }}
+ </ContextMenuItem>
+ </MenuScrollArea>
+ </ContextMenuSubContent>
+ </ContextMenuPortal>
+ </ContextMenuSub>
+ <ContextMenuSeparator :class="menu.separator" />
+ <ContextMenuItem
+ :class="dangerItem"
+ data-test-id="variables-delete-selected"
+ @select="emit('remove')"
+ >
+ <icon-lucide-trash-2 :class="menu.icon" />
+ {{ variables.deleteVariables }}
+ </ContextMenuItem>
+ </MenuScrollArea>
</ContextMenuContent>
</ContextMenuPortal>
</ContextMenuRoot>
diff --git a/src/components/variables/TokenTypeFilter.vue b/src/components/variables/TokenTypeFilter.vue
index f4f611d35..95e9e9131 100644
--- a/src/components/variables/TokenTypeFilter.vue
+++ b/src/components/variables/TokenTypeFilter.vue
@@ -14,6 +14,7 @@ import { useI18n } from '@open-pencil/vue'
import IconButton from '@/components/ui/button/IconButton.vue'
import { useMenuUI } from '@/components/ui/menu/menu'
+import MenuScrollArea from '@/components/ui/menu/MenuScrollArea.vue'
import { VARIABLE_TYPE_ICONS, VARIABLE_TYPES } from '@/components/variables/type-icons'
/** The variable types the list shows; none checked shows every type. */
@@ -48,20 +49,22 @@ function toggle(type: VariableType, on: boolean) {
</DropdownMenuTrigger>
<DropdownMenuPortal>
<DropdownMenuContent side="bottom" :side-offset="4" align="end" :class="menu.content">
- <DropdownMenuCheckboxItem
- v-for="type in VARIABLE_TYPES"
- :key="type"
- :model-value="types.includes(type)"
- :class="menu.item"
- @select.prevent
- @update:model-value="toggle(type, $event)"
- >
- <component :is="VARIABLE_TYPE_ICONS[type]" :class="menu.icon" />
- <span class="flex-1">{{ labels[type] }}</span>
- <DropdownMenuItemIndicator>
- <icon-lucide-check :class="menu.icon" />
- </DropdownMenuItemIndicator>
- </DropdownMenuCheckboxItem>
+ <MenuScrollArea>
+ <DropdownMenuCheckboxItem
+ v-for="type in VARIABLE_TYPES"
+ :key="type"
+ :model-value="types.includes(type)"
+ :class="menu.item"
+ @select.prevent
+ @update:model-value="toggle(type, $event)"
+ >
+ <component :is="VARIABLE_TYPE_ICONS[type]" :class="menu.icon" />
+ <span class="flex-1">{{ labels[type] }}</span>
+ <DropdownMenuItemIndicator>
+ <icon-lucide-check :class="menu.icon" />
+ </DropdownMenuItemIndicator>
+ </DropdownMenuCheckboxItem>
+ </MenuScrollArea>
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenuRoot>
diff --git a/tests/e2e/keyboard/navigation.spec.ts b/tests/e2e/keyboard/navigation.spec.ts
new file mode 100644
index 000000000..01cd8acfd
--- /dev/null
+++ b/tests/e2e/keyboard/navigation.spec.ts
@@ -0,0 +1,109 @@
+import { expect, test, useEditorSetupWithClear } from '#tests/e2e/fixtures'
+
+const editor = useEditorSetupWithClear()
+
+/** A frame with three children, the frame selected; ids listed bottom to top. */
+function createFrameWithChildren() {
+ return editor.page.evaluate(() => {
+ const store = window.openPencil?.getStore?.()
+ if (!store) throw new Error('OpenPencil store not initialized')
+ const pageId = store.state.currentPageId
+ const frame = store.graph.createNode('FRAME', pageId, { x: 100, y: 100, width: 300 })
+ const children = ['Bottom', 'Middle', 'Top'].map(
+ (name, index) =>
+ store.graph.createNode('RECTANGLE', frame.id, {
+ name,
+ x: 20 + index * 60,
+ y: 20,
+ width: 40,
+ height: 40
+ }).id
+ )
+ store.select([frame.id])
+ return { frameId: frame.id, children }
+ })
+}
+
+function selectedIds() {
+ return editor.page.evaluate(() => [...(window.openPencil?.getStore?.().state.selectedIds ?? [])])
+}
+
+test('Enter, Shift+Enter, Tab, and Shift+Tab move through the layer tree', async () => {
+ const { frameId, children } = await createFrameWithChildren()
+ const [bottom, middle, top] = children
+
+ await editor.page.keyboard.press('Enter')
+ expect(new Set(await selectedIds())).toEqual(new Set(children))
+
+ await editor.page.keyboard.press('Shift+Enter')
+ expect(await selectedIds()).toEqual([frameId])
+
+ await editor.page.evaluate((id) => window.openPencil?.getStore?.().select([id]), top)
+ await editor.page.keyboard.press('Tab')
+ expect(await selectedIds()).toEqual([middle])
+ await editor.page.keyboard.press('Shift+Tab')
+ expect(await selectedIds()).toEqual([top])
+ await editor.page.keyboard.press('Shift+Tab')
+ expect(await selectedIds()).toEqual([bottom])
+
+ await editor.page.keyboard.press('Backslash')
+ expect(await selectedIds()).toEqual([frameId])
+})
+
+test('Tab keeps moving focus while a panel control holds it', async () => {
+ const { frameId } = await createFrameWithChildren()
+ const button = editor.page.getByRole('button').first()
+ await button.focus()
+
+ await editor.page.keyboard.press('Tab')
+
+ expect(await selectedIds()).toEqual([frameId])
+ await expect(button).not.toBeFocused()
+})
+
+test('N and Shift+N zoom to the next and previous top-level frame', async () => {
+ const frames = await editor.page.evaluate(() => {
+ const store = window.openPencil?.getStore?.()
+ if (!store) throw new Error('OpenPencil store not initialized')
+ const pageId = store.state.currentPageId
+ return [0, 600].map(
+ (x) => store.graph.createNode('FRAME', pageId, { x, y: 0, width: 200, height: 200 }).id
+ )
+ })
+
+ await editor.page.keyboard.press('n')
+ expect(await selectedIds()).toEqual([frames[0]])
+ await editor.page.keyboard.press('n')
+ expect(await selectedIds()).toEqual([frames[1]])
+ await editor.page.keyboard.press('Shift+N')
+ expect(await selectedIds()).toEqual([frames[0]])
+})
+
+test('Page Down and Page Up switch pages', async () => {
+ const [first, second] = await editor.page.evaluate(() => {
+ const store = window.openPencil?.getStore?.()
+ if (!store) throw new Error('OpenPencil store not initialized')
+ const pages = store.graph.getPages()
+ const firstPage = pages[0]
+ const secondPage = pages[1] ?? store.graph.addPage('Second')
+ return [firstPage.id, secondPage.id]
+ })
+ const currentPage = () =>
+ editor.page.evaluate(() => window.openPencil?.getStore?.().state.currentPageId)
+
+ await editor.page.keyboard.press('PageDown')
+ await expect.poll(currentPage).toBe(second)
+ await editor.page.keyboard.press('PageUp')
+ await expect.poll(currentPage).toBe(first)
+})
+
+test('Shift+0 zooms to 100%', async () => {
+ await editor.page.evaluate(() => {
+ const store = window.openPencil?.getStore?.()
+ if (store) store.state.zoom = 2
+ })
+
+ await editor.page.keyboard.press('Shift+Digit0')
+
+ expect(await editor.page.evaluate(() => window.openPencil?.getStore?.().state.zoom)).toBe(1)
+})
diff --git a/tests/engine/app/shell/menu/shortcut.test.ts b/tests/engine/app/shell/menu/shortcut.test.ts
index 1c6439cc1..0148e1110 100644
--- a/tests/engine/app/shell/menu/shortcut.test.ts
+++ b/tests/engine/app/shell/menu/shortcut.test.ts
@@ -23,6 +23,8 @@ describe('app menu shortcut conversion', () => {
expect(shortcutTokenToAccelerator('MOD+SHIFT+S')).toBe('CmdOrCtrl+Shift+S')
expect(shortcutTokenToAccelerator('ALT+A')).toBe('Alt+A')
expect(shortcutTokenToAccelerator('⌫')).toBe('Backspace')
+ expect(shortcutTokenToAccelerator('⇞')).toBe('PageUp')
+ expect(shortcutTokenToAccelerator('⇟')).toBe('PageDown')
})
test('derives native accelerators from menu ids', () => {