feat(draw): per-object data-* caption overlay on the drawing card (T-318)
DrawingCard stacks a caption layer over the SVG: each data-label / data-description annotation renders a themed caption just below its element, mapped to pixel space via a shared svgViewportFit (refactored out of the painter so the overlay and the paint use identical viewBox-fit math). Display-only (IgnorePointer). Widget-tested. data-lightbox is captured in the model; the tap-to-zoom interaction is the last follow-on. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -2,9 +2,11 @@
|
|||||||
///
|
///
|
||||||
/// Renders an [SvgDocument] — the substrate the SVG engine paints — inside a
|
/// Renders an [SvgDocument] — the substrate the SVG engine paints — inside a
|
||||||
/// framed region, with an optional clide-themed caption (label + description)
|
/// framed region, with an optional clide-themed caption (label + description)
|
||||||
/// beneath it. The SVG is *content* (its own palette); the frame and caption
|
/// beneath it, plus per-object overlay captions anchored to SVG elements that
|
||||||
/// are clide *chrome* and use `SurfaceTokens`. Display-only per D-78 — no
|
/// carry `data-label` / `data-description` (mapped to pixel space via the same
|
||||||
/// interaction lives on the card.
|
/// viewBox fit the painter uses). The SVG is *content* (its own palette); the
|
||||||
|
/// frame and captions are clide *chrome* and use `SurfaceTokens`. Display-only
|
||||||
|
/// per D-78 — no interaction lives on the card.
|
||||||
///
|
///
|
||||||
/// Sizes the SVG to its intrinsic aspect ratio (viewBox / width-height) within
|
/// Sizes the SVG to its intrinsic aspect ratio (viewBox / width-height) within
|
||||||
/// a height cap, filling the available width.
|
/// a height cap, filling the available width.
|
||||||
@@ -51,8 +53,24 @@ class DrawingCard extends StatelessWidget {
|
|||||||
|
|
||||||
Widget _svgRegion(SurfaceTokens tokens) {
|
Widget _svgRegion(SurfaceTokens tokens) {
|
||||||
final view = SvgView(document: document, images: images);
|
final view = SvgView(document: document, images: images);
|
||||||
|
final captioned = document.annotations.where((a) => _has(a.label) || _has(a.description)).toList();
|
||||||
|
final content = captioned.isEmpty
|
||||||
|
? view
|
||||||
|
: Stack(
|
||||||
|
fit: StackFit.expand,
|
||||||
|
children: [
|
||||||
|
view,
|
||||||
|
LayoutBuilder(
|
||||||
|
builder: (ctx, c) {
|
||||||
|
final size = Size(c.maxWidth, c.maxHeight);
|
||||||
|
final vp = svgViewportFit(size, document);
|
||||||
|
return Stack(children: [for (final a in captioned) _caption(a, vp, tokens)]);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
final aspect = _aspect(document);
|
final aspect = _aspect(document);
|
||||||
final sized = aspect != null ? AspectRatio(aspectRatio: aspect, child: view) : SizedBox(height: maxHeight, child: view);
|
final sized = aspect != null ? AspectRatio(aspectRatio: aspect, child: content) : SizedBox(height: maxHeight, child: content);
|
||||||
return DecoratedBox(
|
return DecoratedBox(
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
color: tokens.panelBackground,
|
color: tokens.panelBackground,
|
||||||
@@ -69,6 +87,30 @@ class DrawingCard extends StatelessWidget {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A per-object caption (data-label / data-description) positioned just below
|
||||||
|
/// the annotated element's pixel bbox. Display-only (IgnorePointer).
|
||||||
|
Widget _caption(SvgAnnotation a, SvgViewport vp, SurfaceTokens tokens) {
|
||||||
|
final tl = vp.toPixel(a.x, a.y);
|
||||||
|
final br = vp.toPixel(a.x + a.width, a.y + a.height);
|
||||||
|
final w = (br.dx - tl.dx).abs();
|
||||||
|
final h = (br.dy - tl.dy).abs();
|
||||||
|
return Positioned(
|
||||||
|
left: tl.dx,
|
||||||
|
top: tl.dy + h + 2,
|
||||||
|
width: w < 48 ? 48.0 : w,
|
||||||
|
child: IgnorePointer(
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
if (_has(a.label)) ClideText(a.label!, fontSize: clideFontCaption, fontWeight: FontWeight.w600, color: tokens.globalForeground, maxLines: 2),
|
||||||
|
if (_has(a.description)) ClideText(a.description!, fontSize: clideFontCaption, color: tokens.globalTextMuted, maxLines: 3),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
static double? _aspect(SvgDocument d) {
|
static double? _aspect(SvgDocument d) {
|
||||||
final w = d.viewBox?.width ?? d.width;
|
final w = d.viewBox?.width ?? d.width;
|
||||||
final h = d.viewBox?.height ?? d.height;
|
final h = d.viewBox?.height ?? d.height;
|
||||||
|
|||||||
@@ -42,15 +42,31 @@ class _Ctx {
|
|||||||
final SvgImageResolver? images;
|
final SvgImageResolver? images;
|
||||||
}
|
}
|
||||||
|
|
||||||
void _applyViewport(ui.Canvas canvas, Size size, SvgDocument doc) {
|
/// The fit of [doc]'s viewBox into [size] — a uniform [scale] plus a [dx]/[dy]
|
||||||
|
/// offset (xMidYMid meet) and the viewBox origin. Shared by the painter and the
|
||||||
|
/// DrawingCard overlay so captions land exactly over the painted content.
|
||||||
|
class SvgViewport {
|
||||||
|
const SvgViewport(this.scale, this.dx, this.dy, this.minX, this.minY);
|
||||||
|
final double scale, dx, dy, minX, minY;
|
||||||
|
|
||||||
|
/// Map a viewBox-space point to a pixel offset.
|
||||||
|
Offset toPixel(double x, double y) => Offset(dx + (x - minX) * scale, dy + (y - minY) * scale);
|
||||||
|
}
|
||||||
|
|
||||||
|
SvgViewport svgViewportFit(Size size, SvgDocument doc) {
|
||||||
final vb = doc.viewBox;
|
final vb = doc.viewBox;
|
||||||
final srcW = vb?.width ?? doc.width ?? size.width;
|
final srcW = vb?.width ?? doc.width ?? size.width;
|
||||||
final srcH = vb?.height ?? doc.height ?? size.height;
|
final srcH = vb?.height ?? doc.height ?? size.height;
|
||||||
if (srcW <= 0 || srcH <= 0) return;
|
if (srcW <= 0 || srcH <= 0) return const SvgViewport(1, 0, 0, 0, 0);
|
||||||
final scale = math.min(size.width / srcW, size.height / srcH);
|
final scale = math.min(size.width / srcW, size.height / srcH);
|
||||||
canvas.translate((size.width - srcW * scale) / 2, (size.height - srcH * scale) / 2);
|
return SvgViewport(scale, (size.width - srcW * scale) / 2, (size.height - srcH * scale) / 2, vb?.minX ?? 0, vb?.minY ?? 0);
|
||||||
canvas.scale(scale);
|
}
|
||||||
if (vb != null) canvas.translate(-vb.minX, -vb.minY);
|
|
||||||
|
void _applyViewport(ui.Canvas canvas, Size size, SvgDocument doc) {
|
||||||
|
final v = svgViewportFit(size, doc);
|
||||||
|
canvas.translate(v.dx, v.dy);
|
||||||
|
canvas.scale(v.scale);
|
||||||
|
canvas.translate(-v.minX, -v.minY);
|
||||||
}
|
}
|
||||||
|
|
||||||
void _paintNode(ui.Canvas canvas, SvgNode node, _Ctx ctx) {
|
void _paintNode(ui.Canvas canvas, SvgNode node, _Ctx ctx) {
|
||||||
|
|||||||
@@ -33,4 +33,14 @@ void main() {
|
|||||||
expect(find.byType(SvgView), findsOneWidget);
|
expect(find.byType(SvgView), findsOneWidget);
|
||||||
expect(find.text('Build pipeline'), findsNothing);
|
expect(find.text('Build pipeline'), findsNothing);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
testWidgets('renders per-object captions from data-* annotations (T-318)', (tester) async {
|
||||||
|
final doc = buildSvgDocument(
|
||||||
|
'<svg viewBox="0 0 100 50"><rect x="10" y="10" width="40" height="20" data-label="Node A" data-description="the entry point"/></svg>',
|
||||||
|
);
|
||||||
|
await tester.pumpWidget(anchoredHarness(f, SizedBox(width: 400, child: DrawingCard(document: doc))));
|
||||||
|
await tester.pump();
|
||||||
|
expect(find.text('Node A'), findsOneWidget);
|
||||||
|
expect(find.text('the entry point'), findsOneWidget);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user