Skip to content

Commit a56bf0b

Browse files
authored
Merge pull request #2699 from appwrite/fix-SER-670-org-sidebar-visibilty-fix-for-mobile-tabs
Fix: org mobile/tablet sidebar visibility and actions
2 parents e714a46 + eabf5c0 commit a56bf0b

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/lib/components/sidebar.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@
259259
</div>
260260
{/if}
261261
</Layout.Stack>
262-
{:else if $isSmallViewport}
262+
{:else if $isTabletViewport}
263263
<div class="action-buttons">
264264
<Layout.Stack direction="column" gap="s">
265265
<DropList show={$feedback.show} scrollable>

src/lib/layout/shell.svelte

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,8 @@
173173
174174
$: subNavigation = $page.data.subNavigation;
175175
176-
$: isProjectPage = $page.route?.id?.includes('project-');
176+
$: shouldRenderSidebar = !$isNewWizardStatusOpen && showSideNavigation;
177+
$: hasSidebarSpace = shouldRenderSidebar && !$isTabletViewport && !!selectedProject;
177178
178179
$: {
179180
if ($isSidebarOpen) {
@@ -205,7 +206,7 @@
205206
<Navbar {...navbarProps} bind:sideBarIsOpen={$isSidebarOpen} bind:showAccountMenu />
206207
{/if}
207208

208-
{#if !$isNewWizardStatusOpen && isProjectPage}
209+
{#if shouldRenderSidebar}
209210
<Sidebar
210211
project={selectedProject}
211212
progressCard={getProgressCard()}
@@ -221,8 +222,8 @@
221222
<div
222223
class="content"
223224
class:has-transition={showContentTransition}
224-
class:icons-content={state === 'icons' && isProjectPage}
225-
class:no-sidebar={!showSideNavigation}>
225+
class:icons-content={state === 'icons' && selectedProject}
226+
class:no-sidebar={!hasSidebarSpace}>
226227
<section class="main-content" data-test={showSideNavigation}>
227228
{#if $page.data?.header}
228229
<div class="layout-header">

src/routes/(console)/+layout.svelte

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,6 @@
334334
<CommandCenter />
335335
<Shell
336336
showSideNavigation={page.url.pathname !== '/' &&
337-
!page?.params.organization &&
338337
!page.url.pathname.includes(base + '/account') &&
339338
!page.url.pathname.includes(base + '/card') &&
340339
!page.url.pathname.includes(base + '/onboarding')}

0 commit comments

Comments
 (0)