ZhuchkaTriplesix · Oct 19, 2026 · Oct 18, 2026 · Oct 19, 2026
diff --git a/...y/shadcn_flutter/lib/fonts/Geist-Bold.otf → assets/fonts/Geist-Bold.otf b/...y/shadcn_flutter/lib/fonts/Geist-Bold.otf → assets/fonts/Geist-Bold.otf
diff --git a/...arty/shadcn_flutter/lib/fonts/LICENSE.txt → assets/fonts/Geist-LICENSE.txt b/...arty/shadcn_flutter/lib/fonts/LICENSE.txt → assets/fonts/Geist-LICENSE.txt
diff --git a/.../shadcn_flutter/lib/fonts/Geist-Light.otf → assets/fonts/Geist-Light.otf b/.../shadcn_flutter/lib/fonts/Geist-Light.otf → assets/fonts/Geist-Light.otf
diff --git a/...shadcn_flutter/lib/fonts/Geist-Medium.otf → assets/fonts/Geist-Medium.otf b/...shadcn_flutter/lib/fonts/Geist-Medium.otf → assets/fonts/Geist-Medium.otf
diff --git a/...hadcn_flutter/lib/fonts/Geist-Regular.otf → assets/fonts/Geist-Regular.otf b/...hadcn_flutter/lib/fonts/Geist-Regular.otf → assets/fonts/Geist-Regular.otf
diff --git a/...adcn_flutter/lib/fonts/Geist-SemiBold.otf → assets/fonts/Geist-SemiBold.otf b/...adcn_flutter/lib/fonts/Geist-SemiBold.otf → assets/fonts/Geist-SemiBold.otf
diff --git a/benchmark/grid_perf_bench.dart b/benchmark/grid_perf_bench.dart
@@ -6,6 +6,7 @@
 //       | select (mouse-drag selection through ResultsTab, incl. stats)
 //       | dialog (open / close showAppDialog repeatedly over a busy grid)
 //       | rerun (a new result set every 400 ms, like re-running a query)
+import 'package:flutter/widgets.dart';
 import 'dart:async';
 import 'dart:developer' as developer;
 import 'dart:io';
@@ -22,7 +23,6 @@ import 'package:querya_desktop/features/workspace/data_grid_staging_buffer.dart'
 import 'package:querya_desktop/features/workspace/result_grid_view.dart';
 import 'package:querya_desktop/features/workspace/results_tab.dart';
 import 'package:querya_desktop/shared/widgets/app_dialog.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:vm_service/vm_service.dart' as vms;
 import 'package:vm_service/vm_service_io.dart' as vms_io;
 
@@ -171,7 +171,7 @@ Future<void> _run(DataGridStagingBuffer buffer) async {
           child: SizedBox(
             width: 420,
             height: 260,
-            child: Card(child: Center(child: Text('bench dialog'))),
+            child: material.Card(child: Center(child: Text('bench dialog'))),
           ),
         ),
       ));

