From 7a8ee3cf32c9d47ce58dc71768ea65c92e3c3a0b Mon Sep 17 00:00:00 2001 From: Alexander Platov Date: Mon, 28 Oct 2024 18:17:07 +0300 Subject: [PATCH] Auto show left panel in Settings. UI fixes (#7055) Signed-off-by: Alexander Platov --- .../src/components/Settings.svelte | 7 ++++++- .../src/components/WorkspaceSettings.svelte | 12 +++++++++--- .../spaceTypes/ManageSpaceTypeContent.svelte | 16 +++++++++------- .../components/issues/edit/ControlPanel.svelte | 2 +- .../issues/timereport/ReportedTimeEditor.svelte | 5 +++++ 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/plugins/setting-resources/src/components/Settings.svelte b/plugins/setting-resources/src/components/Settings.svelte index 59c3b52436..dc6138b3ed 100644 --- a/plugins/setting-resources/src/components/Settings.svelte +++ b/plugins/setting-resources/src/components/Settings.svelte @@ -38,7 +38,7 @@ deviceOptionsStore as deviceInfo } from '@hcengineering/ui' import { NavFooter } from '@hcengineering/workbench-resources' - import { ComponentType, onDestroy } from 'svelte' + import { ComponentType, onDestroy, onMount } from 'svelte' import { clearSettingsStore, settingsStore, type SettingsStore } from '../store' import { Analytics } from '@hcengineering/analytics' @@ -72,6 +72,11 @@ })(loc) }) ) + onMount(() => { + setTimeout(() => { + if (categoryId === undefined) $deviceInfo.navigator.visible = true + }, 500) + }) function findCategory (name: string): SettingsCategory | undefined { return categories.find((x) => x.name === name) diff --git a/plugins/setting-resources/src/components/WorkspaceSettings.svelte b/plugins/setting-resources/src/components/WorkspaceSettings.svelte index 95b75cca6a..f4d86e006d 100644 --- a/plugins/setting-resources/src/components/WorkspaceSettings.svelte +++ b/plugins/setting-resources/src/components/WorkspaceSettings.svelte @@ -23,9 +23,10 @@ NavItem, getCurrentResolvedLocation, navigate, - resolvedLocationStore + resolvedLocationStore, + deviceOptionsStore as deviceInfo } from '@hcengineering/ui' - import { onDestroy } from 'svelte' + import { onDestroy, onMount } from 'svelte' import { clearSettingsStore } from '../store' export let kind: 'navigation' | 'content' | undefined @@ -65,6 +66,11 @@ })(loc) }) ) + onMount(() => { + setTimeout(() => { + if (kind === 'content' && category === undefined) $deviceInfo.navigator.visible = true + }, 500) + }) function selectCategory (id: string): void { clearSettingsStore() @@ -94,7 +100,7 @@ {/if} {/each} -{:else if kind === 'content' && !category} +{:else if kind === 'content' && category === undefined}
{:else if category} diff --git a/plugins/setting-resources/src/components/spaceTypes/ManageSpaceTypeContent.svelte b/plugins/setting-resources/src/components/spaceTypes/ManageSpaceTypeContent.svelte index fb411c3e92..5203cff415 100644 --- a/plugins/setting-resources/src/components/spaceTypes/ManageSpaceTypeContent.svelte +++ b/plugins/setting-resources/src/components/spaceTypes/ManageSpaceTypeContent.svelte @@ -14,7 +14,7 @@ // limitations under the License. -->