Skip to content

perf(main): optimize sidebar spring animation and eliminate full-slot offscreen Opacity compositing #955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ZhuchkaTriplesix merged 1 commit into from
Sep 25, 2026
Merged

perf(main): optimize sidebar spring animation and eliminate full-slot offscreen Opacity compositing #955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
226 changes: 130 additions & 96 deletions lib/features/main_screen/main_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1175,6 +1175,7 @@ class _MainContentSplitState extends State<_MainContentSplit>
static const double _maxLeftWidth = 500;
static const double _minWorkspaceWidth = 64;
static const double _resizeHandleWidth = 6;
static const double _collapseThreshold = 1.0;

/// High-responsiveness critically damped spring for fluid sidebar toggling (~0.22s).
static const SpringDescription _sidebarSpring = SpringDescription(
Expand Down Expand Up @@ -1336,7 +1337,6 @@ class _MainContentSplitState extends State<_MainContentSplit>
builder: (context, constraints) {
_lastMaxWidth = constraints.maxWidth;
final currentW = _widthSpring.value.clamp(0.0, constraints.maxWidth);
final isFullyCollapsed = currentW <= 0.001 && !_widthSpring.isAnimating;
final progress = _lastExpandedWidth > 0
? (currentW / _lastExpandedWidth).clamp(0.0, 1.0)
: 0.0;
Expand All @@ -1345,113 +1345,147 @@ class _MainContentSplitState extends State<_MainContentSplit>
final handleOpacity = (progress * 5.0).clamp(0.0, 1.0);
final contentOpacity = (progress * 2.2).clamp(0.0, 1.0);
final parallaxOffset = (progress - 1.0) * 36.0;
final isCollapsed =
currentW <= _collapseThreshold || contentOpacity <= 0.0;

final slot = material.RepaintBoundary(
child: _ConnectionsPanelSlot(
connectionsPanelKey: widget.connectionsPanelKey,
workspace: widget.workspace,
onConnectionSelected: widget.onConnectionSelected,
onRedisDatabaseSelected:
widget.onRedisDatabaseSelected,
onMongoDBDatabaseSelected:
widget.onMongoDBDatabaseSelected,
onPostgresObjectSelected:
widget.onPostgresObjectSelected,
onPostgresOpenSqlWorkspace:
widget.onPostgresOpenSqlWorkspace,
onMysqlObjectSelected: widget.onMysqlObjectSelected,
onMysqlOpenSqlWorkspace:
widget.onMysqlOpenSqlWorkspace,
onSqliteObjectSelected:
widget.onSqliteObjectSelected,
onSqliteOpenSqlWorkspace:
widget.onSqliteOpenSqlWorkspace,
onExtensionObjectSelected:
widget.onExtensionObjectSelected,
),
);

final material.Widget slotContent;
if (isCollapsed) {
slotContent = Offstage(
offstage: true,
child: TickerMode(
enabled: false,
child: slot,
),
);
} else if (contentOpacity < 1.0) {
slotContent = Opacity(
opacity: contentOpacity,
child: slot,
);
} else {
slotContent = slot;
}

final material.Widget positionedSlot =
(isCollapsed || parallaxOffset.abs() <= 0.001)
? slotContent
: Transform.translate(
offset: Offset(parallaxOffset, 0),
child: slotContent,
);

final handleWidget = IgnorePointer(
ignoring: currentW <= 20.0 || !_sidebarVisible,
child: QueryaSplitHandle(
key: const Key('main_content_resize_handle'),
axis: Axis.horizontal,
semanticsLabel:
'Resize connections and workspace panes',
onDragDelta: (dx) {
final ml = constraints.maxWidth -
_resizeHandleWidth -
_minWorkspaceWidth;
if (ml <= 0) return;
final nextW = _clampLeftWidth(
_widthSpring.value + dx,
constraints.maxWidth,
);
_lastExpandedWidth = nextW;
_widthSpring.jumpTo(nextW);
},
onDiscreteResize: () => _widthPersist
.onDiscreteResize(() => _lastExpandedWidth),
onDragEnd: (details) {
_widthPersist.cancelDiscreteTimer();
final velocity = details.primaryVelocity ??
details.velocity.pixelsPerSecond.dx;
final useSprings =
QueryaSpring.springsEnabled(context);
_widthSpring.useSprings = useSprings;
if (_widthSpring.value < 100 && velocity < -50) {
_sidebarVisible = false;
widget.onSidebarVisibilityChanged?.call(false);
_widthSpring.animateTo(0.0, velocity: velocity);
unawaited(
AppSettings.instance.setSidebarVisible(false));
} else {
_sidebarVisible = true;
widget.onSidebarVisibilityChanged?.call(true);
_lastExpandedWidth = _clampLeftWidth(
_widthSpring.value,
constraints.maxWidth,
);
_widthSpring.animateTo(
_lastExpandedWidth,
velocity: velocity,
);
unawaited(
AppSettings.instance.setSidebarVisible(true));
_schedulePersistAfterSettle();
}
},
),
);

final material.Widget handleContent;
if (handleOpacity >= 1.0) {
handleContent = handleWidget;
} else if (handleOpacity <= 0.0) {
handleContent = const material.SizedBox.shrink();
} else {
handleContent = Opacity(
opacity: handleOpacity,
child: handleWidget,
);
}

return Row(
children: [
if (!isFullyCollapsed)
ClipRect(
child: SizedBox(
width: currentW,
child: OverflowBox(
minWidth: _lastExpandedWidth,
maxWidth: _lastExpandedWidth,
alignment: Alignment.topLeft,
child: Transform.translate(
offset: Offset(parallaxOffset, 0),
child: Opacity(
opacity: contentOpacity,
child: material.RepaintBoundary(
child: _ConnectionsPanelSlot(
connectionsPanelKey: widget.connectionsPanelKey,
workspace: widget.workspace,
onConnectionSelected: widget.onConnectionSelected,
onRedisDatabaseSelected:
widget.onRedisDatabaseSelected,
onMongoDBDatabaseSelected:
widget.onMongoDBDatabaseSelected,
onPostgresObjectSelected:
widget.onPostgresObjectSelected,
onPostgresOpenSqlWorkspace:
widget.onPostgresOpenSqlWorkspace,
onMysqlObjectSelected: widget.onMysqlObjectSelected,
onMysqlOpenSqlWorkspace:
widget.onMysqlOpenSqlWorkspace,
onSqliteObjectSelected:
widget.onSqliteObjectSelected,
onSqliteOpenSqlWorkspace:
widget.onSqliteOpenSqlWorkspace,
onExtensionObjectSelected:
widget.onExtensionObjectSelected,
),
),
),
),
),
ClipRect(
child: SizedBox(
width: currentW,
child: OverflowBox(
minWidth: _lastExpandedWidth,
maxWidth: _lastExpandedWidth,
alignment: Alignment.topLeft,
child: positionedSlot,
),
),
if (!isFullyCollapsed)
),
if (!isCollapsed)
SizedBox(
width: currentHandleW,
child: ClipRect(
child: OverflowBox(
minWidth: _resizeHandleWidth,
maxWidth: _resizeHandleWidth,
alignment: Alignment.center,
child: Opacity(
opacity: handleOpacity,
child: IgnorePointer(
ignoring: currentW <= 20.0 || !_sidebarVisible,
child: QueryaSplitHandle(
key: const Key('main_content_resize_handle'),
axis: Axis.horizontal,
semanticsLabel:
'Resize connections and workspace panes',
onDragDelta: (dx) {
final ml = constraints.maxWidth -
_resizeHandleWidth -
_minWorkspaceWidth;
if (ml <= 0) return;
final nextW = _clampLeftWidth(
_widthSpring.value + dx,
constraints.maxWidth,
);
_lastExpandedWidth = nextW;
_widthSpring.jumpTo(nextW);
},
onDiscreteResize: () => _widthPersist
.onDiscreteResize(() => _lastExpandedWidth),
onDragEnd: (details) {
_widthPersist.cancelDiscreteTimer();
final velocity = details.primaryVelocity ??
details.velocity.pixelsPerSecond.dx;
final useSprings =
QueryaSpring.springsEnabled(context);
_widthSpring.useSprings = useSprings;
if (_widthSpring.value < 100 && velocity < -50) {
_sidebarVisible = false;
widget.onSidebarVisibilityChanged?.call(false);
_widthSpring.animateTo(0.0, velocity: velocity);
unawaited(
AppSettings.instance.setSidebarVisible(false));
} else {
_sidebarVisible = true;
widget.onSidebarVisibilityChanged?.call(true);
_lastExpandedWidth = _clampLeftWidth(
_widthSpring.value,
constraints.maxWidth,
);
_widthSpring.animateTo(
_lastExpandedWidth,
velocity: velocity,
);
unawaited(
AppSettings.instance.setSidebarVisible(true));
_schedulePersistAfterSettle();
}
},
),
),
),
child: handleContent,
),
),
),
Expand Down
109 changes: 109 additions & 0 deletions test/features/main_screen/sidebar_toggle_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import 'package:querya_desktop/core/motion/querya_spring_controller.dart';
import 'package:querya_desktop/core/storage/app_data_root.dart';
import 'package:querya_desktop/core/storage/app_settings.dart';
import 'package:querya_desktop/core/storage/local_db.dart';
import 'package:querya_desktop/features/connections/connections_panel.dart';
import 'package:querya_desktop/features/main_screen/main_screen.dart';
import 'package:querya_desktop/features/main_screen/querya_window_title_bar.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';

Expand Down Expand Up @@ -141,6 +143,113 @@ void main() {
expect(controller.value, closeTo(260, 0.01));
expect(controller.isAnimating, isFalse);
});

testWidgets('eliminates offscreen Opacity compositing when expanded (#900)',
(tester) async {
await tester.pumpWidget(
queryaThemeTestShell(
child: const material.SizedBox(
width: 1200,
height: 800,
child: MainScreen(),
),
),
);
await tester.pumpAndSettle();

final connectionsPanel = find.byType(ConnectionsPanel);
expect(connectionsPanel, findsOneWidget);

final repaintBoundary = find.ancestor(
of: connectionsPanel,
matching: find.byType(material.RepaintBoundary),
);
expect(repaintBoundary, findsWidgets);

final opacityAncestor = find.ancestor(
of: connectionsPanel,
matching: find.byType(material.Opacity),
);
expect(opacityAncestor, findsNothing);

final activeOffstageAncestor = find.ancestor(
of: connectionsPanel,
matching: find.byWidgetPredicate(
(w) => w is material.Offstage && w.offstage,
),
);
expect(activeOffstageAncestor, findsNothing);
});

testWidgets(
'offstages connection panel and pauses tickers when sidebar is collapsed (#900)',
(tester) async {
await tester.pumpWidget(
queryaThemeTestShell(
child: const material.SizedBox(
width: 1200,
height: 800,
child: MainScreen(),
),
),
);
await tester.pumpAndSettle();

final toggleButton =
find.byKey(const Key('title_bar_toggle_sidebar_button'));
expect(toggleButton, findsOneWidget);

await tester.tap(toggleButton);
await tester.pumpAndSettle();

final connectionsPanel =
find.byType(ConnectionsPanel, skipOffstage: false);
expect(connectionsPanel, findsOneWidget);

final offstageFinder = find.ancestor(
of: connectionsPanel,
matching: find.byWidgetPredicate(
(w) => w is material.Offstage && w.offstage,
skipOffstage: false,
),
);
expect(offstageFinder, findsOneWidget);

final tickerModeFinder = find.ancestor(
of: connectionsPanel,
matching: find.byWidgetPredicate(
(w) => w is material.TickerMode && !w.enabled,
skipOffstage: false,
),
);
expect(tickerModeFinder, findsOneWidget);

final opacityAncestor = find.ancestor(
of: connectionsPanel,
matching: find.byType(material.Opacity, skipOffstage: false),
);
expect(opacityAncestor, findsNothing);

await tester.tap(toggleButton);
await tester.pumpAndSettle();

expect(
find.ancestor(
of: find.byType(ConnectionsPanel),
matching: find.byWidgetPredicate(
(w) => w is material.Offstage && w.offstage,
),
),
findsNothing,
);
expect(
find.ancestor(
of: find.byType(ConnectionsPanel),
matching: find.byType(material.Opacity),
),
findsNothing,
);
});
});
}

Expand Down
Loading