diff --git a/docs/architecture.md b/docs/architecture.md
@@ -2,7 +2,7 @@
 
 A high-level map of the codebase for contributors. The app is a Flutter desktop
 client with a custom window frame ([bitsdojo_window](https://pub.dev/packages/bitsdojo_window))
-and [shadcn_flutter](https://pub.dev/packages/shadcn_flutter) UI components.
+and Material with the Querya UI kit (`lib/shared/`).
 
 ## Layered layout
 
@@ -61,7 +61,7 @@ MCP (`ErdCatalog`, `ErdSchema`, `ErdTableNames`) is in `core/erd/`.
 
 | Path | Responsibility |
 |------|----------------|
-| `shared/widgets/` | shadcn re-exports, `QueryaDropdown`, app dialog, shared tokens. |
+| `shared/widgets/` | `QueryaDropdown`, app dialog, shared tokens. |
 
 ## Cross-cutting systems
 

diff --git a/docs/theme.md b/docs/theme.md
@@ -59,7 +59,7 @@ flowchart TB
 |-------|---------|
 | **Workbench** | Sidebar, tabs, canvas, accents, git decoration |
 | **Editor** | SQL/JSON editor surface, selection, line numbers, syntax token hues |
-| **ColorScheme** | shadcn/Material widgets (buttons, inputs, dialogs) |
+| **Colors** (`QueryaUiColors`) | Material widgets and the UI kit (buttons, inputs, dialogs) |
 
 `ThemeController` merges layers, persists settings in `AppSettings`, and drives
 `QueryaApp` via `ListenableBuilder`.

diff --git a/docs/ui-kit.md b/docs/ui-kit.md
@@ -51,7 +51,7 @@ QueryaTextField(
 QueryaTextField(controller: _password, obscureText: true) // show / hide button
 ```
 
-`leading` / `trailing` take an icon or a small button; `framed: false` is for a field inside a frame of its own (the code editor). The barrel hides shadcn's `TextField`; `test/guards/shadcn_imports_ratchet_test.dart` rejects it anywhere in `lib/`.
+`leading` / `trailing` take an icon or a small button; `framed: false` is for a field inside a frame of its own (the code editor). `test/guards/no_shadcn_test.dart` rejects a bare `TextField(` anywhere in `lib/`.
 
 ### `QueryaIconButton` / `QueryaToolbarButton`
 
@@ -273,7 +273,7 @@ workbench keys fall back as described in [theme.md](theme.md).
 | `no_raw_material_dialogs_test.dart` | `AlertDialog` | `QueryaModalDialog`, `QueryaConfirmDialog` |
 | `no_material_dropdowns_test.dart` | `DropdownButton(FormField)`, `PopupMenuButton`, `showMenu` | `QueryaDropdown`, `QueryaActionMenu` |
 | `no_raw_progress_indicators_test.dart` | `CircularProgressIndicator` outside `QueryaSpinner` | `QueryaSpinner` |
-| `shared_does_not_import_shadcn_test.dart` | a new `package:shadcn_flutter` import in `lib/shared/` (ratchet: the allow-list only shrinks) | Flutter primitives and the kit tokens |
+| `no_shadcn_test.dart` | any `package:shadcn_flutter` import, its pubspec entry or the vendored copy (#1736) | Flutter primitives and the kit |
 
 When adding a new shared component that replaces a Material one, add a guard
 test in the same style and mention it here.
diff --git a/lib/core/editor/querya_code_editor.dart b/lib/core/editor/querya_code_editor.dart
@@ -1,9 +1,9 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/shared/widgets/querya_text_field.dart';
 import 'package:querya_desktop/core/theme/querya_editor_theme.dart';
 import 'package:querya_desktop/core/theme/querya_theme.dart';
 import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 import 'querya_code_language.dart';
 import 'querya_highlight_controller.dart';

diff --git a/lib/core/extensions/extension_command_sync.dart b/lib/core/extensions/extension_command_sync.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'dart:async';
 
 import 'package:querya_desktop/core/actions/querya_command.dart';

diff --git a/lib/core/sdui/sdui_form_builder.dart b/lib/core/sdui/sdui_form_builder.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:file_selector/file_selector.dart';
 import 'package:querya_desktop/core/sdui/sdui_form_schema.dart';

diff --git a/lib/core/theme/querya_material_theme.dart b/lib/core/theme/querya_material_theme.dart
@@ -21,9 +21,8 @@ material.ThemeData materialThemeFromQuerya(QueryaUiColors scheme) {
 
   return material.ThemeData(
     useMaterial3: true,
-    // The app text face: shadcn_flutter carries it until the fonts move (#1736).
+    // The app text face (assets/fonts).
     fontFamily: 'GeistSans',
-    package: 'shadcn_flutter',
     // Safety net: stray Material popups must not ripple.
     splashFactory: material.NoSplash.splashFactory,
     colorScheme: materialScheme,

diff --git a/lib/core/unsaved_work_guard.dart b/lib/core/unsaved_work_guard.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/unsaved_work_registry.dart';
 import 'package:querya_desktop/shared/widgets/widgets.dart';

diff --git a/lib/features/command_palette/command_match_highlight.dart b/lib/features/command_palette/command_match_highlight.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:querya_desktop/shared/widgets/widgets.dart';
 
 /// Bold/primary span for the first case-insensitive [query] hit in [text].

diff --git a/lib/features/command_palette/command_palette_dialog.dart b/lib/features/command_palette/command_palette_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:flutter/services.dart';
 import 'package:querya_desktop/core/actions/querya_command.dart';

diff --git a/lib/features/command_palette/quick_switcher_dialog.dart b/lib/features/command_palette/quick_switcher_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:flutter/services.dart';

diff --git a/lib/features/connections/connection_databases_folder.dart b/lib/features/connections/connection_databases_folder.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:flutter/services.dart'
     show Clipboard, ClipboardData, LogicalKeyboardKey;

diff --git a/lib/features/connections/connections_panel.dart b/lib/features/connections/connections_panel.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'dart:async' show Timer;
 
 import 'package:flutter/material.dart' as material

diff --git a/lib/features/connections/driver_icon.dart b/lib/features/connections/driver_icon.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'dart:io';
 
 import 'package:flutter/material.dart' as material;

diff --git a/lib/features/connections/driver_manager_dialog.dart b/lib/features/connections/driver_manager_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/theme/querya_ui_colors.dart';
 import 'package:querya_desktop/core/extensions/extension_driver_catalog.dart';

diff --git a/lib/features/connections/environment_section.dart b/lib/features/connections/environment_section.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/security/connection_environment.dart';
 import 'package:querya_desktop/shared/widgets/connection_environment_badge.dart';

diff --git a/lib/features/connections/extension_connection_form.dart b/lib/features/connections/extension_connection_form.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'dart:convert';
 import 'dart:io';
 

diff --git a/lib/features/connections/forms/connection_auth_section.dart b/lib/features/connections/forms/connection_auth_section.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/ui/querya_control_tokens.dart';
 import 'package:querya_desktop/features/connections/remove_saved_password_option.dart';

diff --git a/lib/features/connections/forms/connection_database_section.dart b/lib/features/connections/forms/connection_database_section.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/shared/widgets/widgets.dart';
 

diff --git a/lib/features/connections/forms/connection_host_port_section.dart b/lib/features/connections/forms/connection_host_port_section.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/shared/widgets/widgets.dart';
 

diff --git a/lib/features/connections/new_connection_dialog.dart b/lib/features/connections/new_connection_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'dart:math' as math;
 
 import 'package:flutter/material.dart' as material;

diff --git a/lib/features/connections/new_connection_url_dialog.dart b/lib/features/connections/new_connection_url_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/layout/window_layout.dart';
 import 'package:querya_desktop/core/storage/local_db.dart';

diff --git a/lib/features/connections/new_folder_dialog.dart b/lib/features/connections/new_folder_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/layout/window_layout.dart';
 import 'package:querya_desktop/shared/widgets/widgets.dart';

diff --git a/lib/features/connections/querya_connection_tree_row.dart b/lib/features/connections/querya_connection_tree_row.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:flutter/services.dart'
     show Clipboard, ClipboardData, LogicalKeyboardKey;

diff --git a/lib/features/connections/remove_saved_password_option.dart b/lib/features/connections/remove_saved_password_option.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/shared/widgets/widgets.dart';
 

diff --git a/lib/features/connections/sqlite_connection_form.dart b/lib/features/connections/sqlite_connection_form.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'dart:async';
 import 'package:file_selector/file_selector.dart';
 import 'package:flutter/material.dart' as material;

diff --git a/lib/features/connections/ssh_tunnel_section.dart b/lib/features/connections/ssh_tunnel_section.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:file_selector/file_selector.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/security/ssh_tunnel_config.dart';

diff --git a/lib/features/erd/erd_group_dialog.dart b/lib/features/erd/erd_group_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/layout/window_layout.dart';
 import 'package:querya_desktop/shared/widgets/widgets.dart';

diff --git a/lib/features/erd/erd_note_dialog.dart b/lib/features/erd/erd_note_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/layout/window_layout.dart';
 import 'package:querya_desktop/shared/widgets/widgets.dart';

diff --git a/lib/features/erd/erd_view_name_dialog.dart b/lib/features/erd/erd_view_name_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/layout/window_layout.dart';
 import 'package:querya_desktop/shared/widgets/widgets.dart';

diff --git a/lib/features/extensions/extension_connection_picker_dialog.dart b/lib/features/extensions/extension_connection_picker_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/layout/window_layout.dart';
 import 'package:querya_desktop/core/storage/local_db.dart';

diff --git a/lib/features/extensions/extension_driver_recovery_banner.dart b/lib/features/extensions/extension_driver_recovery_banner.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/shared/widgets/widgets.dart';
 import 'package:querya_desktop/core/ui/querya_control_tokens.dart';

diff --git a/lib/features/extensions/extension_stats_view.dart b/lib/features/extensions/extension_stats_view.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'dart:math' as math;
 
 import 'package:flutter/material.dart' as material;

diff --git a/lib/features/extensions/extension_table_toolbar.dart b/lib/features/extensions/extension_table_toolbar.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/shared/services/data_export_service.dart';
 import 'package:querya_desktop/shared/widgets/widgets.dart';

diff --git a/lib/features/extensions/extension_table_view.dart b/lib/features/extensions/extension_table_view.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'dart:async' show unawaited;
 
 import 'package:flutter/material.dart' as material;

diff --git a/lib/features/extensions/extension_workspace_home.dart b/lib/features/extensions/extension_workspace_home.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'dart:async' show unawaited;
 
 import 'package:flutter/material.dart' as material;

diff --git a/lib/features/extensions/presentation/pages/extension_manager_dialog.dart b/lib/features/extensions/presentation/pages/extension_manager_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'dart:async';
 
 import 'package:file_selector/file_selector.dart';

diff --git a/lib/features/extensions/presentation/widgets/extension_card.dart b/lib/features/extensions/presentation/widgets/extension_card.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/extensions/extension_support.dart';
 import 'package:querya_desktop/core/extensions/models/extension_manifest.dart';

diff --git a/lib/features/extensions/presentation/widgets/extension_sideload_dialog.dart b/lib/features/extensions/presentation/widgets/extension_sideload_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:path/path.dart' as p;
 import 'package:querya_desktop/shared/widgets/widgets.dart';

diff --git a/lib/features/help/about_dialog.dart b/lib/features/help/about_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:querya_desktop/core/app/external_link.dart';

diff --git a/lib/features/main_screen/main_content_split.dart b/lib/features/main_screen/main_content_split.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'dart:async';
 import 'dart:math' as math;
 import 'package:flutter/material.dart' as material;

diff --git a/lib/features/main_screen/main_screen.dart b/lib/features/main_screen/main_screen.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'dart:async';
 import 'dart:io';
 

diff --git a/lib/features/main_screen/main_screen_dialogs.dart b/lib/features/main_screen/main_screen_dialogs.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'dart:async';
 
 import 'package:querya_desktop/core/actions/sql_editor_command_bridge.dart';

diff --git a/lib/features/main_screen/safe_mode_unlock_dialog.dart b/lib/features/main_screen/safe_mode_unlock_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/security/connection_environment.dart';
 import 'package:querya_desktop/core/security/safe_mode.dart';

diff --git a/lib/features/main_screen/workspace_empty_hero.dart b/lib/features/main_screen/workspace_empty_hero.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'dart:async';
 
 import 'package:flutter/material.dart' as material;

diff --git a/lib/features/main_screen/workspace_panel.dart b/lib/features/main_screen/workspace_panel.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material
     show
         Align,

diff --git a/lib/features/mongodb/mongo_add_document_dialog.dart b/lib/features/mongodb/mongo_add_document_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/editor/querya_code_editor.dart';
 import 'package:querya_desktop/core/editor/querya_code_language.dart';

diff --git a/lib/features/mongodb/mongo_aggregation_workspace.dart b/lib/features/mongodb/mongo_aggregation_workspace.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:flutter/services.dart';
 import 'package:querya_desktop/core/theme/querya_ui_colors.dart';

diff --git a/lib/features/mongodb/mongo_collections_view.dart b/lib/features/mongodb/mongo_collections_view.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'dart:math' show min;
 
 import 'package:flutter/material.dart' as material;

diff --git a/lib/features/mongodb/mongo_create_index_dialog.dart b/lib/features/mongodb/mongo_create_index_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/database/mongodb_connection.dart';
 import 'package:querya_desktop/core/database/mongodb_service.dart';

diff --git a/lib/features/mongodb/mongo_database_dialog.dart b/lib/features/mongodb/mongo_database_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/layout/window_layout.dart';
 import 'package:querya_desktop/shared/widgets/widgets.dart';

diff --git a/lib/features/mongodb/mongo_databases_view.dart b/lib/features/mongodb/mongo_databases_view.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/theme/querya_ui_colors.dart';
 import 'package:querya_desktop/core/database/destructive_sql_detector.dart';

diff --git a/lib/features/mongodb/mongo_document_editor.dart b/lib/features/mongodb/mongo_document_editor.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'dart:async' show unawaited;
 
 import 'package:flutter/material.dart' as material;

diff --git a/lib/features/mongodb/mongo_document_tree_view.dart b/lib/features/mongodb/mongo_document_tree_view.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'dart:convert';
 
 import 'package:flutter/material.dart' as material;
@@ -12,7 +13,6 @@ import 'package:querya_desktop/features/mongodb/mongo_ejson.dart';
 import 'package:querya_desktop/features/mongodb/mongo_field_codec.dart';
 import 'package:querya_desktop/shared/widgets/app_toast.dart';
 import 'package:gap/gap.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 import 'package:querya_desktop/core/ui/querya_control_tokens.dart';
 import 'package:querya_desktop/shared/widgets/querya_button.dart';
 import 'package:querya_desktop/shared/widgets/querya_divider.dart';

diff --git a/lib/features/mongodb/mongo_documents_json_view.dart b/lib/features/mongodb/mongo_documents_json_view.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:flutter/services.dart';
 import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
@@ -7,7 +8,6 @@ import 'package:querya_desktop/core/editor/syntax_highlight_service.dart';
 import 'package:querya_desktop/features/mongodb/mongo_ejson.dart';
 import 'package:querya_desktop/shared/widgets/app_toast.dart';
 import 'package:gap/gap.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 import 'package:querya_desktop/core/ui/querya_control_tokens.dart';
 import 'package:querya_desktop/shared/widgets/querya_button.dart';
 import 'package:querya_desktop/shared/widgets/querya_text.dart';

diff --git a/lib/features/mongodb/mongo_documents_table_view.dart b/lib/features/mongodb/mongo_documents_table_view.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:flutter/services.dart';
 import 'package:mongo_dart/mongo_dart.dart' show ObjectId;
@@ -6,7 +7,6 @@ import 'package:querya_desktop/features/mongodb/mongo_ejson.dart';
 import 'package:querya_desktop/features/workspace/result_grid_view.dart';
 import 'package:querya_desktop/shared/widgets/app_toast.dart';
 import 'package:gap/gap.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 import 'package:querya_desktop/core/ui/querya_control_tokens.dart';
 import 'package:querya_desktop/shared/widgets/querya_button.dart';
 import 'package:querya_desktop/shared/widgets/querya_text.dart';
@@ -230,9 +230,12 @@ class _MongoDocumentsTableViewState extends State<MongoDocumentsTableView> {
                   ),
                 ],
               ] else ...[
-                Text('${widget.documents.length} rows · Click a row to select · Click column header to sort')
-                    .muted()
-                    .small(),
+                material.Flexible(
+                  child: Text(
+                    '${widget.documents.length} rows · Click a row to select · Click column header to sort',
+                    overflow: material.TextOverflow.ellipsis,
+                  ).muted().small(),
+                ),
               ],
             ],
           ),

diff --git a/lib/features/mongodb/mongo_documents_view.dart b/lib/features/mongodb/mongo_documents_view.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'dart:async' show unawaited;
 
 import 'package:flutter/material.dart' as material;

diff --git a/lib/features/mongodb/mongo_explorer_view.dart b/lib/features/mongodb/mongo_explorer_view.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'dart:async' show unawaited;
 
 import 'package:flutter/material.dart' as material;