Skip to content

Commit 54ecd4f

Browse files
committed
fix: Adhere to shadcn documents and add SidebarProvider to root
1 parent 00700f3 commit 54ecd4f

1 file changed

Lines changed: 21 additions & 18 deletions

File tree

src/routes/+layout.svelte

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import { usePersistedState } from '$lib/state/classes/persisted-state.svelte';
1616
import DialogManager from '$lib/components/dialog-manager/dialog-manager.svelte';
1717
import { browser } from '$app/environment';
18+
import { TooltipProvider } from '$lib/components/ui/tooltip';
1819
1920
interface Props {
2021
children?: Snippet;
@@ -39,21 +40,23 @@
3940

4041
<WelcomeScreen />
4142

42-
<SidebarProvider open={isOpen} onOpenChange={(v) => (sidebarOpen.value = v)}>
43-
<Sidebar />
44-
<div class="flex h-screen w-screen flex-1 flex-col overflow-hidden">
45-
{#if PUBLIC_DEVELOPMENT_BANNER === 'true'}
46-
<div class="top-0 left-0 z-1 flex-none bg-[orangered] text-center text-white">
47-
<p>
48-
This is the OpenShock <b>DEVELOPMENT</b> environment. <u>No data is saved</u>, and
49-
regularly overwritten by production data
50-
</p>
51-
</div>
52-
{/if}
53-
<Header />
54-
<main class="min-h-0 flex-1 overflow-x-hidden">
55-
{@render children?.()}
56-
</main>
57-
<Footer />
58-
</div>
59-
</SidebarProvider>
43+
<TooltipProvider delayDuration={250}>
44+
<SidebarProvider open={isOpen} onOpenChange={(v) => (sidebarOpen.value = v)}>
45+
<Sidebar />
46+
<div class="flex h-screen w-screen flex-1 flex-col overflow-hidden">
47+
{#if PUBLIC_DEVELOPMENT_BANNER === 'true'}
48+
<div class="top-0 left-0 z-1 flex-none bg-[orangered] text-center text-white">
49+
<p>
50+
This is the OpenShock <b>DEVELOPMENT</b> environment. <u>No data is saved</u>, and
51+
regularly overwritten by production data
52+
</p>
53+
</div>
54+
{/if}
55+
<Header />
56+
<main class="min-h-0 flex-1 overflow-x-hidden">
57+
{@render children?.()}
58+
</main>
59+
<Footer />
60+
</div>
61+
</SidebarProvider>
62+
</TooltipProvider>

0 commit comments

Comments
 (0)