From 5132da62a956a11bf427bb5963fbf88728784e92 Mon Sep 17 00:00:00 2001 From: Alan Silva Date: Sun, 1 Nov 2026 16:55:14 +0000 Subject: [PATCH 1/2] Artifact viewer bar: right above the tab bar and clickable The viewer's action/pager bar added the inherited bottom clearance twice (its SafeArea already applies it), floating far above the tab bar. On the web an HTML preview's iframe passed behind the bars and, as a platform view, took every click there; it now stops at the bars. Also keep floating tabs in semantics while they fade in, which broke the badge announcements (5 failing tests on main since the entrance animation landed). --- .../artifacts/ui/artifact_html_view.dart | 16 +++- .../artifacts/ui/artifact_viewer_body.dart | 80 +++++++++---------- .../ui/adaptive/floating_destination_bar.dart | 2 + .../ui/artifact_viewer_page_test.dart | 3 + 4 files changed, 58 insertions(+), 43 deletions(-) diff --git a/app/lib/features/artifacts/ui/artifact_html_view.dart b/app/lib/features/artifacts/ui/artifact_html_view.dart index 4b2831b2..b4d2abb7 100644 --- a/app/lib/features/artifacts/ui/artifact_html_view.dart +++ b/app/lib/features/artifacts/ui/artifact_html_view.dart @@ -13,8 +13,18 @@ typedef ArtifactHtmlBuilder = /// empty `sandbox` blocks scripts, forms, popups and navigation; on Android and /// iOS in a web view with JavaScript disabled and navigation refused. The /// document never runs code with the app's origin or credentials. -Widget defaultArtifactHtml(BuildContext context, String html) => - SizedBox.expand( +/// +/// The preview stops at the floating bars instead of passing behind them: on +/// the web the iframe is a platform view that takes every click over its +/// area, even where a bar is drawn on top, which left the viewer's actions +/// and pager unclickable. +Widget defaultArtifactHtml(BuildContext context, String html) { + final padding = MediaQuery.paddingOf(context); + return Padding( + padding: EdgeInsets.only(top: padding.top, bottom: padding.bottom), + child: SizedBox.expand( key: const Key('artifact-html-preview'), child: impl.InertHtmlView(html: html), - ); + ), + ); +} diff --git a/app/lib/features/artifacts/ui/artifact_viewer_body.dart b/app/lib/features/artifacts/ui/artifact_viewer_body.dart index d18bca5a..2195c74d 100644 --- a/app/lib/features/artifacts/ui/artifact_viewer_body.dart +++ b/app/lib/features/artifacts/ui/artifact_viewer_body.dart @@ -101,48 +101,48 @@ class ArtifactViewerBody extends StatelessWidget { // no empty glass bar, and no bottom clearance reserved for one. if (resolved == null && count <= 1) return swipe; return FloatingBarOverlay( - bar: Padding( - padding: withFloatingBarClearance(context, EdgeInsets.zero), - child: SafeArea( - top: false, - minimum: const EdgeInsets.all(8), - child: SizedBox( - height: 56, - child: GlassPill( - cupertino: usesCupertinoHost(context), - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 2), - child: Row( - key: const Key('artifact-viewer-actions'), - children: [ - if (resolved != null && !resolved.external) - ArtifactFileActions( - key: ValueKey( - 'viewer-files-${page.group.stageKey}\u0000' - '${page.group.visit}\u0000${page.artifact.url}', - ), - artifact: page.artifact, - resolved: resolved, - fetch: fetch, - bridge: fileBridge, - compact: true, - ), - if (resolved != null) - _Actions( - resolved: resolved, - onOpen: onOpen, - onCopy: onCopy, - ), - Expanded( - child: _Pager( - index: index, - count: count, - onPrevious: onPrevious, - onNext: onNext, + // The SafeArea already lifts the bar by the inherited bottom inset (a + // shell bar below the pane); adding that clearance again floated the + // bar far above it. + bar: SafeArea( + top: false, + minimum: const EdgeInsets.all(8), + child: SizedBox( + height: 56, + child: GlassPill( + cupertino: usesCupertinoHost(context), + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 2), + child: Row( + key: const Key('artifact-viewer-actions'), + children: [ + if (resolved != null && !resolved.external) + ArtifactFileActions( + key: ValueKey( + 'viewer-files-${page.group.stageKey}\u0000' + '${page.group.visit}\u0000${page.artifact.url}', ), + artifact: page.artifact, + resolved: resolved, + fetch: fetch, + bridge: fileBridge, + compact: true, ), - ], - ), + if (resolved != null) + _Actions( + resolved: resolved, + onOpen: onOpen, + onCopy: onCopy, + ), + Expanded( + child: _Pager( + index: index, + count: count, + onPrevious: onPrevious, + onNext: onNext, + ), + ), + ], ), ), ), diff --git a/app/lib/ui/adaptive/floating_destination_bar.dart b/app/lib/ui/adaptive/floating_destination_bar.dart index d5ac232e..255de497 100644 --- a/app/lib/ui/adaptive/floating_destination_bar.dart +++ b/app/lib/ui/adaptive/floating_destination_bar.dart @@ -372,6 +372,8 @@ class _TabEntranceState extends State<_TabEntrance> ); return FadeTransition( opacity: animation, + // Tabs (and their badge counts) stay announced while they fade in. + alwaysIncludeSemantics: true, child: ScaleTransition( scale: Tween(begin: 0.88, end: 1).animate(animation), child: widget.child, diff --git a/app/test/features/artifacts/ui/artifact_viewer_page_test.dart b/app/test/features/artifacts/ui/artifact_viewer_page_test.dart index dd3e675d..d9c59505 100644 --- a/app/test/features/artifacts/ui/artifact_viewer_page_test.dart +++ b/app/test/features/artifacts/ui/artifact_viewer_page_test.dart @@ -726,6 +726,9 @@ void main() { ); final pager = tester.getRect(find.byKey(artifactNextKey)); expect(pager.bottom, lessThanOrEqualTo(size.height - 120)); + // Right above the stacked bar, not lifted by its clearance twice + // (the bar is one 56 px pill above the inset plus its margin). + expect(pager.bottom, greaterThanOrEqualTo(size.height - 120 - 56)); }, ); } From b1d149d8726f6a6eb21952f9383584db2db79d70 Mon Sep 17 00:00:00 2001 From: Alan Silva Date: Sun, 1 Nov 2026 17:01:12 +0000 Subject: [PATCH 2/2] Make floating tab entrances pop sequentially --- .../ui/adaptive/floating_destination_bar.dart | 44 ++++++++++++++++--- app/lib/ui/motion/motion.dart | 16 ++++++- .../adaptive/floating_bar_edge_gap_test.dart | 23 +++++++--- 3 files changed, 67 insertions(+), 16 deletions(-) diff --git a/app/lib/ui/adaptive/floating_destination_bar.dart b/app/lib/ui/adaptive/floating_destination_bar.dart index d5ac232e..d1b3c456 100644 --- a/app/lib/ui/adaptive/floating_destination_bar.dart +++ b/app/lib/ui/adaptive/floating_destination_bar.dart @@ -336,7 +336,8 @@ class _TabEntranceState extends State<_TabEntrance> _controller = AnimationController( vsync: this, duration: - Motion.standard + Motion.tabEntranceStagger * (widget.count - 1), + Motion.tabEntranceDuration + + Motion.tabEntranceStagger * (widget.count - 1), ); } @@ -345,7 +346,7 @@ class _TabEntranceState extends State<_TabEntrance> super.didChangeDependencies(); if (_started) return; _started = true; - final duration = Motion.of(context, Motion.standard); + final duration = Motion.of(context, Motion.tabEntranceDuration); _controller.duration = duration + Motion.tabEntranceStagger * (widget.count - 1); if (duration == Duration.zero) { @@ -365,16 +366,45 @@ class _TabEntranceState extends State<_TabEntrance> Widget build(BuildContext context) { final total = _controller.duration!.inMicroseconds; final start = Motion.tabEntranceStagger.inMicroseconds * widget.index; + final window = Motion.tabEntranceDuration.inMicroseconds; final begin = total == 0 ? 0.0 : start / total; - final animation = CurvedAnimation( + final end = total == 0 ? 1.0 : (start + window) / total; + final pop = CurvedAnimation( parent: _controller, - curve: Interval(begin, 1, curve: Motion.curve), + curve: Interval( + begin, + end.clamp(begin, 1.0).toDouble(), + curve: Curves.easeOutBack, + ), + ); + final opacity = CurvedAnimation( + parent: _controller, + curve: Interval( + begin, + total == 0 + ? 1.0 + : (start + window * Motion.tabEntranceOpacityPortion) + .clamp(start, total) + .toDouble() / + total, + curve: Curves.easeOut, + ), ); return FadeTransition( - opacity: animation, - child: ScaleTransition( - scale: Tween(begin: 0.88, end: 1).animate(animation), + opacity: opacity, + child: AnimatedBuilder( + animation: pop, child: widget.child, + builder: (context, child) => Transform.translate( + offset: Offset(0, (1 - pop.value) * Motion.tabEntranceSlideDistance), + child: Transform.scale( + scale: Tween( + begin: Motion.tabEntranceScaleBegin, + end: 1, + ).evaluate(pop), + child: child, + ), + ), ), ); } diff --git a/app/lib/ui/motion/motion.dart b/app/lib/ui/motion/motion.dart index 67059a18..3e57abe2 100644 --- a/app/lib/ui/motion/motion.dart +++ b/app/lib/ui/motion/motion.dart @@ -10,8 +10,20 @@ abstract final class Motion { /// A section opening or closing, a bar changing its actions. static const Duration standard = Duration(milliseconds: 200); - /// Delay between neighbouring controls entering as one group. - static const Duration tabEntranceStagger = Duration(milliseconds: 40); + /// Duration of each tab's entrance pop. + static const Duration tabEntranceDuration = Duration(milliseconds: 260); + + /// Delay between neighbouring tabs entering as one group. + static const Duration tabEntranceStagger = Duration(milliseconds: 70); + + /// The scale at which a tab starts its entrance pop. + static const double tabEntranceScaleBegin = 0.6; + + /// The upward travel distance of a tab's entrance pop, in logical pixels. + static const double tabEntranceSlideDistance = 6; + + /// The fraction of a tab's entrance spent fading in. + static const double tabEntranceOpacityPortion = 0.6; static const Curve curve = Curves.easeOutCubic; diff --git a/app/test/ui/adaptive/floating_bar_edge_gap_test.dart b/app/test/ui/adaptive/floating_bar_edge_gap_test.dart index 09a9b845..d712d0c2 100644 --- a/app/test/ui/adaptive/floating_bar_edge_gap_test.dart +++ b/app/test/ui/adaptive/floating_bar_edge_gap_test.dart @@ -171,14 +171,23 @@ void main() { ); final entrance = find.descendant( of: find.byType(FloatingDestinationBar), - matching: find.byType(FadeTransition), + matching: find.byWidgetPredicate( + (widget) => + widget is FadeTransition && widget.child is AnimatedBuilder, + ), ); - expect( - tester.widget(entrance.first).opacity.value, - inInclusiveRange(0, 1), - ); - await tester.pump(const Duration(milliseconds: 320)); - expect(tester.widget(entrance.first).opacity.value, 1); + double firstOpacity() => + tester.widget(entrance.at(0)).opacity.value; + double lastOpacity() => + tester.widget(entrance.at(2)).opacity.value; + expect(firstOpacity(), 0); + expect(lastOpacity(), 0); + await tester.pump(const Duration(milliseconds: 130)); + expect(firstOpacity(), greaterThan(0.9)); + expect(lastOpacity(), lessThan(0.2)); + await tester.pump(const Duration(milliseconds: 270)); + expect(firstOpacity(), 1); + expect(lastOpacity(), 1); await tester.tap(find.byKey(tabKey(1))); await tester.pump();