From 1507206e4a93d61ccbc9251e2b47781110e8dc8f Mon Sep 17 00:00:00 2001 From: EnixCoda Date: Thu, 27 May 2021 00:51:03 +0800 Subject: [PATCH] feat: disable auto expand in float mode --- src/components/SimpleToggleField.tsx | 2 ++ src/components/settings/SidebarSettings.tsx | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/SimpleToggleField.tsx b/src/components/SimpleToggleField.tsx index db4bfc7..7e0ec27 100644 --- a/src/components/SimpleToggleField.tsx +++ b/src/components/SimpleToggleField.tsx @@ -9,6 +9,7 @@ export type SimpleField = { wikiLink?: string tooltip?: string description?: string + disabled?: boolean overwrite?: { value: (value: Config[Key]) => boolean onChange: (checked: boolean) => Config[Key] @@ -54,6 +55,7 @@ export function SimpleToggleField({ field, onChange }: { const enabled = e.currentTarget.checked diff --git a/src/components/settings/SidebarSettings.tsx b/src/components/settings/SidebarSettings.tsx index 031b605..66aa03c 100644 --- a/src/components/settings/SidebarSettings.tsx +++ b/src/components/settings/SidebarSettings.tsx @@ -104,10 +104,12 @@ export function SidebarSettings(props: React.PropsWithChildren) { field={{ key: 'intelligentToggle', label: 'Auto expand', + disabled: configContext.value.sidebarToggleMode === 'float', tooltip: - 'Gitako will expand when exploring source files, pull requests, etc. And collapse otherwise.', + 'Gitako will expand when exploring source files, pull requests, etc. And collapse otherwise. Will be disabled when "Dock sidebar on expand" is disabled.', overwrite: { - value: enabled => enabled === null, + value: enabled => + configContext.value.sidebarToggleMode === 'float' ? false : enabled === null, onChange: checked => (checked ? null : true), }, }}