refactor: isolate tocstore and move tocheader into navbar

This commit is contained in:
Youwen Wu 2024-04-07 14:45:09 -07:00
parent e08d747d00
commit b6802e93d8
Signed by: youwen5
GPG key ID: 865658ED1FE61EC3
4 changed files with 26 additions and 8 deletions

View file

@ -8,8 +8,11 @@
import ThemePicker from '../ThemePicker.svelte'; import ThemePicker from '../ThemePicker.svelte';
import Button from '../ui/button/button.svelte'; import Button from '../ui/button/button.svelte';
import { Moon, Sun } from 'svelte-radix'; import { Moon, Sun } from 'svelte-radix';
import { tocStore } from '$lib/stores';
import TocHeader from '../Toc/TocHeader.svelte';
let current: 'blog' | 'about' | 'home' | 'portfolio' | string; let current: 'blog' | 'about' | 'home' | 'portfolio' | string;
let readingPost = false;
const updateCurrent = () => { const updateCurrent = () => {
const path = window.location.pathname; const path = window.location.pathname;
@ -17,8 +20,17 @@
current = 'home'; current = 'home';
} else { } else {
const segments = path.split('/'); const segments = path.split('/');
current = segments[1] || 'home'; current = segments[1] || 'home';
if (current === 'blog' && segments.length > 2) {
readingPost = true;
console.log(readingPost);
} else {
readingPost = false;
console.log(readingPost);
} }
}
console.log(current);
}; };
onMount(() => { onMount(() => {
@ -66,6 +78,9 @@
</div> </div>
<Separator /> <Separator />
</nav> </nav>
{#if readingPost}
<TocHeader {tocStore} placeholder="On this page" />
{/if}
<style lang="postcss"> <style lang="postcss">
.selected { .selected {

View file

@ -4,7 +4,7 @@
import { Accordion } from 'bits-ui'; import { Accordion } from 'bits-ui';
import { toclink } from '@svelte-put/toc'; import { toclink } from '@svelte-put/toc';
import { CaretDown } from 'svelte-radix'; import { CaretDown } from 'svelte-radix';
import { slide } from 'svelte/transition'; import { fly, slide } from 'svelte/transition';
export let tocStore: TocStore; export let tocStore: TocStore;
export let placeholder: string; export let placeholder: string;
@ -23,7 +23,10 @@
}; };
</script> </script>
<nav class="fixed top-24 left-0 w-full bg-background bg-opacity-50 backdrop-blur-lg z-30 lg:hidden"> <div
transition:fly={{ y: -50, duration: 300 }}
class="fixed top-24 left-0 w-full bg-background bg-opacity-50 backdrop-blur-lg z-30 lg:hidden"
>
<Accordion.Root class="px-8" bind:value> <Accordion.Root class="px-8" bind:value>
<Accordion.Item value="toc"> <Accordion.Item value="toc">
<Accordion.Trigger <Accordion.Trigger
@ -55,7 +58,7 @@
</Accordion.Item> </Accordion.Item>
</Accordion.Root> </Accordion.Root>
<Separator /> <Separator />
</nav> </div>
<style lang="postcss"> <style lang="postcss">
.highlighted { .highlighted {

3
src/lib/stores.ts Normal file
View file

@ -0,0 +1,3 @@
import { createTocStore } from '@svelte-put/toc';
export const tocStore = createTocStore();

View file

@ -1,11 +1,10 @@
<script lang="ts"> <script lang="ts">
import type { PageData } from './$types'; import type { PageData } from './$types';
import Article from '$lib/components/Blog/Article.svelte'; import Article from '$lib/components/Blog/Article.svelte';
import { toc, createTocStore } from '@svelte-put/toc'; import { toc } from '@svelte-put/toc';
import StickyToc from '$lib/components/Toc/StickyToc.svelte'; import StickyToc from '$lib/components/Toc/StickyToc.svelte';
import TocHeader from '$lib/components/Toc/TocHeader.svelte'; import TocHeader from '$lib/components/Toc/TocHeader.svelte';
import { tocStore } from '$lib/stores';
const tocStore = createTocStore();
export let data: PageData; export let data: PageData;
@ -29,8 +28,6 @@
<meta name="author" content="Youwen Wu" /> <meta name="author" content="Youwen Wu" />
</svelte:head> </svelte:head>
<TocHeader {tocStore} placeholder="On this page" />
<div class="lg:flex mx-auto mt-24 lg:mt-14 px-4"> <div class="lg:flex mx-auto mt-24 lg:mt-14 px-4">
<div class="flex-shrink xl:basis-1/4" /> <div class="flex-shrink xl:basis-1/4" />
<main <main