cache

Author: chen08209

lib/common/tray.dart

@@ -105,7 +105,8 @@ class Tray {
           subMenuItems.add(
             MenuItem.checkbox(
               label: proxy.name,
-              checked: trayState.selectedMap[group.name] == proxy.name,
+              checked:
+                  globalState.getSelectedProxyName(group.name) == proxy.name,
               onClick: (_) {
                 final appController = globalState.appController;
                 appController.updateCurrentSelectedMap(group.name, proxy.name);

lib/providers/generated/state.g.dart

@@ -51,7 +51,16 @@ GroupsState currentGroupsState(Ref ref) {
   final mode = ref.watch(
     patchClashConfigProvider.select((state) => state.mode),
   );
-  final groups = ref.watch(groupsProvider);
+  final groups = ref.watch(
+    groupsProvider.select(
+      (state) => state.map((item) {
+        return item.copyWith(
+          now: '',
+          all: item.all.map((proxy) => proxy.copyWith(now: '')).toList(),
+        );
+      }),
+    ),
+  );
   return GroupsState(
     value: switch (mode) {
       Mode.direct => [],
@@ -290,7 +299,7 @@ GroupsState filterGroupsState(Ref ref, String query) {
       })
       .where((group) => group.all.isNotEmpty)
       .toList();
-  return GroupsState(value: groups);
+  return currentGroups.copyWith(value: groups);
 }
 
 @riverpod
@@ -635,12 +644,15 @@ VM2<bool, bool> autoSetSystemDnsState(Ref ref) {
 }
 
 @riverpod
-VM2<int, ProxiesSortType> needUpdateGroups(Ref ref) {
+VM3<bool, int, ProxiesSortType> needUpdateGroups(Ref ref) {
+  final isProxies = ref.watch(
+    currentPageLabelProvider.select((state) => state == PageLabel.proxies),
+  );
   final sortNum = ref.watch(sortNumProvider);
   final sortType = ref.watch(
     proxiesStyleSettingProvider.select((state) => state.sortType),
   );
-  return VM2(a: sortNum, b: sortType);
+  return VM3(a: isProxies, b: sortNum, c: sortType);
 }
 
 @riverpod

lib/providers/state.dart

@@ -367,6 +367,12 @@ class GlobalState {
     );
   }
 
+  String getSelectedProxyName(String groupName) {
+    final group = appState.groups.getGroup(groupName);
+    final proxyName = config.currentProfile?.selectedMap[groupName];
+    return group?.getCurrentSelectedName(proxyName ?? '') ?? '';
+  }
+
   Future<String> setupConfig({
     required SetupState setupState,
     required ClashConfig patchConfig,

lib/state.dart

@@ -40,8 +40,10 @@ class ProxiesTabViewState extends ConsumerState<ProxiesTabView>
       }
       if (!stringListEquality.equals(prev?.a, next.a)) {
         _destroyTabController();
-        final index = next.a.indexWhere((item) => item == next.b);
-        _updateTabController(next.a.length, index);
+        final groupNames = next.a;
+        final currentGroupName = next.b;
+        final index = groupNames.indexWhere((item) => item == currentGroupName);
+        _updateTabController(groupNames.length, index);
       }
     }, fireImmediately: true);
   }
@@ -127,22 +129,22 @@ class ProxiesTabViewState extends ConsumerState<ProxiesTabView>
   }
 
   void _tabControllerListener([int? index]) {
-    int? groupIndex = index;
-    if (groupIndex == -1) {
-      return;
-    }
-    final appController = globalState.appController;
-    if (groupIndex == null) {
-      final currentIndex = _tabController?.index;
-      groupIndex = currentIndex;
-    }
-    final currentGroups = appController.getCurrentGroups();
-    if (groupIndex == null || groupIndex > currentGroups.length) {
-      return;
-    }
-    final currentGroup = currentGroups[groupIndex];
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      globalState.appController.updateCurrentGroupName(currentGroup.name);
+      int? groupIndex = index;
+      if (groupIndex == -1) {
+        return;
+      }
+      final appController = globalState.appController;
+      if (groupIndex == null) {
+        final currentIndex = _tabController?.index;
+        groupIndex = currentIndex;
+      }
+      final currentGroups = appController.getCurrentGroups();
+      if (groupIndex == null || groupIndex > currentGroups.length) {
+        return;
+      }
+      final currentGroup = currentGroups[groupIndex];
+      appController.updateCurrentGroupName(currentGroup.name);
     });
   }
 
@@ -153,8 +155,8 @@ class ProxiesTabViewState extends ConsumerState<ProxiesTabView>
   }
 
   void _updateTabController(int length, int index) {
+    _destroyTabController();
     if (length == 0) {
-      _destroyTabController();
       return;
     }
     final realIndex = index == -1 ? 0 : index;
@@ -170,26 +172,15 @@ class ProxiesTabViewState extends ConsumerState<ProxiesTabView>
   @override
   Widget build(BuildContext context) {
     ref.watch(themeSettingProvider.select((state) => state.textScale));
-    final state = ref.watch(proxiesTabStateProvider);
+    final state = ref.watch(proxiesTabStateProvider.select((state) => state));
     final groups = state.groups;
-    if (groups.isEmpty) {
+    if (groups.isEmpty || _tabController == null) {
       return NullStatus(
         illustration: ProxyEmptyIllustration(),
         label: appLocalizations.nullTip(appLocalizations.proxies),
       );
     }
-    final ProxyGroupViewKeyMap keyMap = {};
-    final children = groups.map((group) {
-      final key = GlobalObjectKey<_ProxyGroupViewState>(group.name);
-      keyMap[group.name] = key;
-      return ProxyGroupView(
-        key: key,
-        group: group,
-        columns: state.columns,
-        cardType: state.proxyCardType,
-      );
-    }).toList();
-    _keyMap = keyMap;
+    _keyMap = {};
     return Column(
       mainAxisAlignment: MainAxisAlignment.start,
       crossAxisAlignment: CrossAxisAlignment.start,
@@ -245,15 +236,29 @@ class ProxiesTabViewState extends ConsumerState<ProxiesTabView>
                     context.colorScheme.surface.opacity10,
                     context.colorScheme.surface,
                   ],
-                  stops: const [0.0, 0.1],
+                  stops: const [0.0, 0.5],
                 ),
               ),
               child: _buildMoreButton(),
             ),
           ),
         ),
         Expanded(
-          child: TabBarView(controller: _tabController, children: children),
+          child: TabBarView(
+            controller: _tabController,
+            children: [
+              for (final group in groups)
+                ProxyGroupView(
+                  key: _keyMap.updateCacheValue(
+                    group.name,
+                    () => GlobalObjectKey<_ProxyGroupViewState>(group.name),
+                  ),
+                  group: group,
+                  columns: state.columns,
+                  cardType: state.proxyCardType,
+                ),
+            ],
+          ),
         ),
       ],
     );