simplify and fix bug around same setting

This commit is contained in:
Simon Knott 2024-08-06 13:01:46 +02:00
parent 5fb235f306
commit 600da636e2
No known key found for this signature in database
GPG key ID: 8CEDC00028084AEC
2 changed files with 4 additions and 4 deletions

View file

@ -43,8 +43,8 @@ export const SplitView: React.FC<SplitViewProps> = ({
main,
}) => {
const defaultSize = Math.max(minSidebarSize, sidebarSize) * window.devicePixelRatio;
const [hSize, setHSize] = useSettingOrState(settingName + '.' + orientation + ':size', defaultSize, !!settingName);
const [vSize, setVSize] = useSettingOrState(settingName + '.' + orientation + ':size', defaultSize, !!settingName);
const [hSize, setHSize] = useSettingOrState(settingName ? `${settingName}.horizontal:size` : undefined, defaultSize);
const [vSize, setVSize] = useSettingOrState(settingName ? `${settingName}.vertical:size` : undefined, defaultSize);
const [resizing, setResizing] = React.useState<{ offset: number, size: number } | null>(null);
const [measure, ref] = useMeasure<HTMLDivElement>();

View file

@ -157,10 +157,10 @@ export function useSetting<S>(name: string, defaultValue: S, title?: string): [S
return [value, setValueWrapper, setting];
}
export function useSettingOrState<S>(name: string | undefined, defaultValue: S, persist?: boolean): [S, (v: S) => void] {
export function useSettingOrState<S>(name: string | undefined, defaultValue: S): [S, (v: S) => void] {
const [settingValue, settingSet] = useSetting(name ?? 'unused', defaultValue);
const state = React.useState(defaultValue);
return persist ? [settingValue, settingSet] : state;
return name ? [settingValue, settingSet] : state;
}
export class Settings {