feat(graph): interactive GraphView — hover-highlight + click-to-open (T-323)
GraphView lays a VaultGraph out with the force solver, paints it, and wires hover (light the hovered node's neighbourhood, dim the rest) + click (onOpen with the node's vault path). A shared GraphViewport keeps hit-testing aligned with paint. Solver + model + painter + interactive view now stand; the pql link-data wiring, filter, and MultitabPane/slot registration are the remaining "integrate into the app" work. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -15,6 +15,47 @@ import 'package:clide/src/graph/force_layout.dart';
|
|||||||
import 'package:clide/src/graph/vault_graph.dart';
|
import 'package:clide/src/graph/vault_graph.dart';
|
||||||
import 'package:flutter/widgets.dart';
|
import 'package:flutter/widgets.dart';
|
||||||
|
|
||||||
|
/// The aspect-preserving, centered fit of the solver's [layoutSize] space into a
|
||||||
|
/// canvas — shared by the painter and hit-testing so hover/click land exactly on
|
||||||
|
/// what's drawn.
|
||||||
|
class GraphViewport {
|
||||||
|
GraphViewport(this.scale, this.dx, this.dy);
|
||||||
|
final double scale, dx, dy;
|
||||||
|
|
||||||
|
factory GraphViewport.fit(Size canvas, Size layout) {
|
||||||
|
final scale = math.min(canvas.width / layout.width, canvas.height / layout.height);
|
||||||
|
return GraphViewport(scale, (canvas.width - layout.width * scale) / 2, (canvas.height - layout.height * scale) / 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
Offset toPixel(GraphPoint p) => Offset(dx + p.x * scale, dy + p.y * scale);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The node id nearest [local] within [hitRadius] px, or null — the inverse of
|
||||||
|
/// [GraphViewport], so it matches what [GraphPainter] drew.
|
||||||
|
String? hitTestNode(
|
||||||
|
VaultGraph graph,
|
||||||
|
Map<String, GraphPoint> positions,
|
||||||
|
Offset local,
|
||||||
|
Size size, {
|
||||||
|
Size layoutSize = const Size(800, 600),
|
||||||
|
double hitRadius = 12,
|
||||||
|
}) {
|
||||||
|
if (positions.isEmpty) return null;
|
||||||
|
final vp = GraphViewport.fit(size, layoutSize);
|
||||||
|
String? best;
|
||||||
|
var bestD = hitRadius;
|
||||||
|
for (final n in graph.nodes) {
|
||||||
|
final p = positions[n.id];
|
||||||
|
if (p == null) continue;
|
||||||
|
final d = (vp.toPixel(p) - local).distance;
|
||||||
|
if (d <= bestD) {
|
||||||
|
bestD = d;
|
||||||
|
best = n.id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return best;
|
||||||
|
}
|
||||||
|
|
||||||
class GraphPainter extends CustomPainter {
|
class GraphPainter extends CustomPainter {
|
||||||
GraphPainter({required this.graph, required this.positions, required this.tokens, this.highlight, this.layoutSize = const Size(800, 600)});
|
GraphPainter({required this.graph, required this.positions, required this.tokens, this.highlight, this.layoutSize = const Size(800, 600)});
|
||||||
|
|
||||||
@@ -33,10 +74,8 @@ class GraphPainter extends CustomPainter {
|
|||||||
@override
|
@override
|
||||||
void paint(ui.Canvas canvas, Size size) {
|
void paint(ui.Canvas canvas, Size size) {
|
||||||
if (graph.isEmpty || positions.isEmpty) return;
|
if (graph.isEmpty || positions.isEmpty) return;
|
||||||
final scale = math.min(size.width / layoutSize.width, size.height / layoutSize.height);
|
final vp = GraphViewport.fit(size, layoutSize);
|
||||||
final dx = (size.width - layoutSize.width * scale) / 2;
|
Offset at(GraphPoint p) => vp.toPixel(p);
|
||||||
final dy = (size.height - layoutSize.height * scale) / 2;
|
|
||||||
Offset at(GraphPoint p) => Offset(dx + p.x * scale, dy + p.y * scale);
|
|
||||||
bool lit(String id) => highlight == null || highlight!.contains(id);
|
bool lit(String id) => highlight == null || highlight!.contains(id);
|
||||||
|
|
||||||
final edge = Paint()
|
final edge = Paint()
|
||||||
|
|||||||
@@ -0,0 +1,87 @@
|
|||||||
|
/// The interactive vault-graph view (T-323): lays a [VaultGraph] out with the
|
||||||
|
/// force solver, paints it via [GraphPainter], and wires hover (highlight the
|
||||||
|
/// neighbourhood) + click (open the note). Pan/zoom + filtering layer on later.
|
||||||
|
library;
|
||||||
|
|
||||||
|
import 'package:clide/builtin/graph/src/graph_painter.dart';
|
||||||
|
import 'package:clide/src/graph/force_layout.dart';
|
||||||
|
import 'package:clide/src/graph/vault_graph.dart';
|
||||||
|
import 'package:clide/widgets/src/clide_settings.dart';
|
||||||
|
import 'package:flutter/widgets.dart';
|
||||||
|
|
||||||
|
class GraphView extends StatefulWidget {
|
||||||
|
const GraphView({super.key, required this.graph, this.onOpen, this.layoutSize = const Size(800, 600)});
|
||||||
|
|
||||||
|
final VaultGraph graph;
|
||||||
|
|
||||||
|
/// Called with a node's id (its vault-relative path) when it's clicked.
|
||||||
|
final void Function(String nodeId)? onOpen;
|
||||||
|
|
||||||
|
final Size layoutSize;
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<GraphView> createState() => _GraphViewState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _GraphViewState extends State<GraphView> {
|
||||||
|
late Map<String, GraphPoint> _pos;
|
||||||
|
String? _hovered;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
_relayout();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void didUpdateWidget(GraphView old) {
|
||||||
|
super.didUpdateWidget(old);
|
||||||
|
if (!identical(old.graph, widget.graph)) _relayout();
|
||||||
|
}
|
||||||
|
|
||||||
|
void _relayout() {
|
||||||
|
_pos = ForceLayout.compute(
|
||||||
|
[for (final n in widget.graph.nodes) n.id],
|
||||||
|
widget.graph.edgePairs,
|
||||||
|
width: widget.layoutSize.width,
|
||||||
|
height: widget.layoutSize.height,
|
||||||
|
);
|
||||||
|
_hovered = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final tokens = ClideSettings.theme.of(context).surface;
|
||||||
|
return LayoutBuilder(
|
||||||
|
builder: (ctx, constraints) {
|
||||||
|
final size = constraints.biggest;
|
||||||
|
String? hit(Offset local) => hitTestNode(widget.graph, _pos, local, size, layoutSize: widget.layoutSize);
|
||||||
|
return MouseRegion(
|
||||||
|
onHover: (e) {
|
||||||
|
final h = hit(e.localPosition);
|
||||||
|
if (h != _hovered) setState(() => _hovered = h);
|
||||||
|
},
|
||||||
|
onExit: (_) {
|
||||||
|
if (_hovered != null) setState(() => _hovered = null);
|
||||||
|
},
|
||||||
|
child: GestureDetector(
|
||||||
|
onTapUp: (d) {
|
||||||
|
final h = hit(d.localPosition);
|
||||||
|
if (h != null) widget.onOpen?.call(h);
|
||||||
|
},
|
||||||
|
child: CustomPaint(
|
||||||
|
size: size,
|
||||||
|
painter: GraphPainter(
|
||||||
|
graph: widget.graph,
|
||||||
|
positions: _pos,
|
||||||
|
tokens: tokens,
|
||||||
|
highlight: _hovered == null ? null : widget.graph.neighborhood(_hovered!),
|
||||||
|
layoutSize: widget.layoutSize,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -68,4 +68,16 @@ void main() {
|
|||||||
final tokens = await tokensFrom(tester);
|
final tokens = await tokensFrom(tester);
|
||||||
expect(await tester.runAsync(() => hasInk(GraphPainter(graph: const VaultGraph([], []), positions: const {}, tokens: tokens))), isFalse);
|
expect(await tester.runAsync(() => hasInk(GraphPainter(graph: const VaultGraph([], []), positions: const {}, tokens: tokens))), isFalse);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
group('hitTestNode', () {
|
||||||
|
test('finds the node under the point, null when far or empty', () {
|
||||||
|
final g = VaultGraph.fromOutlinks({'a.md': const []});
|
||||||
|
// A single node lays out at the layout centre (400,300); an 800×600 canvas
|
||||||
|
// over an 800×600 layout is scale 1, no offset → the node sits at (400,300).
|
||||||
|
final pos = ForceLayout.compute(['a.md'], const []);
|
||||||
|
expect(hitTestNode(g, pos, const Offset(400, 300), const Size(800, 600)), 'a.md');
|
||||||
|
expect(hitTestNode(g, pos, const Offset(20, 20), const Size(800, 600)), isNull);
|
||||||
|
expect(hitTestNode(g, const {}, Offset.zero, const Size(800, 600)), isNull);
|
||||||
|
});
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
import 'package:clide/builtin/graph/src/graph_view.dart';
|
||||||
|
import 'package:clide/src/graph/vault_graph.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() {
|
||||||
|
late KernelFixture f;
|
||||||
|
setUp(() async => f = await KernelFixture.create());
|
||||||
|
tearDown(() => f.dispose());
|
||||||
|
|
||||||
|
testWidgets('clicking a node opens it', (tester) async {
|
||||||
|
String? opened;
|
||||||
|
final g = VaultGraph.fromOutlinks({'only.md': const []});
|
||||||
|
await tester.pumpWidget(
|
||||||
|
anchoredHarness(
|
||||||
|
f,
|
||||||
|
SizedBox(
|
||||||
|
width: 300,
|
||||||
|
height: 300,
|
||||||
|
child: GraphView(graph: g, layoutSize: const Size(300, 300), onOpen: (id) => opened = id),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
await tester.pump();
|
||||||
|
// A single node lays out at the centre → the view's centre.
|
||||||
|
await tester.tap(find.byType(GraphView));
|
||||||
|
expect(opened, 'only.md');
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('renders an empty graph without error', (tester) async {
|
||||||
|
await tester.pumpWidget(anchoredHarness(f, const SizedBox(width: 200, height: 200, child: GraphView(graph: VaultGraph([], [])))));
|
||||||
|
await tester.pump();
|
||||||
|
expect(find.byType(GraphView), findsOneWidget);
|
||||||
|
await tester.tap(find.byType(GraphView)); // no node, no onOpen — must not throw
|
||||||
|
});
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user