Skip to content

Commit 19a284f

Browse files
committed
fix menu not closing
1 parent b6f6cb3 commit 19a284f

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

interface/src/routes/+layout.svelte

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,11 @@
3232
if ($user.bearer_token !== '') {
3333
await validateUser($user);
3434
}
35-
if (!(page.data.features.security && $user.bearer_token === '')) {
35+
if (!(page.data.features.security && $user.bearer_token === '')) {
3636
initSocket();
3737
}
3838
});
3939
40-
4140
const initSocket = () => {
4241
const ws_token = page.data.features.security ? '?access_token=' + $user.bearer_token : '';
4342
socket.init(
@@ -131,15 +130,14 @@
131130
const handleOAT = (data: DownloadOTA) => telemetry.setDownloadOTA(data);
132131
133132
let menuOpen = $state(false);
134-
135133
</script>
136134

137135
<svelte:head>
138136
<title>{page.data.title}</title>
139137
</svelte:head>
140138

141139
{#if page.data.features.security && $user.bearer_token === ''}
142-
<Login on:signIn={initSocket}/>
140+
<Login on:signIn={initSocket} />
143141
{:else}
144142
<div class="drawer lg:drawer-open">
145143
<input id="main-menu" type="checkbox" class="drawer-toggle" bind:checked={menuOpen} />
@@ -153,7 +151,11 @@
153151
<!-- Side Navigation -->
154152
<div class="drawer-side z-30 shadow-lg">
155153
<label for="main-menu" class="drawer-overlay"></label>
156-
<Menu bind:value={menuOpen}/>
154+
<Menu
155+
closeMenu={() => {
156+
menuOpen = false;
157+
}}
158+
/>
157159
</div>
158160
</div>
159161
{/if}
@@ -162,11 +164,10 @@
162164
<!-- svelte-ignore a11y_click_events_have_key_events -->
163165
{#snippet backdrop({ close })}
164166
<div
165-
166167
class="fixed inset-0 z-40 max-h-full max-w-full bg-black/20 backdrop-blur"
167168
transition:fade|global
168169
onclick={() => close()}
169-
></div>
170+
></div>
170171
{/snippet}
171172
</Modals>
172173

interface/src/routes/menu.svelte

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import { page } from '$app/state';
2121
import { user } from '$lib/stores/user';
2222
23-
let { menuOpen = $bindable() } = $props();
23+
let { closeMenu } = $props();
2424
2525
const github = { href: 'https://github.com/' + page.data.github, active: true };
2626
@@ -132,8 +132,7 @@
132132
subItem.active = subItem.title === targetTitle;
133133
});
134134
});
135-
menuItems = menuItems;
136-
menuOpen = false;
135+
closeMenu();
137136
}
138137
139138
$effect(() => {
@@ -156,7 +155,7 @@
156155
{#if menuItem.feature}
157156
<li>
158157
{#if menuItem.submenu}
159-
<details open={menuItem.submenu.some(subItem => subItem.active)}>
158+
<details open={menuItem.submenu.some((subItem) => subItem.active)}>
160159
<summary class="text-lg font-bold">
161160
<menuItem.icon class="h-6 w-6" />
162161
{menuItem.title}
@@ -171,7 +170,6 @@
171170
class="text-ml font-bold"
172171
onclick={() => {
173172
setActiveMenuItem(subMenuItem.title);
174-
menuItems = menuItems;
175173
}}><subMenuItem.icon class="h-5 w-5" />{subMenuItem.title}</a
176174
>
177175
</li>
@@ -186,7 +184,6 @@
186184
class="text-lg font-bold"
187185
onclick={() => {
188186
setActiveMenuItem(menuItem.title);
189-
menuItems = menuItems;
190187
}}><menuItem.icon class="h-6 w-6" />{menuItem.title}</a
191188
>
192189
{/if}

0 commit comments

Comments
 (0)