Refine mobile pane animation and preserve native Back
This commit is contained in:
@@ -93,6 +93,7 @@ class ChatThreadView extends StatefulWidget {
|
||||
this.paneControls = const [],
|
||||
this.sidebarControl,
|
||||
this.showBackButton,
|
||||
this.useNativeBack = false,
|
||||
});
|
||||
|
||||
final ApiGateway gateway;
|
||||
@@ -103,6 +104,7 @@ class ChatThreadView extends StatefulWidget {
|
||||
final List<Widget> paneControls;
|
||||
final Widget? sidebarControl;
|
||||
final bool? showBackButton;
|
||||
final bool useNativeBack;
|
||||
|
||||
/// Sets the chat's shared colour (a palette name, null for none) from the
|
||||
/// information sheet; null leaves the sheet without the Colour choice.
|
||||
@@ -1199,7 +1201,9 @@ class _ChatThreadViewState extends State<ChatThreadView> {
|
||||
showBack: canGoBack,
|
||||
// A pushed page keeps the platform's stock Back (pop this route); a
|
||||
// standalone conversation calls its owner.
|
||||
onBack: widget.showBackButton == true
|
||||
onBack: widget.useNativeBack
|
||||
? null
|
||||
: widget.showBackButton == true
|
||||
? widget.onBack
|
||||
: (inShellBar ? null : widget.onBack),
|
||||
// Each control is its own action, so each pops in (and sinks) on its
|
||||
|
||||
@@ -432,6 +432,7 @@ class _ChatScreenState extends State<ChatScreen> with _ChatScreenWorkspace {
|
||||
onNextChat: _nextAfter(selected) != null
|
||||
? () => _openNext(selected)
|
||||
: null,
|
||||
useNativeBack: _page.open,
|
||||
showBackButton: pane == null
|
||||
? null
|
||||
: _page.open || !showsListBesideDetail(context),
|
||||
|
||||
@@ -51,50 +51,53 @@ class ChatMobilePaneViewport extends StatelessWidget {
|
||||
super.key,
|
||||
required this.peek,
|
||||
required this.child,
|
||||
required this.height,
|
||||
required this.onActivate,
|
||||
required this.label,
|
||||
required this.paneId,
|
||||
});
|
||||
final bool peek;
|
||||
final double height;
|
||||
final Widget child;
|
||||
final VoidCallback onActivate;
|
||||
final String label;
|
||||
final String paneId;
|
||||
@override
|
||||
Widget build(BuildContext context) => ClipRect(
|
||||
child: Stack(
|
||||
fit: StackFit.expand,
|
||||
children: [
|
||||
OverflowBox(
|
||||
alignment: Alignment.topCenter,
|
||||
minHeight: height,
|
||||
maxHeight: peek ? math.max(height, 300) : height,
|
||||
child: SizedBox(
|
||||
height: peek ? math.max(height, 300) : height,
|
||||
child: ExcludeFocus(
|
||||
excluding: peek,
|
||||
child: ExcludeSemantics(
|
||||
excluding: peek,
|
||||
child: IgnorePointer(ignoring: peek, child: child),
|
||||
Widget build(BuildContext context) => LayoutBuilder(
|
||||
builder: (context, constraints) {
|
||||
final height = constraints.maxHeight;
|
||||
return ClipRect(
|
||||
child: Stack(
|
||||
fit: StackFit.expand,
|
||||
children: [
|
||||
OverflowBox(
|
||||
alignment: Alignment.topCenter,
|
||||
minHeight: height,
|
||||
maxHeight: peek ? math.max(height, 300) : height,
|
||||
child: SizedBox(
|
||||
height: peek ? math.max(height, 300) : height,
|
||||
child: ExcludeFocus(
|
||||
excluding: peek,
|
||||
child: ExcludeSemantics(
|
||||
excluding: peek,
|
||||
child: IgnorePointer(ignoring: peek, child: child),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
if (peek)
|
||||
Semantics(
|
||||
key: ValueKey('chat-peek-$paneId'),
|
||||
identifier: 'chat-peek-$paneId',
|
||||
container: true,
|
||||
label: 'Expand $label',
|
||||
button: true,
|
||||
child: GestureDetector(
|
||||
behavior: HitTestBehavior.opaque,
|
||||
onTap: onActivate,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
if (peek)
|
||||
Semantics(
|
||||
key: ValueKey('chat-peek-$paneId'),
|
||||
identifier: 'chat-peek-$paneId',
|
||||
container: true,
|
||||
label: 'Expand $label',
|
||||
button: true,
|
||||
child: GestureDetector(
|
||||
behavior: HitTestBehavior.opaque,
|
||||
onTap: onActivate,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
@@ -172,12 +172,6 @@ class _ChatWorkspaceState extends State<ChatWorkspace> {
|
||||
peek: mobile?.peekId == pane.id,
|
||||
label: widget.paneTitle?.call(pane) ?? pane.sessionId,
|
||||
paneId: pane.id,
|
||||
height:
|
||||
(mobile?.rects[pane.id] ??
|
||||
(collapsed
|
||||
? Offset.zero & constraints.biggest
|
||||
: geometry.panes[pane.id]!))
|
||||
.height,
|
||||
onActivate: () {
|
||||
FocusManager.instance.primaryFocus?.unfocus();
|
||||
widget.controller.activate(pane.id);
|
||||
|
||||
@@ -11,3 +11,7 @@ A chat first opened on a phone stays in its native full-screen detail route whil
|
||||
Checks: bounded analysis clean;7 real-screen split tests passed, including first-phone-split draft/state identity, exactly one initial Back control, large text with300px keyboard inset and desktop/narrow restoration;23 workspace/controller/persistence tests passed, including intermediate animation geometry, reduced motion and three retained panes;10 list-shortcut tests passed. Tests use the memory watchdog.
|
||||
|
||||
Rendered browser evidence: `/private/tmp/mobile-panes-phone-final/` (Material/light560x1000, Add pane, draft retention, real peek taps, no native input focus after a peek switch, unfold880); `/private/tmp/mobile-panes-unfolded-final/` (Cupertino/dark880x1100 hidden sidebar, fold560x1000, switch). All8 final screenshots/contact sheet were inspected; reports have no errors. The phone film contact sheet and10 frame files show the actual220ms transition, including intermediate frames. Test browsers/servers exited. No physical Fold testing, backend change or deployment was performed in this lane.
|
||||
|
||||
Animation follow-up: each pane now lays out against its actual animated constraints, instead of its target rectangle, so shrinking panes do not leave a transient blank area. Regression assertions compare both thread content heights against intermediate animated viewport heights. Workspace23, direct mobile2 and real-screen7 tests pass; analysis is clean. Updated actual-browser film and screenshots: `/private/tmp/mobile-panes-phone-smooth/`,16frames plus the inspected contact sheet and representative145/245msframes. The native-input no-keyboard check passes again.
|
||||
|
||||
Native Back follow-up: phone-hosted pane headers request the stock Navigator Back action (`useNativeBack`) while retaining their own visible Back control. Both application scroll/top/bottom/system-Back regressions pass (2/2), and the first-phone-split integration asserts a null native BackButton callback. Screen integration7/7 and bounded analysis pass after this change. Inline workspaces retain their explicit owner Back callback.
|
||||
|
||||
@@ -127,6 +127,12 @@ void main() {
|
||||
await tester.tap(find.text('Chat a').first);
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.byTooltip('Back').hitTestable(), findsOneWidget);
|
||||
expect(
|
||||
tester
|
||||
.widget<BackButton>(find.byType(BackButton).hitTestable())
|
||||
.onPressed,
|
||||
isNull,
|
||||
);
|
||||
final stateA = tester.state(_thread('a'));
|
||||
await tester.enterText(_input('a'), 'Phone draft A');
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@@ -92,6 +92,17 @@ void main() {
|
||||
final intermediate = tester.getSize(_rect(first)).height;
|
||||
expect(intermediate, greaterThan(oldHeight));
|
||||
expect(intermediate, lessThan((800 - 6) * .8));
|
||||
// Content follows the animated viewport, rather than jumping to the
|
||||
// target height and leaving a blank area during the transition.
|
||||
expect(
|
||||
tester.getSize(find.byKey(const ValueKey('a'))).height,
|
||||
closeTo(intermediate, 1),
|
||||
);
|
||||
final shrinkingHeight = tester.getSize(_rect(second)).height;
|
||||
expect(
|
||||
tester.getSize(find.byKey(const ValueKey('b'))).height,
|
||||
closeTo(shrinkingHeight < 300 ? 300 : shrinkingHeight, 1),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
expect(controller.activePane?.sessionId, 'a');
|
||||
expect(tester.getSize(_rect(first)).height, closeTo((800 - 6) * .8, 1));
|
||||
|
||||
Reference in New Issue
Block a user