From ae4546341fb12aaff9226228a400e8210f2c571b Mon Sep 17 00:00:00 2001 From: kensand Date: Tue, 30 Jul 2024 22:10:36 -0400 Subject: [PATCH] Change LiveViewModes to lowercase strings --- web/src/types/live.ts | 2 +- web/src/views/live/DraggableGridLayout.tsx | 6 +++--- web/src/views/live/LiveDashboardView.tsx | 8 +++----- web/src/views/settings/GeneralSettingsView.tsx | 5 +++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/web/src/types/live.ts b/web/src/types/live.ts index 470c0843f..f5ad9e243 100644 --- a/web/src/types/live.ts +++ b/web/src/types/live.ts @@ -33,5 +33,5 @@ export type LiveStreamMetadata = { export type LivePlayerError = "stalled" | "startup" | "mse-decode"; -export const LiveViewModes = ["Auto", "Static", "Continuous"] as const +export const LiveViewModes = ["auto", "static", "continuous"] as const export type LiveViewMode = (typeof LiveViewModes)[number]; diff --git a/web/src/views/live/DraggableGridLayout.tsx b/web/src/views/live/DraggableGridLayout.tsx index a58bfb237..27ee4bc8d 100644 --- a/web/src/views/live/DraggableGridLayout.tsx +++ b/web/src/views/live/DraggableGridLayout.tsx @@ -77,7 +77,7 @@ export default function DraggableGridLayout({ const [preferredLiveModes, setPreferredLiveModes] = useState<{ [key: string]: LivePlayerMode; }>({}); - const [liveViewMode] = usePersistence("liveViewMode", "Auto"); + const [liveViewMode] = usePersistence("liveViewMode", "auto"); useEffect(() => { if (!cameras) return; @@ -680,8 +680,8 @@ const LivePlayerGridItem = React.forwardRef< onClick={onClick} onError={onError} containerRef={ref as React.RefObject} - autoLive={liveViewMode == "Auto" || liveViewMode == "Continuous"} - showStillWithoutActivity={liveViewMode != "Continuous"} + autoLive={liveViewMode != "static"} + showStillWithoutActivity={liveViewMode != "continuous"} /> {children} diff --git a/web/src/views/live/LiveDashboardView.tsx b/web/src/views/live/LiveDashboardView.tsx index 34bf36139..4149a9529 100644 --- a/web/src/views/live/LiveDashboardView.tsx +++ b/web/src/views/live/LiveDashboardView.tsx @@ -128,7 +128,7 @@ export default function LiveDashboardView({ // camera live views - const [liveViewMode] = usePersistence("liveViewMode", "Auto"); + const [liveViewMode] = usePersistence("liveViewMode", "auto"); const [preferredLiveModes, setPreferredLiveModes] = useState<{ [key: string]: LivePlayerMode; }>({}); @@ -377,10 +377,8 @@ export default function LiveDashboardView({ } cameraConfig={camera} preferredLiveMode={preferredLiveModes[camera.name] ?? "mse"} - autoLive={ - liveViewMode == "Auto" || liveViewMode == "Continuous" - } - showStillWithoutActivity={liveViewMode != "Continuous"} + autoLive={liveViewMode != "static"} + showStillWithoutActivity={liveViewMode != "continuous"} onClick={() => onSelectCamera(camera.name)} onError={(e) => handleError(camera.name, e)} /> diff --git a/web/src/views/settings/GeneralSettingsView.tsx b/web/src/views/settings/GeneralSettingsView.tsx index 716ffc943..cd9e03641 100644 --- a/web/src/views/settings/GeneralSettingsView.tsx +++ b/web/src/views/settings/GeneralSettingsView.tsx @@ -55,7 +55,7 @@ export default function GeneralSettingsView() { const [liveViewMode, setLiveViewMode] = usePersistence( "liveViewMode", - "Auto", + "auto", ); const [playbackRate, setPlaybackRate] = usePersistence("playbackRate", 1); const [weekStartsOn, setWeekStartsOn] = usePersistence("weekStartsOn", 0); @@ -88,7 +88,7 @@ export default function GeneralSettingsView() { value={liveViewMode} onValueChange={(value: LiveViewMode) => setLiveViewMode(value)} > - + {liveViewMode} @@ -98,6 +98,7 @@ export default function GeneralSettingsView() { key={mode} className="cursor-pointer" value={mode} + style={{textTransform: "capitalize"}} > {mode}