From 9c519b9daddef2d2affd482212cd3572eaf3dd1a Mon Sep 17 00:00:00 2001 From: Nicolas Mowen Date: Wed, 28 Feb 2024 06:26:22 -0700 Subject: [PATCH] Fix typing --- web/src/hooks/use-camera-live-mode.ts | 8 ++++---- web/src/types/frigateConfig.ts | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/web/src/hooks/use-camera-live-mode.ts b/web/src/hooks/use-camera-live-mode.ts index 214713dc1..f13622556 100644 --- a/web/src/hooks/use-camera-live-mode.ts +++ b/web/src/hooks/use-camera-live-mode.ts @@ -7,7 +7,7 @@ import { LivePlayerMode } from "@/types/live"; export default function useCameraLiveMode( cameraConfig: CameraConfig, preferredMode?: string -): LivePlayerMode { +): LivePlayerMode | undefined { const { data: config } = useSWR("config"); const restreamEnabled = useMemo(() => { @@ -22,10 +22,10 @@ export default function useCameraLiveMode( ) ); }, [config, cameraConfig]); - const defaultLiveMode = useMemo(() => { + const defaultLiveMode = useMemo(() => { if (config && cameraConfig) { if (restreamEnabled) { - return cameraConfig.ui.live_mode || config?.ui.live_mode; + return cameraConfig.ui.live_mode || config.ui.live_mode; } return "jsmpeg"; @@ -33,7 +33,7 @@ export default function useCameraLiveMode( return undefined; }, [cameraConfig, restreamEnabled]); - const [viewSource] = usePersistence( + const [viewSource] = usePersistence( `${cameraConfig.name}-source`, defaultLiveMode ); diff --git a/web/src/types/frigateConfig.ts b/web/src/types/frigateConfig.ts index 77c51c879..5149264d8 100644 --- a/web/src/types/frigateConfig.ts +++ b/web/src/types/frigateConfig.ts @@ -1,10 +1,12 @@ +import { LivePlayerMode } from "./live"; + export interface UiConfig { timezone?: string; time_format?: "browser" | "12hour" | "24hour"; date_style?: "full" | "long" | "medium" | "short"; time_style?: "full" | "long" | "medium" | "short"; strftime_fmt?: string; - live_mode?: string; + live_mode?: LivePlayerMode; use_experimental?: boolean; dashboard: boolean; order: number;