mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-08-11 21:31:12 +03:00
fix crash in multi-camera export dialog when a camera group has an invalid or default icon
This commit is contained in:
@@ -153,11 +153,15 @@ export default function IconPicker({
|
|||||||
}
|
}
|
||||||
|
|
||||||
type IconRendererProps = {
|
type IconRendererProps = {
|
||||||
icon: IconType;
|
icon: IconType | undefined;
|
||||||
size?: number;
|
size?: number;
|
||||||
className?: string;
|
className?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
export function IconRenderer({ icon, size, className }: IconRendererProps) {
|
export function IconRenderer({ icon, size, className }: IconRendererProps) {
|
||||||
|
if (!icon) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
return <>{React.createElement(icon, { size, className })}</>;
|
return <>{React.createElement(icon, { size, className })}</>;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,6 +65,7 @@ import { Textarea } from "../ui/textarea";
|
|||||||
import { useNavigate } from "react-router-dom";
|
import { useNavigate } from "react-router-dom";
|
||||||
import { useIsAdmin } from "@/hooks/use-is-admin";
|
import { useIsAdmin } from "@/hooks/use-is-admin";
|
||||||
import { isReplayCamera } from "@/utils/cameraUtil";
|
import { isReplayCamera } from "@/utils/cameraUtil";
|
||||||
|
import { isValidIconName } from "@/utils/iconUtil";
|
||||||
|
|
||||||
const EXPORT_OPTIONS = [
|
const EXPORT_OPTIONS = [
|
||||||
"1",
|
"1",
|
||||||
@@ -1066,7 +1067,11 @@ export function ExportContent({
|
|||||||
}
|
}
|
||||||
>
|
>
|
||||||
<IconRenderer
|
<IconRenderer
|
||||||
icon={LuIcons[group.icon]}
|
icon={
|
||||||
|
isValidIconName(group.icon)
|
||||||
|
? LuIcons[group.icon]
|
||||||
|
: LuIcons.LuFolder
|
||||||
|
}
|
||||||
className="mr-2 size-4 text-secondary-foreground"
|
className="mr-2 size-4 text-secondary-foreground"
|
||||||
/>
|
/>
|
||||||
<span className="truncate">{group.name}</span>
|
<span className="truncate">{group.name}</span>
|
||||||
|
|||||||
Reference in New Issue
Block a user