Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

svelte-5-leftover-mobile-nav #1696

Merged
merged 3 commits into from
Feb 17, 2025
Merged

svelte-5-leftover-mobile-nav #1696

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
895abd7
refactor: mobile nav svelte 5 (almost)
vvnsrzn Feb 8, 2025
792ffa0
Merge branch 'main' into svelte-5-leftover-mobile-nav
nsarrazin Feb 17, 2025
4092c46
refactor: default title smol change
nsarrazin Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 20 additions & 27 deletions src/lib/components/MobileNav.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
<!-- @migration task: review uses of `navigating` -->
<script lang="ts">
import { run } from "svelte/legacy";

import { navigating } from "$app/state";
import { createEventDispatcher } from "svelte";
import { browser } from "$app/environment";
import { beforeNavigate } from "$app/navigation";
import { base } from "$app/paths";
import { page } from "$app/stores";

import { page } from "$app/state";
import IconNew from "$lib/components/icons/IconNew.svelte";
import { createEventDispatcher } from "svelte";
import CarbonClose from "~icons/carbon/close";
import CarbonTextAlignJustify from "~icons/carbon/text-align-justify";
import IconNew from "$lib/components/icons/IconNew.svelte";

interface Props {
isOpen?: boolean;
Expand All @@ -20,25 +16,24 @@

let { isOpen = false, title = $bindable(), children }: Props = $props();

run(() => {
title = title ?? "New Chat";
});

let closeEl: HTMLButtonElement | undefined = $state();
let openEl: HTMLButtonElement | undefined = $state();

const dispatch = createEventDispatcher();
$effect(() => {
title ??= "New Chat";
});

run(() => {
if (navigating) {
dispatch("toggle", false);
}
const dispatch = createEventDispatcher();
beforeNavigate(() => {
dispatch("toggle", false);
});

run(() => {
if (isOpen && closeEl) {
closeEl.focus();
} else if (!isOpen && browser && document.activeElement === closeEl) {
let shouldFocusClose = $derived(isOpen && closeEl);
let shouldRefocusOpen = $derived(!isOpen && browser && document.activeElement === closeEl);
$effect(() => {
if (shouldFocusClose) {
closeEl?.focus();
} else if (shouldRefocusOpen) {
openEl?.focus();
}
});
Expand All @@ -54,13 +49,11 @@
aria-label="Open menu"
bind:this={openEl}><CarbonTextAlignJustify /></button
>
{#await title}
<div class="flex h-full items-center justify-center"></div>
{:then title}
<span class="truncate px-4">{title ?? ""}</span>
{/await}
<div class="flex h-full items-center justify-center">
<span class="truncate px-4" data-testid="chat-title">{title}</span>
</div>
<a
class:invisible={!$page.params.id}
class:invisible={!page.params?.id}
href="{base}/"
class="-mr-3 flex size-12 shrink-0 items-center justify-center text-lg"><IconNew /></a
>
Expand Down