Skip to content

A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.

feat: add submenu support to menu system and reorganize View menu

esengine5597aa7f20b2
diff --git a/editor/src/MenuManager.ts b/editor/src/MenuManager.ts
index 36fe47f36..f50d5f9ad 100644
--- a/editor/src/MenuManager.ts
+++ b/editor/src/MenuManager.ts
@@ -1,4 +1,5 @@
import { getAllMenus, getMenuItems, getAllStatusbarItems } from './menus';
+import type { MenuItemDescriptor } from './menus/MenuRegistry';
import { ShortcutManager } from './menus/ShortcutManager';
import { getPanelsByPosition } from './panels/PanelRegistry';
import { icons } from './utils/icons';
@@ -58,23 +59,64 @@ export class MenuManager {
}
}
+ private buildMenuItemHTML(item: MenuItemDescriptor): string {
+ const parts: string[] = [];
+ if (item.separator) {
+ parts.push('<div class="es-menu-divider"></div>');
+ }
+ parts.push(`<div class="es-menu-item" data-action="${item.id}">`);
+ parts.push(`<span class="es-menu-item-text">${item.label}</span>`);
+ if (item.shortcut) {
+ parts.push(`<span class="es-menu-item-shortcut">${item.shortcut}</span>`);
+ }
+ parts.push('</div>');
+ return parts.join('');
+ }
+
+ private buildSubmenuHTML(submenuId: string, items: MenuItemDescriptor[], allItems: MenuItemDescriptor[]): string {
+ const children = allItems.filter(i => !i.hidden && i.submenu === submenuId);
+ const trigger = items.find(i => i.id === submenuId);
+ if (!trigger || children.length === 0) return '';
+
+ const parts: string[] = [];
+ if (trigger.separator) {
+ parts.push('<div class="es-menu-divider"></div>');
+ }
+ parts.push(`<div class="es-menu-submenu-container">`);
+ parts.push(`<div class="es-menu-item es-menu-submenu-trigger" data-submenu="${submenuId}">`);
+ parts.push(`<span class="es-menu-item-text">${trigger.label}</span>`);
+ parts.push('<span class="es-menu-submenu-arrow">\u25B8</span>');
+ parts.push('</div>');
+ parts.push(`<div class="es-menu-submenu-dropdown" data-submenu-for="${submenuId}">`);
+ for (const child of children) {
+ parts.push(this.buildMenuItemHTML(child));
+ }
+ parts.push('</div>');
+ parts.push('</div>');
+ return parts.join('');
+ }
+
buildMenuBarHTML(): string {
const menus = getAllMenus();
return menus.map(menu => {
- const items = getMenuItems(menu.id).filter(i => !i.hidden);
- const itemsHTML = items.map(item => {
- const parts: string[] = [];
- if (item.separator) {
- parts.push('<div class="es-menu-divider"></div>');
- }
- parts.push(`<div class="es-menu-item" data-action="${item.id}">`);
- parts.push(`<span class="es-menu-item-text">${item.label}</span>`);
- if (item.shortcut) {
- parts.push(`<span class="es-menu-item-shortcut">${item.shortcut}</span>`);
+ const allItems = getMenuItems(menu.id);
+ const visibleItems = allItems.filter(i => !i.hidden);
+
+ const submenuIds = new Set<string>();
+ for (const item of visibleItems) {
+ if (item.submenu) {
+ submenuIds.add(item.submenu);
}
- parts.push('</div>');
- return parts.join('');
- }).join('');
+ }
+
+ const itemsHTML = visibleItems
+ .filter(i => !i.submenu)
+ .map(item => {
+ if (submenuIds.has(item.id)) {
+ return this.buildSubmenuHTML(item.id, visibleItems, allItems);
+ }
+ return this.buildMenuItemHTML(item);
+ }).join('');
return `
<div class="es-menu" data-menu="${menu.id}">
@@ -154,6 +196,7 @@ export class MenuManager {
if (!menuItem) return;
if (menuItem.classList.contains('es-disabled')) return;
+ if (menuItem.classList.contains('es-menu-submenu-trigger')) return;
const actionId = menuItem.dataset.action;
if (!actionId) return;
diff --git a/editor/src/menus/MenuRegistry.ts b/editor/src/menus/MenuRegistry.ts
index f2444fe07..7c3011b91 100644
--- a/editor/src/menus/MenuRegistry.ts
+++ b/editor/src/menus/MenuRegistry.ts
@@ -18,6 +18,7 @@ export interface MenuItemDescriptor {
enabled?: () => boolean;
action: () => void;
hidden?: boolean;
+ submenu?: string;
}
export interface StatusbarItemDescriptor {
diff --git a/editor/src/menus/builtinMenus.ts b/editor/src/menus/builtinMenus.ts
index dc4dc9fa8..897fede9b 100644
--- a/editor/src/menus/builtinMenus.ts
+++ b/editor/src/menus/builtinMenus.ts
@@ -161,77 +161,90 @@ export function registerBuiltinMenus(registrar: PluginRegistrar): void {
action: () => getProjectService().showSettings(),
});
+ registerMenuItem({
+ id: 'view.panels', menu: 'view', label: 'Panels', order: 0,
+ action: () => {},
+ });
registerMenuItem({
id: 'view.hierarchy', menu: 'view', label: 'Hierarchy', order: 0,
- shortcut: 'Ctrl+Shift+H',
+ shortcut: 'Ctrl+Shift+H', submenu: 'view.panels',
action: () => getNavigationService().togglePanel('hierarchy'),
});
registerMenuItem({
id: 'view.inspector', menu: 'view', label: 'Inspector', order: 1,
- shortcut: 'Ctrl+Shift+I',
+ shortcut: 'Ctrl+Shift+I', submenu: 'view.panels',
action: () => getNavigationService().togglePanel('inspector'),
});
- registerMenuItem({
- id: 'view.toggle-bottom', menu: 'view', label: 'Toggle Bottom Panel',
- shortcut: 'Ctrl+J', order: 1.5,
- action: () => getNavigationService().toggleRegion('bottom'),
- });
registerMenuItem({
id: 'view.content-browser', menu: 'view', label: 'Content Browser',
- shortcut: 'Ctrl+Space', order: 2,
+ shortcut: 'Ctrl+Space', order: 2, submenu: 'view.panels',
action: () => getNavigationService().togglePanel('content-browser'),
});
registerMenuItem({
id: 'view.output', menu: 'view', label: 'Output', order: 3,
+ submenu: 'view.panels',
action: () => getNavigationService().togglePanel('output'),
});
registerMenuItem({
id: 'view.game', menu: 'view', label: 'Game', order: 4,
+ submenu: 'view.panels',
action: () => getNavigationService().showPanel('game'),
});
registerMenuItem({
- id: 'view.profiler', menu: 'view', label: 'Profiler',
- order: 5, separator: true,
- action: () => getProfilerService()?.showProfilerWindow(),
- });
- registerMenuItem({
- id: 'view.timeline', menu: 'view', label: 'Timeline',
- order: 5.5,
+ id: 'view.timeline', menu: 'view', label: 'Timeline', order: 5,
+ submenu: 'view.panels',
action: () => getNavigationService().togglePanel('timeline'),
});
registerMenuItem({
- id: 'view.frame-debugger', menu: 'view', label: 'Frame Debugger',
- order: 5.6,
- action: () => getFrameDebuggerService()?.showFrameDebuggerWindow(),
+ id: 'view.state-machine-graph', menu: 'view', label: 'State Machine',
+ order: 6, submenu: 'view.panels',
+ action: () => getNavigationService().togglePanel('state-machine-graph'),
});
registerMenuItem({
- id: 'view.extensions', menu: 'view', label: 'Extensions',
- order: 5.7,
+ id: 'view.extensions', menu: 'view', label: 'Extensions', order: 7,
+ submenu: 'view.panels',
action: () => getNavigationService().togglePanel('extensions'),
});
- registerMenuItem({
- id: 'view.state-machine-graph', menu: 'view', label: 'State Machine',
- order: 5.8,
- action: () => getNavigationService().togglePanel('state-machine-graph'),
- });
registerMenuItem({
id: 'view.addressable', menu: 'view', label: 'Addressable Groups',
- order: 6,
+ order: 8, submenu: 'view.panels',
action: () => showAddressableWindow(),
});
+
+ registerMenuItem({
+ id: 'view.layout', menu: 'view', label: 'Layout', order: 1,
+ action: () => {},
+ });
+ registerMenuItem({
+ id: 'view.toggle-bottom', menu: 'view', label: 'Toggle Bottom Panel',
+ shortcut: 'Ctrl+J', order: 0, submenu: 'view.layout',
+ action: () => getNavigationService().toggleRegion('bottom'),
+ });
registerMenuItem({
id: 'view.toggle-sidebars', menu: 'view', label: 'Toggle Sidebars',
- shortcut: 'Ctrl+\\', order: 5.9, separator: true,
+ shortcut: 'Ctrl+\\', order: 1, submenu: 'view.layout',
action: () => getNavigationService().toggleAllSidebars(),
});
registerMenuItem({
id: 'view.reset-layout', menu: 'view', label: 'Reset Layout',
- order: 6,
+ order: 2, submenu: 'view.layout',
action: () => getNavigationService().resetLayout(),
});
+
registerMenuItem({
- id: 'view.reload-extensions', menu: 'view', label: 'Reload Extensions',
+ id: 'view.profiler', menu: 'view', label: 'Profiler',
order: 10, separator: true,
+ action: () => getProfilerService()?.showProfilerWindow(),
+ });
+ registerMenuItem({
+ id: 'view.frame-debugger', menu: 'view', label: 'Frame Debugger',
+ order: 11,
+ action: () => getFrameDebuggerService()?.showFrameDebuggerWindow(),
+ });
+
+ registerMenuItem({
+ id: 'view.reload-extensions', menu: 'view', label: 'Reload Extensions',
+ order: 20, separator: true,
action: async () => {
const confirmed = await showConfirmDialog({
title: 'Reload Extensions',
@@ -243,12 +256,12 @@ export function registerBuiltinMenus(registrar: PluginRegistrar): void {
});
registerMenuItem({
id: 'view.reload', menu: 'view', label: 'Reload',
- shortcut: 'Ctrl+R', order: 20, separator: true,
+ shortcut: 'Ctrl+R', order: 21,
action: () => window.location.reload(),
});
registerMenuItem({
id: 'view.devtools', menu: 'view', label: 'Developer Tools',
- shortcut: 'F12', order: 21,
+ shortcut: 'F12', order: 22,
action: () => {
const ctx = getEditorContext();
ctx.invoke?.('toggle_devtools');
diff --git a/editor/src/styles/menus.css b/editor/src/styles/menus.css
index 3bb0a028f..f4853944f 100644
--- a/editor/src/styles/menus.css
+++ b/editor/src/styles/menus.css
@@ -131,6 +131,39 @@
background: var(--es-border);
}
+.es-menu-submenu-container {
+ position: relative;
+}
+
+.es-menu-submenu-arrow {
+ margin-left: 12px;
+ font-size: 10px;
+ color: var(--es-text-secondary);
+ flex-shrink: 0;
+}
+
+.es-menu-submenu-trigger:hover .es-menu-submenu-arrow {
+ color: hsla(0, 0%, 100%, 0.8);
+}
+
+.es-menu-submenu-dropdown {
+ display: none;
+ position: absolute;
+ left: 100%;
+ top: 0;
+ min-width: 200px;
+ background: var(--es-bg-elevated);
+ border: 1px solid var(--es-border);
+ border-radius: var(--es-radius-md);
+ box-shadow: var(--es-shadow-md);
+ z-index: 1001;
+ padding: 4px 0;
+}
+
+.es-menu-submenu-container:hover > .es-menu-submenu-dropdown {
+ display: block;
+}
+
.es-editor-menubar .es-btn-preview {
display: flex;
align-items: center;