From 0dd5710488647ba20852660a4f501795c3fe5937 Mon Sep 17 00:00:00 2001
From: Fabian Freund <github@fabi.online>
Date: Sun, 1 Feb 2026 11:45:11 +0100
Subject: [PATCH] improve icon caching for widgets

---
 .../features/browser/domain/providers.dart      |  8 +++++---
 .../features/browser/domain/providers.g.dart    |  2 +-
 .../widgets/browser_modules/bottom_app_bar.dart | 17 ++++++++++++++---
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/lib/features/geckoview/features/browser/domain/providers.dart b/app/lib/features/geckoview/features/browser/domain/providers.dart
index 7baf5241..9fe7c486 100644
--- a/app/lib/features/geckoview/features/browser/domain/providers.dart
+++ b/app/lib/features/geckoview/features/browser/domain/providers.dart
@@ -360,12 +360,14 @@ EquatableValue<List<TabPreview>> filteredTabPreviews(
     tabSearchResults.results
         .where((tab) => availableTabStates.value.containsKey(tab.id))
         .map((tab) {
+          final tabState = availableTabStates.value[tab.id]!;
+
           return TabPreview(
             id: tab.id,
             containerId: tab.containerId,
-            title: tab.title ?? availableTabStates.value[tab.id]!.title,
-            icon: null,
-            url: tab.cleanUrl ?? availableTabStates.value[tab.id]!.url,
+            title: tab.title ?? tabState.title,
+            icon: tabState.icon,
+            url: tab.cleanUrl ?? tabState.url,
             highlightedUrl: tab.url,
             extractedContent: tab.extractedContent,
             fullContent: tab.fullContent,
diff --git a/app/lib/features/geckoview/features/browser/domain/providers.g.dart b/app/lib/features/geckoview/features/browser/domain/providers.g.dart
index c914398f..c25a7d9b 100644
--- a/app/lib/features/geckoview/features/browser/domain/providers.g.dart
+++ b/app/lib/features/geckoview/features/browser/domain/providers.g.dart
@@ -763,7 +763,7 @@ final class FilteredTabPreviewsProvider
 }
 
 String _$filteredTabPreviewsHash() =>
-    r'225d67663d70aa0ad2a5544b75bfe7d6125edb58';
+    r'2327ad86650b3baa6b9339e280abfc7463c72cf9';
 
 final class FilteredTabPreviewsFamily extends $Family
     with
diff --git a/app/lib/features/geckoview/features/browser/presentation/widgets/browser_modules/bottom_app_bar.dart b/app/lib/features/geckoview/features/browser/presentation/widgets/browser_modules/bottom_app_bar.dart
index 1c882013..07b87da1 100644
--- a/app/lib/features/geckoview/features/browser/presentation/widgets/browser_modules/bottom_app_bar.dart
+++ b/app/lib/features/geckoview/features/browser/presentation/widgets/browser_modules/bottom_app_bar.dart
@@ -23,10 +23,12 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_material_design_icons/flutter_material_design_icons.dart';
 import 'package:flutter_mozilla_components/flutter_mozilla_components.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:nullability/nullability.dart';
 import 'package:weblibre/core/design/app_colors.dart';
 import 'package:weblibre/core/routing/routes.dart';
 import 'package:weblibre/features/geckoview/domain/controllers/bottom_sheet.dart';
 import 'package:weblibre/features/geckoview/domain/entities/states/readerable.dart';
+import 'package:weblibre/features/geckoview/domain/entities/states/tab.dart';
 import 'package:weblibre/features/geckoview/domain/providers/selected_tab.dart';
 import 'package:weblibre/features/geckoview/domain/providers/tab_state.dart';
 import 'package:weblibre/features/geckoview/domain/repositories/tab.dart';
@@ -387,6 +389,7 @@ typedef _QuickTabItem = ({
   bool isHistory,
   String title,
   Uri url,
+  TabState? tabState,
 });
 
 class ContextualToolbar extends HookConsumerWidget {
@@ -517,7 +520,13 @@ class QuickTabSwitcher extends HookConsumerWidget {
               ],
             );
           },
-          itemAvatar: (item) => UrlIcon([item.url], iconSize: 16),
+          itemAvatar: (item) =>
+              item.tabState?.icon.mapNotNull(
+                (icon) => icon.value.mapNotNull(
+                  (image) => RawImage(image: image, height: 24, width: 24),
+                ),
+              ) ??
+              UrlIcon([item.url], iconSize: 16),
           itemBackgroundColor: (item) =>
               item.color != null ? ContainerColors.forChip(item.color!) : null,
           onSelected: (item) async {
@@ -561,7 +570,7 @@ class QuickTabSwitcher extends HookConsumerWidget {
             );
           },
           availableItems: tabStates
-              .map(
+              .map<_QuickTabItem>(
                 (state) => (
                   id: state.$1.id,
                   title: state.$1.titleOrAuthority,
@@ -569,10 +578,11 @@ class QuickTabSwitcher extends HookConsumerWidget {
                   isHistory: false,
                   url: state.$1.url,
                   color: state.$2?.color,
+                  tabState: state.$1,
                 ),
               )
               .followedBy(
-                (historyAsync.data ?? []).map((state) {
+                (historyAsync.data ?? []).map<_QuickTabItem>((state) {
                   final url = Uri.parse(state.url);
 
                   return (
@@ -582,6 +592,7 @@ class QuickTabSwitcher extends HookConsumerWidget {
                     isHistory: true,
                     url: url,
                     color: null,
+                    tabState: null,
                   );
                 }),
               ),