keyboard-operable ClideTappable + palette nav (T-100)
test / unit + widget + golden + a11y (push) Failing after 28s
test / integration_test (xvfb) (push) Has been skipped
test / bundle smoke (xvfb 5s) (push) Has been skipped
test / daemon subprocess + web WASM smoke (push) Has been skipped
test / dart doc (lib API) (push) Failing after 1m5s

Plug widgets into the keymap layer landed in T-117.

ClideTappable:
  - Wrap in `Actions(ActivateIntent → onTap)` outside a `Focus` so
    dispatch from the focused context walks up and hits the action.
  - Add a focus ring via `tokens.globalFocus` (DecoratedBox foreground
    overlay, transparent border when unfocused, no layout shift).
  - Disabled (`onTap == null`) skips focus traversal and shows the
    forbidden cursor.

ClidePalette:
  - Register Actions for the four palette intents
    (selectNext / selectPrev / accept / dismiss).
  - Publish `palette.open` scope flag via `KeymapService.setScopeFlag`
    so when-clauses can scope future bindings to "palette only".
  - Highlight the selected row with `listItemSelectedBackground`;
    scroll it into view on nav.
  - `PaletteController` grows `selectedIndex` + `selectNext` /
    `selectPrevious` / `acceptSelected`; index resets on open /
    filter change.

Intents.dart drops the `ClideIntent` base — `ActivateIntent` and
`DismissIntent` come from Flutter; clide owns the palette and text-
scale and command-bridge subclasses. `parseIntentId('activate')` →
Flutter's class; same for dismiss. Widget code uses the canonical
Flutter Intent types where they fit.

