chore(ui): Gap from the gap package; 7 files off shadcn; a ratchet on shadcn imports (#1729)

lib/app/app.dart

@@ -5,7 +5,7 @@ import 'package:querya_desktop/core/motion/querya_motion_scope.dart';
 import 'package:querya_desktop/core/motion/querya_theme_motion.dart';
 import 'package:querya_desktop/core/theme/animated_querya_theme.dart';
 import 'package:querya_desktop/core/theme/theme_controller.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 import 'app_lifecycle_cleanup.dart';
 import '../features/main_screen/main_screen.dart';

lib/core/editor/querya_code_editor.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart' as material;
 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 TextExtension;
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 import 'querya_code_language.dart';
 import 'querya_highlight_controller.dart';

lib/core/layout/querya_split_handle.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart' as material;
 import 'package:flutter/services.dart';
 import 'package:querya_desktop/core/motion/querya_motion.dart';
 import 'package:querya_desktop/core/motion/querya_motion_context.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 /// Accessible split-pane handle that supports mouse dragging and arrow keys.
 ///

lib/core/layout/vertical_split_pane.dart

@@ -1,8 +1,8 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/layout/querya_drag_settle.dart';
 import 'package:querya_desktop/core/layout/querya_split_handle.dart';
 import 'package:querya_desktop/core/motion/querya_spring.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
 
 /// Counts full rebuilds of [VerticalSplitPane]'s body (cache misses) — should
 /// only fire when the pane's height or its top/bottom/fraction/etc. inputs

lib/core/storage/app_settings.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 
 
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 import '../motion/querya_motion_scope.dart';
 import '../theme/querya_theme_preset.dart';

lib/core/theme/app_theme.dart

@@ -1,4 +1,4 @@
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 import 'querya_theme.dart';
 

lib/core/theme/parser/querya_theme_color_scheme.dart

@@ -1,7 +1,7 @@
 // ignore_for_file: deprecated_member_use
 
 import 'package:flutter/foundation.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 import '../querya_theme.dart';
 import 'color_parser.dart';

lib/core/theme/querya_color_scheme.dart

@@ -1,4 +1,4 @@
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 import 'querya_theme.dart';
 

lib/core/theme/querya_theme.dart

@@ -1,4 +1,4 @@
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 import 'color_contrast.dart';
 import 'parser/vscode_theme_manifest.dart';

lib/core/theme/theme_controller.dart

@@ -4,7 +4,7 @@ import 'dart:io';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/storage/app_settings.dart';
 import 'package:querya_desktop/core/theme/querya_material_theme.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 import 'parser/apply_token_colors_to_editor.dart';
 import 'parser/color_parser.dart';

lib/features/erd/erd_view.dart

@@ -43,7 +43,7 @@ import 'package:querya_desktop/features/erd/widgets/erd_views_menu.dart';
 import 'package:querya_desktop/features/erd/widgets/erd_table_card.dart';
 import 'package:querya_desktop/shared/widgets/app_toast.dart';
 import 'package:querya_desktop/shared/widgets/querya_spinner.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 // Moved out of this file (#1362); re-exported for existing importers.
 export 'package:querya_desktop/features/erd/widgets/erd_relation_painter.dart'

lib/features/erd/widgets/erd_edge_tip_label.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/erd/erd_model.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 /// "orders.customer_id → customers.id" next to the pointer.
 class ErdEdgeTipLabel extends material.StatelessWidget {

lib/features/erd/widgets/erd_group_frame.dart

@@ -4,7 +4,7 @@ import 'package:flutter/gestures.dart' show DragStartBehavior;
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/erd/erd_layout.dart';
 import 'package:querya_desktop/core/erd/erd_saved_layout.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 /// A group's frame on the canvas: a tinted box that takes no pointer, and its
 /// title, which drags the whole group and has the group's menu.

lib/features/erd/widgets/erd_group_menu.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/erd/erd_saved_layout.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 /// Group entries of a card's menu: group it (with the marked tables), add it
 /// to a group, take it out of its group.

lib/features/erd/widgets/erd_note_card.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/erd/erd_note_text.dart';
 import 'package:querya_desktop/core/erd/erd_saved_layout.dart';
 import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 /// A sticky note on the canvas: draggable by its body, resizable by its
 /// corner, with an edit / colour / attach / delete menu (#1283).

lib/features/erd/widgets/erd_search_panel.dart

@@ -1,9 +1,9 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/erd/erd_model.dart';
 import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
 import 'package:querya_desktop/shared/widgets/querya_search_field.dart';
 import 'package:querya_desktop/shared/widgets/querya_text.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
 
 /// Find-a-table field and the tables it matches. Enter picks the first.
 class ErdSearchPanel extends material.StatelessWidget {

lib/features/erd/widgets/erd_table_card.dart

@@ -1,10 +1,10 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/gestures.dart' show DragStartBehavior;
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/erd/erd_model.dart';
 import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
 import 'package:querya_desktop/core/theme/querya_typography.dart';
 import 'package:querya_desktop/core/erd/erd_layout.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
 
 /// A card's share of the focus: highlighted, faded, and the column of a
 /// picked relation on it, if any.

lib/features/erd/widgets/erd_table_menu.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart' as material;
 import 'package:flutter/services.dart' show Clipboard, ClipboardData;
 import 'package:querya_desktop/core/erd/erd_saved_layout.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 /// The entries of a table card's context menu.
 abstract final class ErdTableMenu {

lib/features/main_screen/querya_window_title_bar.dart

@@ -20,7 +20,8 @@ import 'package:querya_desktop/features/updater/update_dialog.dart';
 import 'package:querya_desktop/core/actions/sql_editor_actions.dart';
 import 'package:querya_desktop/shared/widgets/querya_icon_button.dart';
 import 'package:querya_desktop/shared/widgets/querya_text.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:gap/gap.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 /// Custom bitsdojo title bar styled from [QueryaThemeScope] workbench tokens.
 class QueryaWindowTitleBar extends StatelessWidget {

lib/features/mongodb/mongo_document_tree_view.dart

@@ -9,7 +9,8 @@ import 'package:querya_desktop/core/theme/querya_typography.dart';
 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:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+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';

lib/features/mongodb/mongo_documents_json_view.dart

@@ -5,7 +5,8 @@ import 'package:querya_desktop/core/editor/querya_code_language.dart';
 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:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+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';

lib/features/mongodb/mongo_documents_table_view.dart

@@ -4,7 +4,8 @@ import 'package:mongo_dart/mongo_dart.dart' show ObjectId;
 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:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+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';

lib/features/settings/preferences_controls.dart

@@ -7,7 +7,7 @@ import 'package:querya_desktop/core/layout/ui_scale.dart';
 import 'package:querya_desktop/core/storage/app_settings.dart';
 import 'package:querya_desktop/shared/widgets/querya_dropdown.dart';
 import 'package:querya_desktop/shared/widgets/querya_text.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 /// Helper / hint copy in Preferences — readable on imported themes.
 class PreferencesHint extends StatelessWidget {

lib/features/settings/theme_picker_button.dart

@@ -8,7 +8,7 @@ import 'package:querya_desktop/core/theme/querya_theme.dart';
 import 'package:querya_desktop/core/theme/theme_definition.dart';
 import 'package:querya_desktop/features/settings/theme_preview_card.dart';
 import 'package:querya_desktop/shared/widgets/querya_dropdown_tokens.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 /// Debounce delay before requesting a hover preview load.
 const Duration themePreviewDebounce = Duration(milliseconds: 120);

lib/features/updater/update_available_badge.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'dart:async' show unawaited;
 
 import 'package:flutter/material.dart' as material;
@@ -8,7 +9,6 @@ import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
 import 'package:querya_desktop/features/updater/update_controller.dart';
 import 'package:querya_desktop/features/updater/update_dialog.dart';
 import 'package:querya_desktop/shared/widgets/querya_text.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
 
 /// Soft pulse period for the update chip at Full motion (see F9 / #482).
 ///

lib/features/updater/update_changelog_view.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart' as material;
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 import 'package:querya_desktop/shared/widgets/querya_text.dart';
 
 /// Lightweight Markdown-ish renderer for GitHub release notes.

lib/features/workspace/data_grid_calc_bar.dart

@@ -3,7 +3,8 @@ import 'package:flutter/services.dart';
 import 'package:querya_desktop/core/motion/querya_animated_expand.dart';
 import 'package:querya_desktop/core/theme/querya_typography.dart';
 import 'package:querya_desktop/features/workspace/grid_selection_calc_engine.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:gap/gap.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 /// Status bar footer for Data Grid displaying live selection statistics (Count, Distinct, Sum, Avg, Median, Min, Max).
 class DataGridCalcBar extends StatelessWidget {

lib/features/workspace/data_grid_filter_bar.dart

@@ -4,7 +4,8 @@ import 'package:flutter/services.dart' show KeyDownEvent, LogicalKeyboardKey;
 import 'package:querya_desktop/core/ui/querya_control_tokens.dart';
 import 'package:querya_desktop/shared/widgets/querya_icon_button.dart';
 import 'package:querya_desktop/shared/widgets/querya_text.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:gap/gap.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 /// Kind of filter autocomplete suggestion.
 enum FilterSuggestionKind {

lib/features/workspace/data_grid_value_panel.dart

@@ -9,7 +9,8 @@ import 'package:querya_desktop/shared/widgets/querya_button.dart';
 import 'package:querya_desktop/shared/widgets/querya_dropdown.dart';
 import 'package:querya_desktop/shared/widgets/querya_icon_button.dart';
 import 'package:querya_desktop/shared/widgets/querya_text.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:gap/gap.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 import 'xml_html_formatter.dart';
 

lib/features/workspace/grid/grid_column_sizer.dart

@@ -1,6 +1,6 @@
+import 'package:flutter/widgets.dart';
 import 'dart:math' as math;
 
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
 
 /// Layout metrics for [VirtualResultGrid].
 abstract final class ResultGridMetrics {

lib/features/workspace/grid/grid_selection_manager.dart

@@ -1,6 +1,6 @@
+import 'package:flutter/widgets.dart';
 import 'dart:convert';
 
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
 
 /// Coordinate of a cell in [VirtualResultGrid].
 @immutable

lib/features/workspace/grid_cell_editor.dart

@@ -4,7 +4,7 @@ import 'package:querya_desktop/core/motion/querya_motion.dart';
 import 'package:querya_desktop/core/motion/querya_motion_context.dart';
 import 'package:querya_desktop/core/theme/querya_typography.dart';
 import 'package:querya_desktop/features/workspace/grid_data_type_validator.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 /// Active inline editor widget for a data grid cell.
 class GridCellEditor extends material.StatefulWidget {

lib/features/workspace/query_editor_tab.dart

@@ -1,9 +1,9 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart' as material
     show EdgeInsets, Padding, TextEditingController;
 import 'package:querya_desktop/core/editor/querya_code_editor.dart';
 import 'package:querya_desktop/core/editor/querya_code_language.dart';
 import 'package:querya_desktop/features/workspace/sql_editor_chrome.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
 
 class QueryEditorTab extends StatelessWidget {
   const QueryEditorTab({

lib/features/workspace/result_grid_view.dart

@@ -24,7 +24,8 @@ import 'package:querya_desktop/features/workspace/grid_cell_popover_inspector.da
 import 'package:querya_desktop/features/workspace/grid/grid_column_sizer.dart';
 import 'package:querya_desktop/features/workspace/grid/grid_selection_manager.dart';
 import 'package:querya_desktop/features/workspace/grid/grid_sorting.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:gap/gap.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 export 'package:querya_desktop/features/workspace/grid/grid_column_sizer.dart';
 export 'package:querya_desktop/features/workspace/grid/grid_selection_manager.dart';

lib/features/workspace/sql_editor_chrome.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/theme/querya_editor_theme.dart';
 import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
 import 'package:querya_desktop/core/theme/querya_workbench_theme.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, TextExtension;
 
 /// Outer chrome for SQL editors and the results under them: one rounded card
 /// with a border.

lib/shared/widgets/widgets.dart

@@ -42,4 +42,5 @@ export 'package:querya_desktop/core/motion/querya_animated_expand.dart';
 export 'package:querya_desktop/core/motion/querya_fade_slide.dart';
 export 'package:querya_desktop/core/theme/querya_theme_scope.dart'
     show QueryaThemeContext;
-export 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
+export 'package:gap/gap.dart';
+export 'package:shadcn_flutter/shadcn_flutter.dart' hide Gap, MaxGap, SliverGap, TextExtension;

pubspec.yaml

@@ -16,6 +16,8 @@ dependencies:
   crypto: ^3.0.6
   refresh_rate: ^2.0.1
   shadcn_flutter: ^0.0.52
+  # Spacing widget; shadcn_flutter re-exported it, now taken directly (#1729).
+  gap: ^3.0.1
   bitsdojo_window: ^0.1.6
   path: ^1.9.0
   path_provider: ^2.1.5