From c2d1e4505fc144f23d3571b7784ccb6ebb0fd47c Mon Sep 17 00:00:00 2001 From: Zerebos Date: Mon, 13 Mar 2023 16:32:51 -0400 Subject: [PATCH] Fix issue with dropdowns crashing --- renderer/src/ui/settings/addonlist.jsx | 2 +- renderer/src/ui/settings/components/dropdown.jsx | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/renderer/src/ui/settings/addonlist.jsx b/renderer/src/ui/settings/addonlist.jsx index 53e04dbb..4d18df9e 100644 --- a/renderer/src/ui/settings/addonlist.jsx +++ b/renderer/src/ui/settings/addonlist.jsx @@ -79,7 +79,7 @@ function confirmDelete(addon) { export default function AddonList({prefix, type, title, folder, addonList, addonState, onChange, reload, editAddon, deleteAddon}) { const [query, setQuery] = useState(""); const [sort, setSort] = useState(getState.bind(null, type, "sort", "name")); - const [ascending, setAscending] = useState(getState.bind(null, type, "ascending", "true")); + const [ascending, setAscending] = useState(getState.bind(null, type, "ascending", true)); const [view, setView] = useState(getState.bind(null, type, "view", "list")); const [, forceUpdate] = useReducer(x => x + 1, 0); diff --git a/renderer/src/ui/settings/components/dropdown.jsx b/renderer/src/ui/settings/components/dropdown.jsx index 004f12d7..c6ed7c99 100644 --- a/renderer/src/ui/settings/components/dropdown.jsx +++ b/renderer/src/ui/settings/components/dropdown.jsx @@ -29,7 +29,8 @@ export default function Select({value: initialValue, options, style, onChange}) }, [open]); - const selected = options.find(o => o.value == value); + // ?? options[0] provides a double failsafe + const selected = options.find(o => o.value == value) ?? options[0]; const optionComponents =
{options.map(opt =>
change(opt.value)}>{opt.label}