Fix feed tag search and prepare 2.0.1+22

lib/features/feed/presentation/feed_screen.dart

@@ -32,7 +32,7 @@ class _FeedScreenState extends ConsumerState<FeedScreen> {
   final _scrollController = ScrollController();
   final Set<String> _selectedKeys = {};
   bool _selectionMode = false;
-  bool _usedInitialQuery = false;
+  String? _appliedInitialQuery;
   Timer? _scrollSaveDebounce;
 
   @override
@@ -70,10 +70,10 @@ class _FeedScreenState extends ConsumerState<FeedScreen> {
     if (nextQuery != null &&
         nextQuery.isNotEmpty &&
         nextQuery != oldWidget.initialQuery) {
-      _usedInitialQuery = true;
+      _appliedInitialQuery = nextQuery;
       WidgetsBinding.instance.addPostFrameCallback((_) {
         if (!mounted) return;
-        ref.read(feedControllerProvider.notifier).search(nextQuery);
+        _applySearchQuery(nextQuery);
       });
     }
   }
@@ -93,10 +93,16 @@ class _FeedScreenState extends ConsumerState<FeedScreen> {
     final favoriteKeys = ref.watch(favoriteKeysProvider).value ?? <String>{};
     final viewedKeys = ref.watch(viewedKeysProvider).value ?? <String>{};
 
-    if (!_usedInitialQuery && (widget.initialQuery?.isNotEmpty ?? false)) {
-      _usedInitialQuery = true;
+    final initialQuery = widget.initialQuery?.trim();
+    final currentTags = feed.value?.selectedTags.join(' ');
+    if (initialQuery != null &&
+        initialQuery.isNotEmpty &&
+        _appliedInitialQuery != initialQuery &&
+        currentTags != initialQuery) {
+      _appliedInitialQuery = initialQuery;
       WidgetsBinding.instance.addPostFrameCallback((_) {
-        ref.read(feedControllerProvider.notifier).search(widget.initialQuery!);
+        if (!mounted) return;
+        _applySearchQuery(initialQuery);
       });
     }
 
@@ -159,17 +165,14 @@ class _FeedScreenState extends ConsumerState<FeedScreen> {
                   onSearchChanged: (query) => ref
                       .read(feedControllerProvider.notifier)
                       .updateTagSuggestions(query),
-                  onSuggestionTap: (query) =>
-                      ref.read(feedControllerProvider.notifier).search(query),
+                  onSuggestionTap: _submitSearch,
                   onTopPeriodChanged: (period) => ref
                       .read(feedControllerProvider.notifier)
                       .setTopPeriod(period),
-                  onSearch: (query) =>
-                      ref.read(feedControllerProvider.notifier).search(query),
+                  onSearch: _submitSearch,
                   onRefresh: () =>
                       ref.read(feedControllerProvider.notifier).refresh(),
-                  onClearFilters: () =>
-                      ref.read(feedControllerProvider.notifier).clearFilters(),
+                  onClearFilters: _clearFilters,
                   selectionMode: _selectionMode,
                   onToggleSelectionMode: () {
                     setState(() {
@@ -279,6 +282,35 @@ class _FeedScreenState extends ConsumerState<FeedScreen> {
     );
   }
 
+  void _submitSearch(String query) {
+    final trimmed = query.trim();
+    if (trimmed.isEmpty) {
+      _clearFilters();
+      return;
+    }
+    final location = '/?q=${Uri.encodeQueryComponent(trimmed)}';
+    if (widget.initialQuery?.trim() == trimmed) {
+      _applySearchQuery(trimmed);
+      return;
+    }
+    context.go(location);
+  }
+
+  Future<void> _applySearchQuery(String query) async {
+    await ref.read(feedControllerProvider.notifier).search(query);
+    if (_scrollController.hasClients) {
+      _scrollController.jumpTo(0);
+    }
+  }
+
+  Future<void> _clearFilters() async {
+    _appliedInitialQuery = null;
+    await ref.read(feedControllerProvider.notifier).clearFilters();
+    if (mounted && widget.initialQuery != null) {
+      context.go('/');
+    }
+  }
+
   void _toggleSelected(Post post) {
     setState(() {
       _selectionMode = true;

lib/features/post/presentation/post_details_controller.dart

@@ -3,33 +3,57 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import '../../../backend/backend.dart';
 import '../../../core/utils/result.dart';
 
+// Меняем FutureProvider на StreamProvider
 final postDetailsControllerProvider =
-    FutureProvider.family<Post?, PostDetailsArgs>((ref, args) async {
+    StreamProvider.family<Post?, PostDetailsArgs>((ref, args) async* {
+  // Правильно собираем зависимости на самом верхнем уровне (фиксим антипаттерн)
+  final providerManager = ref.watch(providerManagerProvider);
+  final cacheService = ref.watch(cacheServiceProvider);
+  final postRepository = ref.watch(postRepositoryProvider);
+
+  // Вспомогательная функция для загрузки тегов
   Future<Post?> enrich(Post? post) async {
     if (post == null) return null;
     final shouldEnrich = post.tagGroups.isEmpty ||
         (post.tagGroups.length == 1 && post.tagGroups.containsKey('general'));
     if (!shouldEnrich) return post;
-    final enriched =
-        await ref.watch(providerManagerProvider).enrichPostTags(post);
+
+    final enriched = await providerManager.enrichPostTags(post);
     if (enriched is Success<Post>) {
-      await ref.watch(cacheServiceProvider).cachePosts([enriched.data]);
+      await cacheService.cachePosts([enriched.data]);
       return enriched.data;
     }
     return post;
   }
 
-  if (args.initialPost != null) return enrich(args.initialPost);
-  final cached = await ref
-      .watch(postRepositoryProvider)
-      .getCachedPost(args.postId, args.providerId);
+  // СЦЕНАРИЙ 1: Пост уже передан из ленты (Самый частый случай)
+  if (args.initialPost != null) {
+    yield args
+        .initialPost; // МГНОВЕННО отдаем пост в UI, экран сразу рендерится!
+    final enriched = await enrich(args.initialPost);
+    yield enriched; // Чуть позже отдаем версию с загруженными тегами
+    return;
+  }
+
+  // СЦЕНАРИЙ 2: Прямой переход (например, по ссылке), проверяем локальный кэш
+  final cached =
+      await postRepository.getCachedPost(args.postId, args.providerId);
   if (cached is Success<Post?> && cached.data != null) {
-    return enrich(cached.data);
+    yield cached.data; // Нашли в кэше — сразу показываем контент
+    final enriched = await enrich(cached.data);
+    yield enriched; // Догружаем теги на фоне
+    return;
+  }
+
+  // СЦЕНАРИЙ 3: Полный фоллбэк, если вообще ничего нет — идем в сеть за самим постом
+  final remote = await providerManager.getPost(args.providerId, args.postId);
+  if (remote is Success<Post?> && remote.data != null) {
+    yield remote.data;
+    final enriched = await enrich(remote.data);
+    yield enriched;
+  } else {
+    yield null;
   }
-  final remote = await ref
-      .watch(providerManagerProvider)
-      .getPost(args.providerId, args.postId);
-  return remote is Success<Post?> ? enrich(remote.data) : null;
 });
 
 class PostDetailsArgs {