App root grows a PaletteOpenIntent action that calls
`services.palette.open()`, completing the ctrl/cmd+shift+p path
end-to-end.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-05-17 21:48:03 +02:00
co-authored by Claude Opus 4.7
parent 798ba524f1
commit 12e0509fa3
15 changed files with 531 additions and 160 deletions
+40
View File
@@ -9,13 +9,26 @@ class PaletteController extends ChangeNotifier {
bool _open = false;
String _filter = '';
int _selectedIndex = 0;
bool get isOpen => _open;
String get filter => _filter;
/// Index of the highlighted entry inside the currently-filtered
/// list. Clamped to `[0, filtered().length - 1]` on read. Returns 0
/// when the filter excludes everything.
int get selectedIndex {
final n = filtered().length;
if (n == 0) return 0;
if (_selectedIndex < 0) return 0;
if (_selectedIndex >= n) return n - 1;
return _selectedIndex;
}
void open() {
if (_open) return;
_open = true;
_selectedIndex = 0;
notifyListeners();
}
@@ -23,6 +36,7 @@ class PaletteController extends ChangeNotifier {
if (!_open) return;
_open = false;
_filter = '';
_selectedIndex = 0;
notifyListeners();
}
@@ -31,9 +45,35 @@ class PaletteController extends ChangeNotifier {
void setFilter(String f) {
if (_filter == f) return;
_filter = f;
_selectedIndex = 0;
notifyListeners();
}
/// Highlight the next entry, wrapping at the end. No-op when the
/// filtered list has fewer than 2 entries.
void selectNext() {
final n = filtered().length;
if (n < 2) return;
_selectedIndex = (selectedIndex + 1) % n;
notifyListeners();
}
/// Highlight the previous entry, wrapping at the start.
void selectPrevious() {
final n = filtered().length;
if (n < 2) return;
_selectedIndex = (selectedIndex - 1 + n) % n;
notifyListeners();
}
/// Invoke whatever's currently highlighted; no-op when the filter
/// excludes everything.
Future<void> acceptSelected() async {
final list = filtered();
if (list.isEmpty) return;
await invoke(list[selectedIndex].command);
}
List<CommandContribution> filtered() {
if (_filter.isEmpty) return _registry.all.toList();
final q = _filter.toLowerCase();
+30 -83
View File
@@ -5,99 +5,54 @@
/// `palette.selectNext`, …). The id stays stable across SDK reshapes;
/// the Dart class name can move without invalidating user keymaps.
///
/// To add a new Intent: declare a subclass with a unique [id] and
/// register it in [allIntents]. Widget integration is per-feature
/// (Actions wiring lives in the consuming widget).
/// Two flavors of intents live here:
/// 1. **Flutter-provided** — `ActivateIntent` and `DismissIntent`
/// are first-class Flutter intents; we reuse them so the keymap
/// integrates with anything else in the Flutter ecosystem that
/// already dispatches those (focus traversal, modal scrims, …).
/// They're mapped by id in [builtinIntents] but not declared
/// here.
/// 2. **Clide-specific** — palette navigation, text scale, the
/// `InvokeCommandIntent` bridge. Each subclass extends [Intent]
/// directly.
library;
import 'package:flutter/widgets.dart';
/// Base for every keymap-dispatched intent. The [id] is the YAML
/// identifier (e.g. `palette.selectNext`).
abstract class ClideIntent extends Intent {
const ClideIntent();
String get id;
}
// -- Activation / navigation ------------------------------------------------
/// "Click this thing" — fired on Enter/Space against any focusable
/// `ClideTappable`-rooted widget.
class ActivateIntent extends ClideIntent {
const ActivateIntent();
@override
String get id => 'activate';
}
/// "Cancel / dismiss the current modal / overlay".
class DismissIntent extends ClideIntent {
const DismissIntent();
@override
String get id => 'dismiss';
}
/// "Move focus to the next focusable in tab order".
class FocusNextIntent extends ClideIntent {
const FocusNextIntent();
@override
String get id => 'focus.next';
}
/// "Move focus to the previous focusable".
class FocusPreviousIntent extends ClideIntent {
const FocusPreviousIntent();
@override
String get id => 'focus.previous';
}
// -- Command palette --------------------------------------------------------
/// Open the command palette.
class PaletteOpenIntent extends ClideIntent {
class PaletteOpenIntent extends Intent {
const PaletteOpenIntent();
@override
String get id => 'palette.open';
}
/// Highlight the next palette result.
class PaletteSelectNextIntent extends ClideIntent {
class PaletteSelectNextIntent extends Intent {
const PaletteSelectNextIntent();
@override
String get id => 'palette.selectNext';
}
/// Highlight the previous palette result.
class PaletteSelectPreviousIntent extends ClideIntent {
class PaletteSelectPreviousIntent extends Intent {
const PaletteSelectPreviousIntent();
@override
String get id => 'palette.selectPrevious';
}
/// Invoke the highlighted palette result.
class PaletteAcceptIntent extends ClideIntent {
class PaletteAcceptIntent extends Intent {
const PaletteAcceptIntent();
@override
String get id => 'palette.accept';
}
// -- Text scale -------------------------------------------------------------
class TextScaleIncreaseIntent extends ClideIntent {
class TextScaleIncreaseIntent extends Intent {
const TextScaleIncreaseIntent();
@override
String get id => 'text.scaleIncrease';
}
class TextScaleDecreaseIntent extends ClideIntent {
class TextScaleDecreaseIntent extends Intent {
const TextScaleDecreaseIntent();
@override
String get id => 'text.scaleDecrease';
}
class TextScaleResetIntent extends ClideIntent {
class TextScaleResetIntent extends Intent {
const TextScaleResetIntent();
@override
String get id => 'text.scaleReset';
}
// -- Command bridge ---------------------------------------------------------
@@ -106,11 +61,9 @@ class TextScaleResetIntent extends ClideIntent {
/// bindings that target a contributed command rather than a typed
/// intent. The keymap creates one per binding; the Actions handler
/// dispatches to the [CommandRegistry].
class InvokeCommandIntent extends ClideIntent {
class InvokeCommandIntent extends Intent {
const InvokeCommandIntent(this.commandId);
final String commandId;
@override
String get id => 'command:$commandId';
}
// -- Lookup -----------------------------------------------------------------
@@ -120,29 +73,23 @@ class InvokeCommandIntent extends ClideIntent {
/// configurable payload (only `InvokeCommandIntent` today) are not in
/// the map — the loader recognises the `command:` prefix and
/// instantiates them inline.
final Map<String, ClideIntent Function()> builtinIntents = {
for (final i in _allBuiltin) i.id: () => i,
final Map<String, Intent Function()> builtinIntents = {
'activate': () => const ActivateIntent(),
'dismiss': () => const DismissIntent(),
'palette.open': () => const PaletteOpenIntent(),
'palette.selectNext': () => const PaletteSelectNextIntent(),
'palette.selectPrevious': () => const PaletteSelectPreviousIntent(),
'palette.accept': () => const PaletteAcceptIntent(),
'text.scaleIncrease': () => const TextScaleIncreaseIntent(),
'text.scaleDecrease': () => const TextScaleDecreaseIntent(),
'text.scaleReset': () => const TextScaleResetIntent(),
};
const List<ClideIntent> _allBuiltin = [
ActivateIntent(),
DismissIntent(),
FocusNextIntent(),
FocusPreviousIntent(),
PaletteOpenIntent(),
PaletteSelectNextIntent(),
PaletteSelectPreviousIntent(),
PaletteAcceptIntent(),
TextScaleIncreaseIntent(),
TextScaleDecreaseIntent(),
TextScaleResetIntent(),
];
/// Parse an intent id into a [ClideIntent]. Returns null if the id is
/// Parse an intent id into an [Intent]. Returns null if the id is
/// unknown. Recognises:
/// - any builtin intent by its stable id
/// - `command:<command-id>` → [InvokeCommandIntent]
ClideIntent? parseIntentId(String id) {
Intent? parseIntentId(String id) {
final builtin = builtinIntents[id];
if (builtin != null) return builtin();
if (id.startsWith('command:')) {
+5 -4
View File
@@ -6,11 +6,12 @@
/// same (chord, when-clause) tuple.
///
/// At resolve time, the [Keymap] walks the layered list once per
/// (chord, scope) and returns the [ClideIntent] bound by the highest-
/// (chord, scope) and returns the [Intent] bound by the highest-
/// precedence matching layer.
library;
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart' show Intent;
import 'package:yaml/yaml.dart';
import 'intents.dart';
@@ -28,11 +29,11 @@ class KeymapBinding {
});
final KeyChord chord;
final ClideIntent intent;
final Intent intent;
final WhenExpr? when;
@override
String toString() => 'Binding($chord${intent.id}${when == null ? '' : ' when $when'})';
String toString() => 'Binding($chord${intent.runtimeType}${when == null ? '' : ' when $when'})';
}
/// One source of bindings. Layers are merged in order — later layers
@@ -117,7 +118,7 @@ class Keymap {
/// Resolve a [chord] against the current [context]. Returns the
/// highest-precedence binding whose chord matches and whose when-
/// clause (if any) evaluates true. Returns null if no match.
ClideIntent? resolve(KeyChord chord, Map<String, bool> context) {
Intent? resolve(KeyChord chord, Map<String, bool> context) {
// Effective list is highest-precedence-first; first match wins.
for (final b in _effective) {
if (b.chord != chord) continue;
+2 -1
View File
@@ -23,6 +23,7 @@ import 'dart:io';
import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart' show AssetBundle, KeyEvent, HardwareKeyboard, rootBundle;
import 'package:flutter/widgets.dart' show Intent;
import '../settings.dart';
import 'intents.dart';
@@ -160,7 +161,7 @@ class KeymapService extends ChangeNotifier {
/// Resolve a [KeyEvent] against the active keymap and current scope.
/// Returns null when nothing matches.
ClideIntent? resolveEvent(KeyEvent event, HardwareKeyboard kb) {
Intent? resolveEvent(KeyEvent event, HardwareKeyboard kb) {
final km = _active;
if (km == null) return null;
final chord = KeyChord.fromKeyEvent(event, kb);