From 0bdccfba8836ecaa2b20ef433d8d6b6d60e6e005 Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 4 Sep 2025 09:42:49 +0530 Subject: [PATCH 1/4] fix: inconsistent sidebar state on mobile/tablet viewport after navigation. --- src/lib/layout/shell.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index 79220304b..15263ac08 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -18,6 +18,7 @@ import { page } from '$app/stores'; import type { Models } from '@appwrite.io/console'; import { getSidebarState, isInDatabasesRoute, updateSidebarState } from '$lib/helpers/sidebar'; + import { isTabletViewport } from '$lib/stores/viewport'; export let showHeader = true; export let showFooter = true; @@ -107,7 +108,7 @@ isInDatabasesRoute(navigation.from.route) && !isInDatabasesRoute(navigation.to.route); if (isEnteringDatabase) { - state = 'icons'; + state = $isTabletViewport ? 'closed' : 'icons'; } else if (isLeavingDatabase) { state = getSidebarState(); $noWidthTransition = false; From 55a26254f4fce3c2a24f7ceb7ed8585bd5868663 Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 4 Sep 2025 09:57:15 +0530 Subject: [PATCH 2/4] fix: short-circuit viewport check. --- src/lib/layout/shell.svelte | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index 15263ac08..3ebdadbda 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -103,12 +103,19 @@ * the setup around the sidebar is very tightly configured with 2 states sync. */ afterNavigate((navigation) => { + // always closed on + // mobile and tablets! + if ($isTabletViewport) { + state = 'closed'; + return; + } + const isEnteringDatabase = isInDatabasesRoute(navigation.to.route); const isLeavingDatabase = isInDatabasesRoute(navigation.from.route) && !isInDatabasesRoute(navigation.to.route); if (isEnteringDatabase) { - state = $isTabletViewport ? 'closed' : 'icons'; + state = 'icons'; } else if (isLeavingDatabase) { state = getSidebarState(); $noWidthTransition = false; From 83018ac7841ff74339edbc6d313438f45b0144bb Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 4 Sep 2025 09:57:57 +0530 Subject: [PATCH 3/4] fix: edge-case where the database name is null during navigation on tablet/mobile viewports. --- .../databases/database-[database]/subNavigation.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte index 26ee8f530..1cc5f7972 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte @@ -134,7 +134,7 @@ -{:else} +{:else if data?.database?.name}
From d13ad7318de502887a6dc018aba2d77cbfae4754 Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 4 Sep 2025 10:09:17 +0530 Subject: [PATCH 4/4] fix: comment. --- src/lib/layout/shell.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index 3ebdadbda..bfc06264f 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -101,10 +101,10 @@ * * This needs to be handled like this because * the setup around the sidebar is very tightly configured with 2 states sync. + * + * The sidebar is **always closed** on mobile and tablet devices! */ afterNavigate((navigation) => { - // always closed on - // mobile and tablets! if ($isTabletViewport) { state = 'closed'; return;