retry and report Frigate+ connection failures at startup

A Frigate+ model that wasn't cached yet needed api.frigate.video at startup, and when it couldn't be reached (a network that comes up late, a DNS blip) the requests ConnectionError wasn't a validation error, so Frigate crashed with a traceback before it could start. PlusApi requests now go through a session that retries connection failures for about 30 seconds, and a connection failure that outlasts that is raised as a ValueError so it shows up as a clear config validation error instead.

frigate/detectors/detector_config.py

@@ -186,15 +186,28 @@ class ModelConfig(BaseModel):
 
         # download the model if it doesn't exist
         if not os.path.isfile(self.path):
-            download_url = plus_api.get_model_download_url(model_id)
-            r = requests.get(download_url)
+            try:
+                download_url = plus_api.get_model_download_url(model_id)
+                r = requests.get(download_url)
+            except requests.exceptions.ConnectionError as e:
+                raise ValueError(
+                    f"Unable to connect to Frigate+ to download model {model_id}"
+                ) from e
+
             with open(self.path, "wb") as f:
                 f.write(r.content)
 
         # download the model info if it doesn't exist
         if not os.path.isfile(model_info_path):
+            try:
+                model_info = plus_api.get_model_info(model_id)
+            except requests.exceptions.ConnectionError as e:
+                raise ValueError(
+                    f"Unable to connect to Frigate+ to download model info for {model_id}"
+                ) from e
+
             with open(model_info_path, "w") as f:
-                json.dump(plus_api.get_model_info(model_id), f)
+                json.dump(model_info, f)
 
         model_info = load_plus_model_info(model_id)
 

frigate/plus.py

@@ -9,7 +9,9 @@ from typing import Any
 import cv2
 import requests
 from numpy import ndarray
+from requests.adapters import HTTPAdapter
 from requests.models import Response
+from urllib3.util.retry import Retry
 
 from frigate.const import MODEL_CACHE_DIR, PLUS_API_HOST, PLUS_ENV_VAR
 
@@ -101,6 +103,13 @@ class PlusApi:
         self._is_active: bool = self.key is not None
         self._token_data: dict = {}
 
+        # Retry connection failures so a network that comes up late at startup
+        # doesn't fail the Frigate+ model download
+        self._session = requests.Session()
+        self._session.mount(
+            self.host, HTTPAdapter(max_retries=Retry(connect=5, backoff_factor=1))
+        )
+
     def _refresh_token_if_needed(self) -> None:
         if (
             self._token_data.get("expires") is None
@@ -111,7 +120,9 @@ class PlusApi:
                     "Plus API key not set. See https://docs.frigate.video/integrations/plus#set-your-api-key"
                 )
             parts = self.key.split(":")
-            r = requests.get(f"{self.host}/v1/auth/token", auth=(parts[0], parts[1]))
+            r = self._session.get(
+                f"{self.host}/v1/auth/token", auth=(parts[0], parts[1])
+            )
             if not r.ok:
                 raise Exception(f"Unable to refresh API token: {r.text}")
             self._token_data = r.json()
@@ -121,19 +132,19 @@ class PlusApi:
         return {"authorization": f"Bearer {self._token_data.get('accessToken')}"}
 
     def _get(self, path: str) -> Response:
