Skip to content

ui(trees): tokenize sidebar header chevrons (#496) #506

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
Jul 28, 2026
Merged

ui(trees): tokenize sidebar header chevrons (#496) #506

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
6 changes: 6 additions & 0 deletions lib/core/ui/querya_icon_sizes.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ abstract final class QueryaIconSizes {
/// Expand chevron in tree rows.
static const double treeExpand = 13;

/// Expand chevron on connection / folder headers in the sidebar (#496).
static const double sidebarExpand = 16;

/// Connection-type icon / logo on sidebar header rows.
static const double sidebarConnectionIcon = 16;

/// Database / connection-level tree nodes.
static const double treeConnection = 14;

Expand Down
12 changes: 6 additions & 6 deletions lib/features/connections/connections_panel_extension.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,25 +141,25 @@ class _ExtensionConnectionTileState extends State<_ExtensionConnectionTile> {
if (_iconFilePath != null) {
iconWidget = DriverIconImage(
path: _iconFilePath!,
size: 16,
size: QueryaIconSizes.sidebarConnectionIcon,
fallbackIcon: widget.icon,
);
} else if (widget.iconAsset != null) {
iconWidget = material.Image.asset(
widget.iconAsset!,
width: 16,
height: 16,
width: QueryaIconSizes.sidebarConnectionIcon,
height: QueryaIconSizes.sidebarConnectionIcon,
fit: material.BoxFit.contain,
errorBuilder: (_, __, ___) => material.Icon(
widget.icon,
size: 16,
size: QueryaIconSizes.sidebarConnectionIcon,
color: theme.colorScheme.primary,
),
);
} else {
iconWidget = material.Icon(
widget.icon,
size: 16,
size: QueryaIconSizes.sidebarConnectionIcon,
color: theme.colorScheme.primary,
);
}
Expand All @@ -185,7 +185,7 @@ class _ExtensionConnectionTileState extends State<_ExtensionConnectionTile> {
curve: context.motionCurve(QueryaMotion.treeExpandCurve),
child: material.Icon(
QueryaIcons.expandClosed,
size: 16,
size: QueryaIconSizes.sidebarExpand,
color: theme.colorScheme.mutedForeground,
),
),
Expand Down
13 changes: 7 additions & 6 deletions lib/features/connections/connections_panel_mongo.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,17 +142,18 @@ class _MongoConnectionTileState extends State<_MongoConnectionTile> {
final iconWidget = widget.iconAsset != null
? material.Image.asset(
widget.iconAsset!,
width: 16,
height: 16,
width: QueryaIconSizes.sidebarConnectionIcon,
height: QueryaIconSizes.sidebarConnectionIcon,
fit: material.BoxFit.contain,
errorBuilder: (_, __, ___) => material.Icon(
widget.icon,
size: 16,
size: QueryaIconSizes.sidebarConnectionIcon,
color: theme.colorScheme.primary,
),
)
: material.Icon(widget.icon,
size: 16, color: theme.colorScheme.primary);
size: QueryaIconSizes.sidebarConnectionIcon,
color: theme.colorScheme.primary);

return ContextMenu(
items: [
Expand Down Expand Up @@ -200,8 +201,8 @@ class _MongoConnectionTileState extends State<_MongoConnectionTile> {
duration: context.motionDuration(QueryaMotion.treeExpand),
curve: context.motionCurve(QueryaMotion.treeExpandCurve),
child: material.Icon(
material.Icons.chevron_right_rounded,
size: 16,
QueryaIcons.expandClosed,
size: QueryaIconSizes.sidebarExpand,
color: theme.colorScheme.mutedForeground,
),
),
Expand Down
11 changes: 6 additions & 5 deletions lib/features/connections/connections_panel_mysql.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,17 +107,18 @@ class _MysqlConnectionTileState extends State<_MysqlConnectionTile> {
final iconWidget = widget.iconAsset != null
? material.Image.asset(
widget.iconAsset!,
width: 16,
height: 16,
width: QueryaIconSizes.sidebarConnectionIcon,
height: QueryaIconSizes.sidebarConnectionIcon,
fit: material.BoxFit.contain,
errorBuilder: (_, __, ___) => material.Icon(
widget.icon,
size: 16,
size: QueryaIconSizes.sidebarConnectionIcon,
color: theme.colorScheme.primary,
),
)
: material.Icon(widget.icon,
size: 16, color: theme.colorScheme.primary);
size: QueryaIconSizes.sidebarConnectionIcon,
color: theme.colorScheme.primary);

return ContextMenu(
items: [
Expand Down Expand Up @@ -166,7 +167,7 @@ class _MysqlConnectionTileState extends State<_MysqlConnectionTile> {
curve: context.motionCurve(QueryaMotion.treeExpandCurve),
child: material.Icon(
QueryaIcons.expandClosed,
size: 16,
size: QueryaIconSizes.sidebarExpand,
color: theme.colorScheme.mutedForeground,
),
),
Expand Down
13 changes: 7 additions & 6 deletions lib/features/connections/connections_panel_postgres_connection.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,18 @@ class _PostgresConnectionTileState extends State<_PostgresConnectionTile> {
final iconWidget = widget.iconAsset != null
? material.Image.asset(
widget.iconAsset!,
width: 16,
height: 16,
width: QueryaIconSizes.sidebarConnectionIcon,
height: QueryaIconSizes.sidebarConnectionIcon,
fit: material.BoxFit.contain,
errorBuilder: (_, __, ___) => material.Icon(
widget.icon,
size: 16,
size: QueryaIconSizes.sidebarConnectionIcon,
color: theme.colorScheme.primary,
),
)
: material.Icon(widget.icon,
size: 16, color: theme.colorScheme.primary);
size: QueryaIconSizes.sidebarConnectionIcon,
color: theme.colorScheme.primary);

return ContextMenu(
items: [
Expand Down Expand Up @@ -160,8 +161,8 @@ class _PostgresConnectionTileState extends State<_PostgresConnectionTile> {
duration: context.motionDuration(QueryaMotion.treeExpand),
curve: context.motionCurve(QueryaMotion.treeExpandCurve),
child: material.Icon(
material.Icons.chevron_right_rounded,
size: 16,
QueryaIcons.expandClosed,
size: QueryaIconSizes.sidebarExpand,
color: theme.colorScheme.mutedForeground,
),
),
Expand Down
13 changes: 7 additions & 6 deletions lib/features/connections/connections_panel_redis.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,17 +125,18 @@ class _RedisConnectionTileState extends State<_RedisConnectionTile> {
final iconWidget = widget.iconAsset != null
? material.Image.asset(
widget.iconAsset!,
width: 16,
height: 16,
width: QueryaIconSizes.sidebarConnectionIcon,
height: QueryaIconSizes.sidebarConnectionIcon,
fit: material.BoxFit.contain,
errorBuilder: (_, __, ___) => material.Icon(
widget.icon,
size: 16,
size: QueryaIconSizes.sidebarConnectionIcon,
color: theme.colorScheme.primary,
),
)
: material.Icon(widget.icon,
size: 16, color: theme.colorScheme.primary);
size: QueryaIconSizes.sidebarConnectionIcon,
color: theme.colorScheme.primary);

return ContextMenu(
items: [
Expand Down Expand Up @@ -177,8 +178,8 @@ class _RedisConnectionTileState extends State<_RedisConnectionTile> {
duration: context.motionDuration(QueryaMotion.treeExpand),
curve: context.motionCurve(QueryaMotion.treeExpandCurve),
child: material.Icon(
material.Icons.chevron_right_rounded,
size: 16,
QueryaIcons.expandClosed,
size: QueryaIconSizes.sidebarExpand,
color: theme.colorScheme.mutedForeground,
),
),
Expand Down
21 changes: 13 additions & 8 deletions lib/features/connections/connections_panel_sidebar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,16 +91,20 @@ class _ConnectionTile extends StatelessWidget {
final iconWidget = iconAsset != null
? material.Image.asset(
iconAsset!,
width: 16,
height: 16,
width: QueryaIconSizes.sidebarConnectionIcon,
height: QueryaIconSizes.sidebarConnectionIcon,
fit: material.BoxFit.contain,
errorBuilder: (_, __, ___) => material.Icon(
icon,
size: 16,
size: QueryaIconSizes.sidebarConnectionIcon,
color: theme.colorScheme.primary,
),
)
: material.Icon(icon, size: 16, color: theme.colorScheme.primary);
: material.Icon(
icon,
size: QueryaIconSizes.sidebarConnectionIcon,
color: theme.colorScheme.primary,
);
return ContextMenu(
items: [
MenuButton(
Expand Down Expand Up @@ -256,14 +260,15 @@ class _FolderTileState extends State<_FolderTile> {
duration: context.motionDuration(QueryaMotion.treeExpand),
curve: context.motionCurve(QueryaMotion.treeExpandCurve),
child: material.Icon(
material.Icons.chevron_right_rounded,
size: 18,
QueryaIcons.expandClosed,
size: QueryaIconSizes.sidebarExpand,
color: theme.colorScheme.mutedForeground,
),
),
const Gap(2),
material.Icon(material.Icons.folder_rounded,
size: 18, color: theme.colorScheme.primary),
material.Icon(QueryaIcons.folder,
size: QueryaIconSizes.sidebarConnectionIcon,
color: theme.colorScheme.primary),
const Gap(8),
material.Expanded(
child: material.Text(
Expand Down
11 changes: 6 additions & 5 deletions lib/features/connections/connections_panel_sqlite.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,17 +111,18 @@ class _SqliteConnectionTileState extends State<_SqliteConnectionTile> {
final iconWidget = widget.iconAsset != null
? material.Image.asset(
widget.iconAsset!,
width: 16,
height: 16,
width: QueryaIconSizes.sidebarConnectionIcon,
height: QueryaIconSizes.sidebarConnectionIcon,
fit: material.BoxFit.contain,
errorBuilder: (_, __, ___) => material.Icon(
widget.icon,
size: 16,
size: QueryaIconSizes.sidebarConnectionIcon,
color: theme.colorScheme.primary,
),
)
: material.Icon(widget.icon,
size: 16, color: theme.colorScheme.primary);
size: QueryaIconSizes.sidebarConnectionIcon,
color: theme.colorScheme.primary);

return ContextMenu(
items: [
Expand Down Expand Up @@ -173,7 +174,7 @@ class _SqliteConnectionTileState extends State<_SqliteConnectionTile> {
curve: context.motionCurve(QueryaMotion.treeExpandCurve),
child: material.Icon(
QueryaIcons.expandClosed,
size: 16,
size: QueryaIconSizes.sidebarExpand,
color: theme.colorScheme.mutedForeground,
),
),
Expand Down
12 changes: 10 additions & 2 deletions test/core/ui/querya_icons_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,16 @@ void main() {
});
});

test('tree size tokens are ordered leaf < group < sdui', () {
test('tree size tokens are ordered leaf < group < connection < sidebar', () {
expect(QueryaIconSizes.treeLeaf, lessThan(QueryaIconSizes.treeGroup));
expect(QueryaIconSizes.treeGroup, lessThan(QueryaIconSizes.sduiNode));
expect(QueryaIconSizes.treeGroup, lessThan(QueryaIconSizes.treeConnection));
expect(
QueryaIconSizes.treeExpand,
lessThan(QueryaIconSizes.sidebarExpand),
);
expect(
QueryaIconSizes.sidebarExpand,
QueryaIconSizes.sidebarConnectionIcon,
);
});
}
Loading