add ClideAnchoredOverlay + ClideMenu popover primitive (D-88, T-286)
Nine surfaces hand-rolled the same anchored-overlay + row-list + barrier + keyboard-nav pattern. Extract one owned primitive (no Material): - ClideAnchoredOverlay (clide_anchored.dart): positioning + lifecycle — LayerLink/CompositedTransformFollower or centred Positioned, side/align + auto-flip on viewport bounds, full-screen tap-away barrier, OverlayEntry bookkeeping, focus capture, Esc-to-close. Driven by a ClideOverlayController. - ClideMenu + ClideMenuListController (clide_menu.dart): a dropdown-token row surface (items + separators) with arrow/enter/escape nav, skip-disabled, active mark, per-item colour/leading glyph, keepOpenOnSelect (live-apply), and onArrowLeft/Right hooks. The nav controller is reusable by surfaces that keep bespoke rows (typeaheads, quick-open). Additive — no call sites changed yet. D-88 records the convention (new `design` domain): anchored pickers build on these; modal pickers stay on DialogRouter. Tests: clide_anchored_test (open/close, barrier, Esc, centred, clean dispose) and clide_menu_test (list-nav skip/wrap, select + onClose, disabled, Esc, keepOpenOnSelect; pure ClideMenuListController cases). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,101 @@
|
||||
/// Tests for ClideAnchoredOverlay (D-88): controller-driven insert/remove,
|
||||
/// barrier + Escape dismissal, centered mode, and clean dispose.
|
||||
library;
|
||||
|
||||
import 'package:clide/widgets/widgets.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter/widgets.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
|
||||
import '../../helpers/kernel_fixture.dart';
|
||||
import '../../helpers/widget_harness.dart';
|
||||
|
||||
void main() {
|
||||
group('ClideAnchoredOverlay', () {
|
||||
late KernelFixture f;
|
||||
setUp(() async => f = await KernelFixture.create());
|
||||
tearDown(() async => f.dispose());
|
||||
|
||||
Widget host(ClideOverlayController c, ValueNotifier<bool> present, {bool barrier = true, bool centered = false}) {
|
||||
return harness(
|
||||
f,
|
||||
ValueListenableBuilder<bool>(
|
||||
valueListenable: present,
|
||||
builder: (_, show, __) => show
|
||||
? Align(
|
||||
alignment: Alignment.center,
|
||||
child: ClideAnchoredOverlay(
|
||||
controller: c,
|
||||
barrier: barrier,
|
||||
centered: centered,
|
||||
autoFlip: false,
|
||||
anchor: const SizedBox(width: 60, height: 24, child: ClideText('anchor')),
|
||||
overlayBuilder: (_, __) => const SizedBox(width: 120, height: 60, child: ClideText('panel')),
|
||||
),
|
||||
)
|
||||
: const SizedBox.shrink(),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
testWidgets('open inserts the panel; close removes it', (tester) async {
|
||||
final c = ClideOverlayController();
|
||||
addTearDown(c.dispose);
|
||||
await tester.pumpWidget(host(c, ValueNotifier(true)));
|
||||
expect(find.text('panel'), findsNothing);
|
||||
c.open();
|
||||
await tester.pump();
|
||||
expect(find.text('panel'), findsOneWidget);
|
||||
c.close();
|
||||
await tester.pump();
|
||||
expect(find.text('panel'), findsNothing);
|
||||
});
|
||||
|
||||
testWidgets('barrier tap closes', (tester) async {
|
||||
final c = ClideOverlayController();
|
||||
addTearDown(c.dispose);
|
||||
await tester.pumpWidget(host(c, ValueNotifier(true)));
|
||||
c.open();
|
||||
await tester.pump();
|
||||
await tester.tapAt(const Offset(2, 2));
|
||||
await tester.pump();
|
||||
expect(c.isOpen, isFalse);
|
||||
expect(find.text('panel'), findsNothing);
|
||||
});
|
||||
|
||||
testWidgets('Escape closes', (tester) async {
|
||||
final c = ClideOverlayController();
|
||||
addTearDown(c.dispose);
|
||||
await tester.pumpWidget(host(c, ValueNotifier(true)));
|
||||
c.open();
|
||||
await tester.pump();
|
||||
await tester.sendKeyEvent(LogicalKeyboardKey.escape);
|
||||
await tester.pump();
|
||||
expect(c.isOpen, isFalse);
|
||||
});
|
||||
|
||||
testWidgets('centered mode renders the panel', (tester) async {
|
||||
final c = ClideOverlayController();
|
||||
addTearDown(c.dispose);
|
||||
await tester.pumpWidget(host(c, ValueNotifier(true), centered: true));
|
||||
c.open();
|
||||
await tester.pump();
|
||||
expect(find.text('panel'), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('unmounting the host while open removes the entry without crashing', (tester) async {
|
||||
final c = ClideOverlayController();
|
||||
addTearDown(c.dispose);
|
||||
final present = ValueNotifier(true);
|
||||
await tester.pumpWidget(host(c, present));
|
||||
c.open();
|
||||
await tester.pump();
|
||||
expect(find.text('panel'), findsOneWidget);
|
||||
present.value = false; // unmount ClideAnchoredOverlay -> dispose removes entry
|
||||
await tester.pump(); // rebuild host (unmount + dispose)
|
||||
await tester.pump(); // overlay rebuild reflects the removed entry
|
||||
expect(find.text('panel'), findsNothing);
|
||||
expect(tester.takeException(), isNull);
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,152 @@
|
||||
/// Tests for ClideMenu + ClideMenuListController (D-88): list-nav skipping
|
||||
/// disabled/separators, select fires onSelect+onClose, keepOpenOnSelect, Esc.
|
||||
library;
|
||||
|
||||
import 'package:clide/widgets/widgets.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
|
||||
import '../../helpers/kernel_fixture.dart';
|
||||
import '../../helpers/widget_harness.dart';
|
||||
|
||||
void main() {
|
||||
group('ClideMenuListController', () {
|
||||
test('moveNext/movePrev skip non-selectable and wrap', () {
|
||||
const sel = {0, 3, 4}; // 1=separator, 2=disabled
|
||||
final c = ClideMenuListController(isSelectable: (i) => sel.contains(i), length: 5);
|
||||
expect(c.highlighted, -1);
|
||||
c.moveNext();
|
||||
expect(c.highlighted, 0);
|
||||
c.moveNext();
|
||||
expect(c.highlighted, 3);
|
||||
c.moveNext();
|
||||
expect(c.highlighted, 4);
|
||||
c.moveNext();
|
||||
expect(c.highlighted, 0, reason: 'wraps to first selectable');
|
||||
c.movePrev();
|
||||
expect(c.highlighted, 4, reason: 'wraps back to last selectable');
|
||||
});
|
||||
|
||||
test('movePrev from none selects the last selectable', () {
|
||||
final c = ClideMenuListController(isSelectable: (_) => true, length: 3);
|
||||
c.movePrev();
|
||||
expect(c.highlighted, 2);
|
||||
});
|
||||
|
||||
test('wrap:false stops at the ends', () {
|
||||
final c = ClideMenuListController(isSelectable: (_) => true, length: 3, wrap: false);
|
||||
c.moveNext();
|
||||
c.moveNext();
|
||||
c.moveNext();
|
||||
expect(c.highlighted, 2);
|
||||
c.moveNext();
|
||||
expect(c.highlighted, 2, reason: 'no wrap');
|
||||
});
|
||||
|
||||
test('length resize clears a now-out-of-range highlight', () {
|
||||
final c = ClideMenuListController(isSelectable: (_) => true, length: 5);
|
||||
c.setHighlight(4);
|
||||
c.length = 3;
|
||||
expect(c.highlighted, -1);
|
||||
});
|
||||
});
|
||||
|
||||
group('ClideMenu', () {
|
||||
late KernelFixture f;
|
||||
setUp(() async => f = await KernelFixture.create());
|
||||
tearDown(() async => f.dispose());
|
||||
|
||||
testWidgets('renders items + separator; tapping an item fires onSelect + onClose', (tester) async {
|
||||
var picked = '';
|
||||
var closed = 0;
|
||||
await tester.pumpWidget(harness(
|
||||
f,
|
||||
ClideMenu(
|
||||
onClose: () => closed++,
|
||||
entries: [
|
||||
ClideMenuItem(label: 'Alpha', onSelect: () => picked = 'Alpha'),
|
||||
const ClideMenuSeparator(),
|
||||
ClideMenuItem(label: 'Beta', onSelect: () => picked = 'Beta'),
|
||||
],
|
||||
),
|
||||
));
|
||||
await tester.pump();
|
||||
expect(find.text('Alpha'), findsOneWidget);
|
||||
expect(find.text('Beta'), findsOneWidget);
|
||||
await tester.tap(find.text('Beta'));
|
||||
await tester.pump();
|
||||
expect(picked, 'Beta');
|
||||
expect(closed, 1);
|
||||
});
|
||||
|
||||
testWidgets('arrow-down then Enter activates the highlighted item', (tester) async {
|
||||
var picked = '';
|
||||
await tester.pumpWidget(harness(
|
||||
f,
|
||||
ClideMenu(
|
||||
onClose: () {},
|
||||
entries: [
|
||||
ClideMenuItem(label: 'One', onSelect: () => picked = 'One'),
|
||||
ClideMenuItem(label: 'Two', onSelect: () => picked = 'Two'),
|
||||
],
|
||||
),
|
||||
));
|
||||
await tester.pump();
|
||||
await tester.sendKeyEvent(LogicalKeyboardKey.arrowDown);
|
||||
await tester.sendKeyEvent(LogicalKeyboardKey.arrowDown);
|
||||
await tester.sendKeyEvent(LogicalKeyboardKey.enter);
|
||||
await tester.pump();
|
||||
expect(picked, 'Two');
|
||||
});
|
||||
|
||||
testWidgets('disabled item is inert and skipped by arrows', (tester) async {
|
||||
var picked = '';
|
||||
await tester.pumpWidget(harness(
|
||||
f,
|
||||
ClideMenu(
|
||||
onClose: () {},
|
||||
entries: [
|
||||
ClideMenuItem(label: 'Able', onSelect: () => picked = 'Able'),
|
||||
ClideMenuItem(label: 'Off', enabled: false, onSelect: () => picked = 'Off'),
|
||||
ClideMenuItem(label: 'Last', onSelect: () => picked = 'Last'),
|
||||
],
|
||||
),
|
||||
));
|
||||
await tester.pump();
|
||||
await tester.tap(find.text('Off'));
|
||||
await tester.pump();
|
||||
expect(picked, '', reason: 'disabled tap is a no-op');
|
||||
await tester.sendKeyEvent(LogicalKeyboardKey.arrowDown); // -> Able
|
||||
await tester.sendKeyEvent(LogicalKeyboardKey.arrowDown); // skip Off -> Last
|
||||
await tester.sendKeyEvent(LogicalKeyboardKey.enter);
|
||||
await tester.pump();
|
||||
expect(picked, 'Last');
|
||||
});
|
||||
|
||||
testWidgets('Escape calls onClose', (tester) async {
|
||||
var closed = 0;
|
||||
await tester.pumpWidget(harness(f, ClideMenu(onClose: () => closed++, entries: [ClideMenuItem(label: 'X', onSelect: () {})])));
|
||||
await tester.pump();
|
||||
await tester.sendKeyEvent(LogicalKeyboardKey.escape);
|
||||
await tester.pump();
|
||||
expect(closed, 1);
|
||||
});
|
||||
|
||||
testWidgets('keepOpenOnSelect item fires onSelect but not onClose', (tester) async {
|
||||
var picked = 0;
|
||||
var closed = 0;
|
||||
await tester.pumpWidget(harness(
|
||||
f,
|
||||
ClideMenu(
|
||||
onClose: () => closed++,
|
||||
entries: [ClideMenuItem(label: 'Toggle', keepOpenOnSelect: true, onSelect: () => picked++)],
|
||||
),
|
||||
));
|
||||
await tester.pump();
|
||||
await tester.tap(find.text('Toggle'));
|
||||
await tester.pump();
|
||||
expect(picked, 1);
|
||||
expect(closed, 0);
|
||||
});
|
||||
});
|
||||
}
|
||||
Reference in New Issue
Block a user