add Zed-style application menu bar: File / View / Help (T-48)
A custom in-window menu bar in the hat (no native menu, D-7), built from the command registry so it stays in sync and satisfies D-6 parity. - Menu model + hybrid resolver (menu_model.dart): a curated File/View/Help tree where a MenuAutoFill node sweeps in unplaced view.* commands; titles + keybindings come from the registry/keymap; unregistered or enabledWhen-false items render disabled (greyed), never hidden. - Widgets: MenuBar row in the hat (chrome tokens), anchored MenuDropdown overlay (dropdown tokens), two-column MenuItemRow with inline keybinding. - Full keyboard: Alt+mnemonic opens (hook in _RootShell._onKey), arrows navigate, Enter activates, Esc closes, Left/Right switch menus. - Commands: file.openFolder / file.newWindow / file.closeWorkspace / help.about, registered by MenuBarExtension(services:). File logic lifted out of the project switcher into FileActions (one source of truth; the switcher now dispatches the commands). Ctrl+O / Ctrl+Shift+N are now real keybindings in default.yaml. - Help → About: version/commit/date/repo from build-info + the bundled dependency licenses parsed from assets/licenses.yaml. Edit/Selection menus are deferred to T-271/T-272 (need focused-surface command routing). Tests: resolver + controller + licenses parse (pure); menu-bar widget (open/close/execute/disabled/Esc/arrow/Enter/Left-Right); FileActions + Open dialog; app-level Alt+F, non-repo dialog, and closeWorkspace. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Claude Opus 4.8
@@ -0,0 +1,207 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:clide/kernel/kernel.dart';
|
||||
import 'package:clide/widgets/widgets.dart';
|
||||
import 'package:flutter/widgets.dart';
|
||||
|
||||
import 'extension.dart' show buildClideMenuTree;
|
||||
import 'menu_dropdown.dart';
|
||||
import 'menu_model.dart';
|
||||
|
||||
/// Open/close state for the application menu bar (T-48). Owned by the root
|
||||
/// shell so the Alt-mnemonic key hook and the bar widget share one source of
|
||||
/// truth. Only one menu is open at a time.
|
||||
class MenuBarController extends ChangeNotifier {
|
||||
int? _openIndex;
|
||||
List<String> _mnemonics = const [];
|
||||
|
||||
int? get openIndex => _openIndex;
|
||||
bool get isOpen => _openIndex != null;
|
||||
|
||||
/// Set by the bar each build so the Alt hook can map a letter → menu index
|
||||
/// without knowing the menu structure. Does not notify (called during build).
|
||||
void setMnemonics(List<String> m) => _mnemonics = m;
|
||||
|
||||
/// The menu index whose mnemonic is [ch] (case-insensitive), or null.
|
||||
int? indexForMnemonic(String ch) {
|
||||
final i = _mnemonics.indexOf(ch.toLowerCase());
|
||||
return i < 0 ? null : i;
|
||||
}
|
||||
|
||||
void open(int i) {
|
||||
if (_openIndex == i) return;
|
||||
_openIndex = i;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void close() {
|
||||
if (_openIndex == null) return;
|
||||
_openIndex = null;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void toggle(int i) => _openIndex == i ? close() : open(i);
|
||||
|
||||
void openNext() {
|
||||
if (_openIndex == null || _mnemonics.isEmpty) return;
|
||||
open((_openIndex! + 1) % _mnemonics.length);
|
||||
}
|
||||
|
||||
void openPrev() {
|
||||
if (_openIndex == null || _mnemonics.isEmpty) return;
|
||||
open((_openIndex! - 1 + _mnemonics.length) % _mnemonics.length);
|
||||
}
|
||||
}
|
||||
|
||||
/// The application menu bar: a row of top-level menu buttons (File / View /
|
||||
/// Help) embedded in the hat. Resolves the curated tree against the live
|
||||
/// command set on every relevant change so titles, enablement, and keybindings
|
||||
/// stay current.
|
||||
class MenuBar extends StatelessWidget {
|
||||
const MenuBar({super.key, required this.controller});
|
||||
|
||||
final MenuBarController controller;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final kernel = ClideKernel.of(context);
|
||||
// Note: we READ the keymap for binding labels but don't LISTEN to it —
|
||||
// it notifies during other widgets' builds (scope-flag changes when a
|
||||
// dialog/overlay opens), which would mark this sibling dirty mid-build.
|
||||
// Labels refresh on the next command/project rebuild, which is enough
|
||||
// since keybindings don't change at runtime.
|
||||
return ListenableBuilder(
|
||||
listenable: Listenable.merge([controller, kernel.commands, kernel.project]),
|
||||
builder: (ctx, _) {
|
||||
final menus = resolveMenus(
|
||||
buildClideMenuTree(),
|
||||
kernel.commands,
|
||||
kernel,
|
||||
bindingLabel: (id) => keymapBindingLabel(kernel.keymap, id),
|
||||
);
|
||||
controller.setMnemonics([for (final m in menus) m.title[m.mnemonic].toLowerCase()]);
|
||||
return Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
for (var i = 0; i < menus.length; i++) _TopMenuButton(index: i, menu: menus[i], controller: controller, kernel: kernel),
|
||||
],
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _TopMenuButton extends StatefulWidget {
|
||||
const _TopMenuButton({required this.index, required this.menu, required this.controller, required this.kernel});
|
||||
final int index;
|
||||
final ResolvedMenu menu;
|
||||
final MenuBarController controller;
|
||||
final KernelServices kernel;
|
||||
|
||||
@override
|
||||
State<_TopMenuButton> createState() => _TopMenuButtonState();
|
||||
}
|
||||
|
||||
class _TopMenuButtonState extends State<_TopMenuButton> {
|
||||
final LayerLink _link = LayerLink();
|
||||
OverlayEntry? _entry;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
widget.controller.addListener(_sync);
|
||||
}
|
||||
|
||||
@override
|
||||
void didUpdateWidget(_TopMenuButton old) {
|
||||
super.didUpdateWidget(old);
|
||||
if (!identical(old.controller, widget.controller)) {
|
||||
old.controller.removeListener(_sync);
|
||||
widget.controller.addListener(_sync);
|
||||
}
|
||||
// NB: do NOT markNeedsBuild the open entry here — didUpdateWidget runs
|
||||
// during the parent's build, and marking an overlay entry mid-build is
|
||||
// illegal. The menu set doesn't change while a menu is open in practice;
|
||||
// the panel is rebuilt fresh on the next open.
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
widget.controller.removeListener(_sync);
|
||||
_entry?.remove();
|
||||
_entry = null;
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
void _sync() {
|
||||
final shouldOpen = widget.controller.openIndex == widget.index;
|
||||
if (shouldOpen && _entry == null) {
|
||||
_entry = OverlayEntry(builder: _buildOverlay);
|
||||
Overlay.of(context, rootOverlay: true).insert(_entry!);
|
||||
} else if (!shouldOpen && _entry != null) {
|
||||
_entry!.remove();
|
||||
_entry = null;
|
||||
}
|
||||
}
|
||||
|
||||
void _activate(String commandId) {
|
||||
widget.controller.close();
|
||||
unawaited(widget.kernel.commands.execute(commandId));
|
||||
}
|
||||
|
||||
Widget _buildOverlay(BuildContext context) {
|
||||
return Stack(
|
||||
children: [
|
||||
Positioned.fill(
|
||||
child: GestureDetector(behavior: HitTestBehavior.opaque, onTap: widget.controller.close),
|
||||
),
|
||||
CompositedTransformFollower(
|
||||
link: _link,
|
||||
showWhenUnlinked: false,
|
||||
targetAnchor: Alignment.bottomLeft,
|
||||
followerAnchor: Alignment.topLeft,
|
||||
offset: const Offset(0, 2),
|
||||
child: Align(
|
||||
alignment: Alignment.topLeft,
|
||||
child: MenuDropdown(
|
||||
menu: widget.menu,
|
||||
onActivate: _activate,
|
||||
onClose: widget.controller.close,
|
||||
onPrevMenu: widget.controller.openPrev,
|
||||
onNextMenu: widget.controller.openNext,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final tokens = ClideTheme.of(context).surface;
|
||||
final open = widget.controller.openIndex == widget.index;
|
||||
return CompositedTransformTarget(
|
||||
link: _link,
|
||||
child: MouseRegion(
|
||||
// Once a menu is open, hovering a sibling switches to it (Zed behavior).
|
||||
onEnter: (_) {
|
||||
if (widget.controller.isOpen) widget.controller.open(widget.index);
|
||||
},
|
||||
child: ClideTappable(
|
||||
onTap: () => widget.controller.toggle(widget.index),
|
||||
builder: (ctx, hovered, _) => Container(
|
||||
height: hatHeight,
|
||||
alignment: Alignment.center,
|
||||
padding: const EdgeInsets.symmetric(horizontal: clideInsetStandard),
|
||||
color: open || hovered ? tokens.listItemHoverBackground : null,
|
||||
child: ClideText(
|
||||
widget.menu.title,
|
||||
fontSize: 12,
|
||||
color: open || hovered ? tokens.globalForeground : tokens.chromeForeground,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user