From 89d7c7c3e53c8b70d91b87e023dd2dc8f0c74631 Mon Sep 17 00:00:00 2001
From: Slinetrac <realakayuki@gmail.com>
Date: Fri, 24 Oct 2025 21:48:54 +0800
Subject: [PATCH] fix(proxy): merge static and provider entries in snapshot;
 fix Virtuoso viewport height

---
 src/components/proxy/proxy-groups.tsx | 12 +++++++-----
 src/utils/proxy-snapshot.ts           |  9 ++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/components/proxy/proxy-groups.tsx b/src/components/proxy/proxy-groups.tsx
index 85c23cfc..7bf2697a 100644
--- a/src/components/proxy/proxy-groups.tsx
+++ b/src/components/proxy/proxy-groups.tsx
@@ -381,6 +381,11 @@ export const ProxyGroups = (props: Props) => {
     return Array.from(new Set(names));
   }, [renderList]);
 
+  const virtuosoHeight =
+    mode === "rule" && proxyGroupNames.length > 0
+      ? "calc(100% - 80px)"
+      : "calc(100% - 14px)";
+
   if (mode === "direct") {
     return <BaseEmpty text={t("clash_mode_direct")} />;
   }
@@ -464,10 +469,7 @@ export const ProxyGroups = (props: Props) => {
             <Virtuoso
               ref={virtuosoRef}
               style={{
-                height:
-                  mode === "rule" && proxyGroupNames.length > 0
-                    ? "calc(100% - 80px)"
-                    : "calc(100% - 14px)",
+                height: virtuosoHeight,
               }}
               totalCount={renderList.length}
               increaseViewportBy={{ top: 200, bottom: 200 }}
@@ -607,7 +609,7 @@ export const ProxyGroups = (props: Props) => {
 
       <Virtuoso
         ref={virtuosoRef}
-        style={{ height: "calc(100% - 14px)" }}
+        style={{ height: virtuosoHeight }}
         totalCount={renderList.length}
         increaseViewportBy={{ top: 200, bottom: 200 }}
         overscan={150}
diff --git a/src/utils/proxy-snapshot.ts b/src/utils/proxy-snapshot.ts
index c2c0bb6b..7fb83601 100644
--- a/src/utils/proxy-snapshot.ts
+++ b/src/utils/proxy-snapshot.ts
@@ -66,11 +66,10 @@ const parseProxyGroup = (
   const name = entry.name;
   if (!name) return null;
 
-  const rawList: unknown[] = Array.isArray(entry.proxies)
-    ? entry.proxies
-    : Array.isArray(entry.use)
-      ? entry.use
-      : [];
+  const rawList: unknown[] = [
+    ...(Array.isArray(entry.proxies) ? entry.proxies : []),
+    ...(Array.isArray(entry.use) ? entry.use : []),
+  ];
 
   const uniqueNames = Array.from(
     new Set(