-        return requests.get(
+        return self._session.get(
             f"{self.host}/v1/{path}", headers=self._get_authorization_header()
         )
 
     def _post(self, path: str, data: dict) -> Response:
-        return requests.post(
+        return self._session.post(
             f"{self.host}/v1/{path}",
             headers=self._get_authorization_header(),
             json=data,
         )
 
     def _put(self, path: str, data: dict) -> Response:
-        return requests.put(
+        return self._session.put(
             f"{self.host}/v1/{path}",
             headers=self._get_authorization_header(),
             json=data,

frigate/test/test_config.py

@@ -6,6 +6,7 @@ from copy import deepcopy
 from unittest.mock import patch
 
 import numpy as np
+import requests
 from pydantic import ValidationError
 from ruamel.yaml.constructor import DuplicateKeyError
 
@@ -1595,6 +1596,31 @@ class TestConfig(unittest.TestCase):
         frigate_config = FrigateConfig(**config)
         assert frigate_config.primary_model.merged_labelmap[0] == "amazon"
 
+    @patch(
+        "frigate.plus.PlusApi.get_model_download_url",
+        side_effect=requests.exceptions.ConnectionError,
+    )
+    def test_plus_unreachable_is_validation_error(self, _):
+        config = {
+            "mqtt": {"host": "mqtt"},
+            "models": [{"path": "plus://unreachable", "devices": ["cpu"]}],
+            "cameras": {
+                "back": {
+                    "ffmpeg": {
+                        "inputs": [
+                            {
+                                "path": "rtsp://10.0.0.1:554/video",
+                                "roles": ["detect"],
+                            },
+                        ]
+                    },
+                }
+            },
+        }
+
+        with self.assertRaisesRegex(ValidationError, "Unable to connect to Frigate+"):
+            FrigateConfig(**config)
+
     def test_fails_on_invalid_role(self):
         config = {
             "mqtt": {"host": "mqtt"},

web/e2e/helpers/system-tabs.ts

@@ -1,11 +0,0 @@
-import type { FrigateApp } from "../fixtures/frigate-test";
-
-// On mobile the System tabs sit in an OverflowStrip, which keeps an inert copy
-// of every tab for measurement and hides the ones that do not fit behind a
-// kebab. The selected tab always stays in the strip.
-
-export function systemTab(frigateApp: FrigateApp, name: string) {
-  return frigateApp.page
-    .locator(`[aria-label="Select ${name}" i]:not([inert] *)`)
-    .first();
-}

web/e2e/specs/auth.spec.ts

@@ -7,13 +7,12 @@
  */
 
 import { test, expect } from "../fixtures/frigate-test";
-import { systemTab } from "../helpers/system-tabs";
 import { viewerProfile } from "../fixtures/mock-data/profile";
 
 test.describe("Auth — admin access @high", () => {
   test("admin /system renders general tab", async ({ frigateApp }) => {
     await frigateApp.goto("/system");
-    await expect(systemTab(frigateApp, "general")).toBeVisible({
+    await expect(frigateApp.page.getByLabel("Select general")).toBeVisible({
       timeout: 15_000,
     });
   });
@@ -29,7 +28,7 @@ test.describe("Auth — admin access @high", () => {
 
   test("admin /logs renders frigate tab", async ({ frigateApp }) => {
     await frigateApp.goto("/logs");
-    await expect(systemTab(frigateApp, "frigate")).toBeVisible({
+    await expect(frigateApp.page.getByLabel("Select frigate")).toBeVisible({
       timeout: 5_000,
     });
   });

web/e2e/specs/live.spec.ts

@@ -287,22 +287,3 @@ test.describe("Live mobile layout @critical @mobile", () => {
     await expect(frigateApp.page.locator("body")).toBeVisible();
   });
 });
-
-test.describe("Live camera groups @medium", () => {
-  test("a group with an invalid icon renders a fallback icon", async ({
-    frigateApp,
-  }) => {
-    await frigateApp.installDefaults({
-      config: {
-        camera_groups: {
-          outdoor: { cameras: ["front_door"], icon: "generic" },
-        },
-      },
-    });
-    await frigateApp.goto("/");
-    const group = frigateApp.page
-      .locator('[aria-label="Camera Groups"]:not([inert] *)')
-      .first();
-    await expect(group.locator("svg")).toBeVisible({ timeout: 10_000 });
-  });
-});

web/e2e/specs/system-health.spec.ts

@@ -6,7 +6,6 @@
  */
 
 import { test, expect } from "../fixtures/frigate-test";
-import { systemTab } from "../helpers/system-tabs";
 import { viewerProfile } from "../fixtures/mock-data/profile";
 
 const NOW = Math.floor(Date.now() / 1000);
@@ -56,7 +55,7 @@ test.describe("System — Health tab @medium", () => {
     });
     await frigateApp.goto("/system");
 
-    await expect(systemTab(frigateApp, "health")).toHaveAttribute(
+    await expect(frigateApp.page.getByLabel("Select health")).toHaveAttribute(
       "data-state",
       "on",
       { timeout: 15_000 },
@@ -802,7 +801,7 @@ test.describe("System — Health notices sources @medium", () => {
       stats: QUIET_STATS,
     });
     await frigateApp.goto("/system#health");
-    await expect(systemTab(frigateApp, "health")).toHaveAttribute(
+    await expect(frigateApp.page.getByLabel("Select health")).toHaveAttribute(
       "data-state",
       "on",
       { timeout: 15_000 },

web/e2e/specs/system.spec.ts

@@ -6,66 +6,42 @@
  * RestartDialog cancel flow.
  */
 
-import { test, expect, FrigateApp } from "../fixtures/frigate-test";
+import { test, expect } from "../fixtures/frigate-test";
 import {
   expectBodyInteractive,
   waitForBodyInteractive,
 } from "../helpers/overlay-interaction";
-import { systemTab } from "../helpers/system-tabs";
-
-async function selectTab(frigateApp: FrigateApp, name: string) {
-  const kebab = frigateApp.page.getByLabel("Show all tabs");
-
-  if (frigateApp.isMobile && (await kebab.isVisible())) {
-    await kebab.click();
-    await frigateApp.page
-      .locator(`[aria-label="Select ${name}" i]:not([inert] *)`)
-      .last()
-      .click();
-    return;
-  }
-
-  await systemTab(frigateApp, name).click();
-}
-
-async function expectTabActive(frigateApp: FrigateApp, name: string) {
-  await expect(systemTab(frigateApp, name)).toHaveAttribute(
-    "data-state",
-    "on",
-    {
-      timeout: 5_000,
-    },
-  );
-}
 
 test.describe("System — tabs @medium", () => {
   test("general tab is active by default via #general hash", async ({
     frigateApp,
   }) => {
     await frigateApp.goto("/system#general");
-    await expect(systemTab(frigateApp, "general")).toHaveAttribute(
+    await expect(frigateApp.page.getByLabel("Select general")).toHaveAttribute(
       "data-state",
       "on",
       { timeout: 15_000 },
     );
-    if (!frigateApp.isMobile) {
-      await expect(systemTab(frigateApp, "storage")).toBeVisible();
-      await expect(systemTab(frigateApp, "cameras")).toBeVisible();
-    }
+    await expect(frigateApp.page.getByLabel("Select storage")).toBeVisible();
+    await expect(frigateApp.page.getByLabel("Select cameras")).toBeVisible();
   });
 
   test("Storage tab activates and deactivates General", async ({
     frigateApp,
   }) => {
     await frigateApp.goto("/system#general");
-    await expect(systemTab(frigateApp, "general")).toHaveAttribute(
+    await expect(frigateApp.page.getByLabel("Select general")).toHaveAttribute(
       "data-state",
       "on",
       { timeout: 15_000 },
     );
-    await selectTab(frigateApp, "storage");
-    await expectTabActive(frigateApp, "storage");
-    await expect(systemTab(frigateApp, "general")).toHaveAttribute(
+    await frigateApp.page.getByLabel("Select storage").click();
+    await expect(frigateApp.page.getByLabel("Select storage")).toHaveAttribute(
+      "data-state",
+      "on",
+      { timeout: 5_000 },
+    );
+    await expect(frigateApp.page.getByLabel("Select general")).toHaveAttribute(
       "data-state",
       "off",
     );
@@ -73,20 +49,24 @@ test.describe("System — tabs @medium", () => {
 
   test("Cameras tab activates", async ({ frigateApp }) => {
     await frigateApp.goto("/system#general");
-    await expect(systemTab(frigateApp, "general")).toHaveAttribute(
+    await expect(frigateApp.page.getByLabel("Select general")).toHaveAttribute(
       "data-state",
       "on",
       { timeout: 15_000 },
     );
-    await selectTab(frigateApp, "cameras");
-    await expectTabActive(frigateApp, "cameras");
+    await frigateApp.page.getByLabel("Select cameras").click();
+    await expect(frigateApp.page.getByLabel("Select cameras")).toHaveAttribute(
+      "data-state",
+      "on",
+      { timeout: 5_000 },
+    );
   });
 
   test("general tab shows version and last-refreshed", async ({
     frigateApp,
   }) => {
     await frigateApp.goto("/system#general");
-    await expect(systemTab(frigateApp, "general")).toHaveAttribute(
+    await expect(frigateApp.page.getByLabel("Select general")).toHaveAttribute(
       "data-state",
       "on",
       { timeout: 15_000 },
@@ -107,13 +87,17 @@ test.describe("System — tabs @medium", () => {
     frigateApp,
   }) => {
     await frigateApp.goto("/system#general");
-    await expect(systemTab(frigateApp, "general")).toHaveAttribute(
+    await expect(frigateApp.page.getByLabel("Select general")).toHaveAttribute(
       "data-state",
       "on",
       { timeout: 15_000 },
     );
-    await selectTab(frigateApp, "storage");
-    await expectTabActive(frigateApp, "storage");
+    await frigateApp.page.getByLabel("Select storage").click();
+    await expect(frigateApp.page.getByLabel("Select storage")).toHaveAttribute(
+      "data-state",
+      "on",
+      { timeout: 5_000 },
+    );
     // On desktop, tab buttons render text labels so the word "storage"
     // always appears in #pageRoot after switching. On mobile, tabs are
     // icon-only, so we verify the general-tab content disappears instead
@@ -128,23 +112,25 @@ test.describe("System — tabs @medium", () => {
     } else {
       // Mobile: tab activation (data-state "on") already asserted above.
       // Additionally confirm general tab is no longer the active tab.
-      await expect(systemTab(frigateApp, "general")).toHaveAttribute(
-        "data-state",
-        "off",
-        { timeout: 5_000 },
-      );
+      await expect(
+        frigateApp.page.getByLabel("Select general"),
+      ).toHaveAttribute("data-state", "off", { timeout: 5_000 });
     }
   });
 
   test("cameras tab renders each configured camera", async ({ frigateApp }) => {
     await frigateApp.goto("/system#general");
-    await expect(systemTab(frigateApp, "general")).toHaveAttribute(
+    await expect(frigateApp.page.getByLabel("Select general")).toHaveAttribute(
       "data-state",
       "on",
       { timeout: 15_000 },
     );
-    await selectTab(frigateApp, "cameras");
-    await expectTabActive(frigateApp, "cameras");
+    await frigateApp.page.getByLabel("Select cameras").click();
+    await expect(frigateApp.page.getByLabel("Select cameras")).toHaveAttribute(
+      "data-state",
+      "on",
+      { timeout: 5_000 },
+    );
     // Cameras tab lists every camera from config/stats. The default
     // mock has front_door, backyard, garage.
     for (const cam of ["front_door", "backyard", "garage"]) {
@@ -165,13 +151,17 @@ test.describe("System — tabs @medium", () => {
       config: { semantic_search: { enabled: true } },
     });
     await frigateApp.goto("/system#general");
-    await expect(systemTab(frigateApp, "general")).toHaveAttribute(
+    await expect(frigateApp.page.getByLabel("Select general")).toHaveAttribute(
       "data-state",
       "on",
       { timeout: 15_000 },
     );
-    await selectTab(frigateApp, "enrichments");
-    await expectTabActive(frigateApp, "enrichments");
+    const enrichTab = frigateApp.page.getByLabel(/select enrichments/i).first();
+    await expect(enrichTab).toBeVisible({ timeout: 5_000 });
+    await enrichTab.click();
+    await expect(enrichTab).toHaveAttribute("data-state", "on", {
+      timeout: 5_000,
+    });
   });
 });
 
@@ -233,27 +223,31 @@ test.describe("System — mobile @medium @mobile", () => {
 
   test("tabs render at mobile viewport", async ({ frigateApp }) => {
     await frigateApp.goto("/system#general");
-    await expect(systemTab(frigateApp, "general")).toBeVisible({
+    await expect(frigateApp.page.getByLabel("Select general")).toBeVisible({
       timeout: 15_000,
     });
   });
 
   test("switching tabs works at mobile viewport", async ({ frigateApp }) => {
     await frigateApp.goto("/system#general");
-    await expect(systemTab(frigateApp, "general")).toHaveAttribute(
+    await expect(frigateApp.page.getByLabel("Select general")).toHaveAttribute(
       "data-state",
       "on",
       { timeout: 15_000 },
     );
-    await selectTab(frigateApp, "storage");
-    await expectTabActive(frigateApp, "storage");
+    await frigateApp.page.getByLabel("Select storage").click();
+    await expect(frigateApp.page.getByLabel("Select storage")).toHaveAttribute(
+      "data-state",
+      "on",
+      { timeout: 5_000 },
+    );
   });
 
   test("header controls leave the logo uncovered on a narrow phone", async ({
     frigateApp,
   }) => {
     await frigateApp.goto("/system#general");
-    await expect(systemTab(frigateApp, "general")).toHaveAttribute(
+    await expect(frigateApp.page.getByLabel("Select general")).toHaveAttribute(
       "data-state",
       "on",
       { timeout: 15_000 },
@@ -261,9 +255,9 @@ test.describe("System — mobile @medium @mobile", () => {
     await frigateApp.page.setViewportSize({ width: 320, height: 740 });
 
     const logo = frigateApp.page.locator("svg.fill-current").first();
-    const kebab = frigateApp.page.getByLabel("Show all tabs");
-    await expect(kebab).toBeVisible();
-    const tabs = kebab.locator("..");
+    const tabs = frigateApp.page
+      .locator("[data-radix-scroll-area-viewport]")
+      .filter({ has: frigateApp.page.getByLabel("Select general") });
     const refreshed = frigateApp.page.getByText(/Just now|ago/);
 
     const logoBox = await logo.boundingBox();
@@ -273,9 +267,20 @@ test.describe("System — mobile @medium @mobile", () => {
     expect(tabsBox!.x + tabsBox!.width).toBeLessThanOrEqual(logoBox!.x + 1);
     expect(refreshedBox!.x).toBeGreaterThanOrEqual(logoBox!.x + logoBox!.width);
 
-    // the tabs that do not fit stay reachable through the kebab
-    await selectTab(frigateApp, "cameras");
-    await expectTabActive(frigateApp, "cameras");
-    await expect(frigateApp.page.getByLabel("Show less")).toHaveCount(0);
+    // the clipped tabs stay reachable by scrolling
+    const overflow = await tabs.evaluate((el) => ({
+      scroll: el.scrollWidth,
+      client: el.clientWidth,
+    }));
+    expect(overflow.scroll).toBeGreaterThan(overflow.client);
+    await tabs.evaluate((el) => {
+      el.scrollLeft = el.scrollWidth;
+    });
+    await frigateApp.page.getByLabel("Select cameras").click();
+    await expect(frigateApp.page.getByLabel("Select cameras")).toHaveAttribute(
+      "data-state",
+      "on",
+      { timeout: 5_000 },
+    );
   });
 });

web/public/locales/en/views/system.json

@@ -14,8 +14,6 @@
   },
   "title": "System",
   "metrics": "System metrics",
-  "showAllTabs": "Show all tabs",
-  "showLessTabs": "Show less",
   "health": {
     "title": "Health",
     "notices": {

web/src/components/filter/CameraGroupSelector.tsx

@@ -8,8 +8,18 @@ import { isDesktop, isMobile } from "react-device-detect";
 import useSWR from "swr";
 import { MdHome } from "react-icons/md";
 import { Button, buttonVariants } from "../ui/button";
-import { useCallback, useContext, useEffect, useMemo, useState } from "react";
-import OverflowStrip from "../mobile/OverflowStrip";
+import {
+  useCallback,
+  useContext,
+  useEffect,
+  useLayoutEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+import { AnimatePresence, motion } from "framer-motion";
+import { HiDotsHorizontal } from "react-icons/hi";
+import { IoClose } from "react-icons/io5";
 import { Tooltip, TooltipContent, TooltipTrigger } from "../ui/tooltip";
 import { LuPencil, LuPlus } from "react-icons/lu";
 import {
@@ -146,7 +156,80 @@ export function CameraGroupSelector({ className }: CameraGroupSelectorProps) {
 
   const [addGroup, setAddGroup] = useState(false);
 
-  const groupButtons = () => {
+  // mobile overflow reveal - the group strip sits left of the logo and is
+  // clipped (not scrollable) when there are too many groups, so render only
+  // the buttons that fully fit and surface a kebab next to the last visible
+  // one that expands a panel revealing all of them
+
+  const [expanded, setExpanded] = useState(false);
+  // null => all buttons fit, render them all with no kebab; a number => only
+  // that many fit alongside the kebab
+  const [visibleCount, setVisibleCount] = useState<number | null>(null);
+  const wrapperRef = useRef<HTMLDivElement | null>(null);
+  const measureRef = useRef<HTMLDivElement | null>(null);
+
+  useLayoutEffect(() => {
+    if (isDesktop) {
+      return;
+    }
+
+    const wrapper = wrapperRef.current;
+    const measure = measureRef.current;
+
+    if (!wrapper || !measure) {
+      return;
+    }
+
+    const gap = 8; // gap-2 between buttons in the strip
+    const wrapperGap = 4; // gap-1 between the strip and the kebab
+
+    const compute = () => {
+      const buttons = Array.from(measure.children) as HTMLElement[];
+
+      if (buttons.length === 0) {
+        return;
+      }
+
+      // the trailing child of the measurement row is a kebab clone
+      const kebab = buttons[buttons.length - 1];
+      const groupButtons = buttons.slice(0, -1);
+      const available = wrapper.clientWidth;
+      const fullWidth =
+        groupButtons.reduce((sum, el) => sum + el.offsetWidth, 0) +
+        Math.max(groupButtons.length - 1, 0) * gap;
+
+      if (fullWidth <= available) {
+        setVisibleCount(null);
+        return;
+      }
+
+      const budget = available - kebab.offsetWidth - wrapperGap;
+      let used = 0;
+      let count = 0;
+
+      for (const el of groupButtons) {
+        const next = (count === 0 ? 0 : gap) + el.offsetWidth;
+
+        if (used + next <= budget) {
+          used += next;
+          count += 1;
+        } else {
+          break;
+        }
+      }
+
+      setVisibleCount(Math.max(count, 1));
+    };
+
+    compute();
+
+    const observer = new ResizeObserver(compute);
+    observer.observe(wrapper);
+
+    return () => observer.disconnect();
+  }, [groups, isAdmin]);
+
+  const groupButtons = (afterSelect?: () => void) => {
     const buttons = [
       <Button
         key="default-group"
@@ -162,6 +245,7 @@ export function CameraGroupSelector({ className }: CameraGroupSelectorProps) {
           if (group) {
             setGroup("default", true);
           }
+          afterSelect?.();
         }}
       >
         <MdHome className="size-5" />
@@ -179,16 +263,12 @@ export function CameraGroupSelector({ className }: CameraGroupSelectorProps) {
           size="sm"
           onClick={() => {
             setGroup(name, group != "default");
+            afterSelect?.();
           }}
         >
-          <IconRenderer
-            icon={
-              isValidIconName(config.icon)
-                ? LuIcons[config.icon]
-                : LuIcons.LuFolder
-            }
-            className="size-5"
-          />
+          {config && config.icon && isValidIconName(config.icon) && (
+            <IconRenderer icon={LuIcons[config.icon]} className="size-5" />
+          )}
         </Button>
       )),
     ];
@@ -202,6 +282,7 @@ export function CameraGroupSelector({ className }: CameraGroupSelectorProps) {
           size="sm"
           onClick={() => {
             setAddGroup(true);
+            afterSelect?.();
           }}
         >
           <LuPencil className="size-5 text-primary-variant" />
@@ -269,14 +350,12 @@ export function CameraGroupSelector({ className }: CameraGroupSelectorProps) {
                     onMouseEnter={() => showTooltip(name)}
                     onMouseLeave={() => showTooltip(undefined)}
                   >
-                    <IconRenderer
-                      icon={
-                        isValidIconName(config.icon)
-                          ? LuIcons[config.icon]
-                          : LuIcons.LuFolder
-                      }
-                      className="size-4"
-                    />
+                    {config && config.icon && isValidIconName(config.icon) && (
+                      <IconRenderer
+                        icon={LuIcons[config.icon]}
+                        className="size-4"
+                      />
+                    )}
                   </Button>
                 </TooltipTrigger>
                 <TooltipPortal>
@@ -311,13 +390,74 @@ export function CameraGroupSelector({ className }: CameraGroupSelectorProps) {
           )}
         </div>
       ) : (
-        <OverflowStrip
-          className={className}
-          items={groupButtons()}
-          activeIndex={groups.findIndex(([name]) => name == group) + 1}
-          showAllLabel={t("group.showAll")}
-          showLessLabel={t("group.showLess")}
-        />
+        <div
+          ref={wrapperRef}
+          className={cn("flex min-w-0 items-center gap-1", className)}
+        >
+          <div className="flex min-w-0 items-center gap-2 overflow-hidden whitespace-nowrap">
+            {visibleCount == null
+              ? groupButtons()
+              : groupButtons().slice(0, visibleCount)}
+          </div>
+          {visibleCount != null && (
+            <Button
+              variant="ghost"
+              size="sm"
+              className="shrink-0 px-2 text-secondary-foreground"
+              aria-label={t("group.showAll")}
+              onClick={() => setExpanded(true)}
+            >
+              <HiDotsHorizontal className="size-5" />
+            </Button>
+          )}
+
+          {/* invisible row used only to measure natural button widths so we
+              can render exactly the buttons that fully fit */}
+          <div
+            className="pointer-events-none absolute left-0 top-0 h-0 w-0 overflow-hidden"
+            aria-hidden
+            inert
+          >
+            <div ref={measureRef} className="flex w-max items-center gap-2">
+              {groupButtons()}
+              <Button variant="ghost" size="sm" className="px-2">
+                <HiDotsHorizontal className="size-5" />
+              </Button>
+            </div>
+          </div>
+
+          {expanded && (
+            <div
+              className="fixed inset-0 z-20"
+              onClick={() => setExpanded(false)}
+            />
+          )}
+          <AnimatePresence>
+            {expanded && (
+              <motion.div
+                key="group-overlay"
+                className="absolute inset-x-0 top-0 z-30 bg-background py-1 shadow-lg"
+                initial={{ clipPath: "inset(0 100% 0 0)" }}
+                animate={{ clipPath: "inset(0 0% 0 0)" }}
+                exit={{ clipPath: "inset(0 100% 0 0)" }}
+                transition={{ duration: 0.2, ease: "easeInOut" }}
+              >
+                <div className="flex flex-wrap items-center gap-2">
+                  {groupButtons(() => setExpanded(false))}
+                  <Button
+                    variant="ghost"
+                    size="sm"
+                    className="ml-auto shrink-0 px-2 text-secondary-foreground"
+                    aria-label={t("group.showLess")}
+                    onClick={() => setExpanded(false)}
+                  >
+                    <IoClose className="size-5" />
+                  </Button>
+                </div>
+              </motion.div>
+            )}
+          </AnimatePresence>
+        </div>
       )}
     </>
   );

web/src/components/mobile/OverflowStrip.tsx

@@ -1,167 +0,0 @@
-import { ReactNode, useLayoutEffect, useRef, useState } from "react";
-import { AnimatePresence, motion } from "framer-motion";
-import { HiDotsHorizontal } from "react-icons/hi";
-import { IoClose } from "react-icons/io5";
-import { Button } from "../ui/button";
-import { cn } from "@/lib/utils";
-
-type OverflowStripProps = {
-  className?: string;
-  items: ReactNode[];
-  activeIndex?: number;
-  gapClassName?: string;
-  showAllLabel: string;
-  showLessLabel: string;
-};
-
-// Renders only the items that fully fit and surfaces a kebab next to the last
-// visible one. The kebab expands a panel over the nearest positioned ancestor
-// that reveals every item.
-export default function OverflowStrip({
-  className,
-  items,
-  activeIndex = 0,
-  gapClassName = "gap-2",
-  showAllLabel,
-  showLessLabel,
-}: OverflowStripProps) {
-  const [expanded, setExpanded] = useState(false);
-  // null => all items fit, render them all with no kebab; a number => only
-  // that many fit alongside the kebab
-  const [visibleCount, setVisibleCount] = useState<number | null>(null);
-  const wrapperRef = useRef<HTMLDivElement | null>(null);
-  const measureRef = useRef<HTMLDivElement | null>(null);
-
-  useLayoutEffect(() => {
-    const wrapper = wrapperRef.current;
-    const measure = measureRef.current;
-
-    if (!wrapper || !measure) {
-      return;
-    }
-
-    const wrapperGap = 4; // gap-1 between the strip and the kebab
-
-    const compute = () => {
-      const children = Array.from(measure.children) as HTMLElement[];
-
-      if (children.length === 0) {
-        return;
-      }
-
-      // the trailing child of the measurement row is a kebab clone
-      const kebab = children[children.length - 1];
-      const start = children[0].offsetLeft;
-      const ends = children
-        .slice(0, -1)
-        .map((el) => el.offsetLeft + el.offsetWidth - start);
-      const available = wrapper.clientWidth;
-
-      if (ends[ends.length - 1] <= available) {
-        setVisibleCount(null);
-        return;
-      }
-
-      const budget = available - kebab.offsetWidth - wrapperGap;
-      const count = ends.filter((end) => end <= budget).length;
-
-      setVisibleCount(Math.max(count, 1));
-    };
-
-    compute();
-
-    const observer = new ResizeObserver(compute);
-    observer.observe(wrapper);
-    observer.observe(measure);
-
-    return () => observer.disconnect();
-  }, [items.length, gapClassName]);
-
-  // a selected item past the cut takes the last visible slot
-  const visibleItems =
-    visibleCount == null
-      ? items
-      : activeIndex >= visibleCount
-        ? [...items.slice(0, visibleCount - 1), items[activeIndex]]
-        : items.slice(0, visibleCount);
-
-  return (
-    <div
-      ref={wrapperRef}
-      className={cn("flex min-w-0 items-center gap-1", className)}
-    >
-      <div
-        className={cn(
-          "flex min-w-0 items-center overflow-hidden whitespace-nowrap",
-          gapClassName,
-        )}
-      >
-        {visibleItems}
-      </div>
-      {visibleCount != null && (
-        <Button
-          variant="ghost"
-          size="sm"
-          className="shrink-0 px-2 text-secondary-foreground"
-          aria-label={showAllLabel}
-          onClick={() => setExpanded(true)}
-        >
-          <HiDotsHorizontal className="size-5" />
-        </Button>
-      )}
-
-      {/* invisible row used only to measure natural item widths so we can
-          render exactly the items that fully fit */}
-      <div
-        className="pointer-events-none absolute left-0 top-0 h-0 w-0 overflow-hidden"
-        aria-hidden
-        inert
-      >
-        <div
-          ref={measureRef}
-          className={cn("flex w-max items-center", gapClassName)}
-        >
-          {items}
-          <Button variant="ghost" size="sm" className="px-2">
-            <HiDotsHorizontal className="size-5" />
-          </Button>
-        </div>
-      </div>
-
-      {expanded && (
-        <div
-          className="fixed inset-0 z-20"
-          onClick={() => setExpanded(false)}
-        />
-      )}
-      <AnimatePresence>
-        {expanded && (
-          <motion.div
-            key="overflow-overlay"
-            className="absolute inset-x-0 top-0 z-30 bg-background py-1 shadow-lg"
-            initial={{ clipPath: "inset(0 100% 0 0)" }}
-            animate={{ clipPath: "inset(0 0% 0 0)" }}
-            exit={{ clipPath: "inset(0 100% 0 0)" }}
-            transition={{ duration: 0.2, ease: "easeInOut" }}
-          >
-            {/* a tap on any item bubbles up and collapses the panel */}
-            <div
-              className={cn("flex flex-wrap items-center", gapClassName)}
-              onClick={() => setExpanded(false)}
-            >
-              {items}
-              <Button
-                variant="ghost"
-                size="sm"
-                className="ml-auto shrink-0 px-2 text-secondary-foreground"
-                aria-label={showLessLabel}
-              >
-                <IoClose className="size-5" />
-              </Button>
-            </div>
-          </motion.div>
-        )}
-      </AnimatePresence>
-    </div>
-  );
-}

web/src/pages/System.tsx

@@ -1,10 +1,8 @@
 import useSWR from "swr";
 import { FrigateStats } from "@/types/stats";
-import { ReactNode, useEffect, useMemo, useRef, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
 import TimeAgo from "@/components/dynamic/TimeAgo";
 import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";
-import { Toggle } from "@/components/ui/toggle";
-import OverflowStrip from "@/components/mobile/OverflowStrip";
 import { isDesktop, isMobile } from "react-device-detect";
 import GeneralMetrics from "@/views/system/GeneralMetrics";
 import StorageMetrics from "@/views/system/StorageMetrics";
@@ -38,14 +36,6 @@ const allMetrics = [
 ] as const;
 type SystemMetric = (typeof allMetrics)[number];
 
-const metricIcons: Record<SystemMetric, ReactNode> = {
-  health: <LuHeartPulse className="size-4" />,
-  general: <LuActivity className="size-4" />,
-  enrichments: <LuSearchCode className="size-4" />,
-  storage: <LuHardDrive className="size-4" />,
-  cameras: <FaVideo className="size-4" />,
-};
-
 function System() {
   const { t } = useTranslation(["views/system"]);
   const { data: config } = useSWR<FrigateConfig>("config", {
@@ -108,66 +98,43 @@ function System() {
         {isMobile && (
           <Logo className="absolute inset-x-1/2 h-8 -translate-x-1/2" />
         )}
-        {isMobile ? (
-          <div className="w-[calc(50%-1rem)]">
-            <OverflowStrip
-              items={metrics.map((item) => (
-                <Toggle
+        <ScrollArea className={cn("whitespace-nowrap", isMobile && "w-[45%]")}>
+          <div className="flex flex-row">
+            <ToggleGroup
+              className="*:rounded-md *:px-3 *:py-4"
+              type="single"
+              size="sm"
+              value={pageToggle}
+              onValueChange={(value: SystemMetric) => {
+                if (value) {
+                  setPageToggle(value);
+                }
+              }} // don't allow the severity to be unselected
+            >
+              {Object.values(metrics).map((item) => (
+                <ToggleGroupItem
                   key={item}
-                  className={cn(
-                    "shrink-0 rounded-md px-3 py-4",
-                    pageToggle != item && "*:text-muted-foreground",
-                  )}
-                  size="sm"
-                  pressed={pageToggle == item}
-                  onPressedChange={() => setPageToggle(item)}
+                  className={`flex items-center justify-between gap-2 ${pageToggle == item ? "" : "*:text-muted-foreground"}`}
+                  value={item}
                   aria-label={t("selectItem", {
                     ns: "common",
                     item: t(item + ".title"),
                   })}
                 >
-                  {metricIcons[item]}
-                </Toggle>
-              ))}
-              activeIndex={metrics.indexOf(pageToggle)}
-              gapClassName="gap-0.5"
-              showAllLabel={t("showAllTabs")}
-              showLessLabel={t("showLessTabs")}
-            />
-          </div>
-        ) : (
-          <ScrollArea className="whitespace-nowrap">
-            <div className="flex flex-row">
-              <ToggleGroup
-                className="*:rounded-md *:px-3 *:py-4"
-                type="single"
-                size="sm"
-                value={pageToggle}
-                onValueChange={(value: SystemMetric) => {
-                  if (value) {
-                    setPageToggle(value);
-                  }
-                }} // don't allow the severity to be unselected
-              >
-                {Object.values(metrics).map((item) => (
-                  <ToggleGroupItem
-                    key={item}
-                    className={`flex items-center justify-between gap-2 ${pageToggle == item ? "" : "*:text-muted-foreground"}`}
-                    value={item}
-                    aria-label={t("selectItem", {
-                      ns: "common",
-                      item: t(item + ".title"),
-                    })}
-                  >
-                    {metricIcons[item]}
+                  {item == "health" && <LuHeartPulse className="size-4" />}
+                  {item == "general" && <LuActivity className="size-4" />}
+                  {item == "enrichments" && <LuSearchCode className="size-4" />}
+                  {item == "storage" && <LuHardDrive className="size-4" />}
+                  {item == "cameras" && <FaVideo className="size-4" />}
+                  {isDesktop && (
                     <div className="smart-capitalize">{t(item + ".title")}</div>
-                  </ToggleGroupItem>
-                ))}
-              </ToggleGroup>
-              <ScrollBar orientation="horizontal" className="h-0" />
-            </div>
-          </ScrollArea>
-        )}
+                  )}
+                </ToggleGroupItem>
+              ))}
+            </ToggleGroup>
+            <ScrollBar orientation="horizontal" className="h-0" />
+          </div>
+        </ScrollArea>
 
         <div className="flex h-full items-center">
           {pageToggle == "health" && (

web/src/views/live/LiveDashboardView.tsx

@@ -419,7 +419,7 @@ export default function LiveDashboardView({
       {isMobile && (
         <div className="relative flex h-11 items-center justify-between">
           <Logo className="absolute inset-x-1/2 h-8 -translate-x-1/2" />
-          <div className="w-[calc(50%-1rem)]">
+          <div className="w-[45%]">
             <CameraGroupSelector />
           </div>
           {(!cameraGroup || cameraGroup == "default" || isMobileOnly) && (