Merge branch 'main' into dependabot/npm_and_yarn/svelte-5.16.5

Author: maxfriedmann

src/lib/modules/modals/ModalContainer.svelte

@@ -2,6 +2,7 @@
 	import { onMount, type Component } from "svelte";
 	import { fly } from "svelte/transition";
 	import { modalService, type ModalOptions } from "./modal.service.svelte";
+	import { asyncHandler } from "../utils";
 
 	interface ModalStackItem {
 		component: Component;
@@ -73,7 +74,7 @@
 					</div>
 				{/if}
 				<div class="flex-grow">
-					{#if currentModal?.options.title}
+					{#if currentModal?.options?.title}
 						<div>{currentModal.options.title}</div>
 					{/if}
 				</div>
@@ -88,6 +89,18 @@
 						transition:fly={{ x: modalStackLength > 1 ? "100%" : "0" }}
 					>
 						<svelte:component this={modal.component} {...modal.options?.data} />
+						{#if modal.options?.buttons}
+							<div class="dialog-actions">
+								{#each modal.options.buttons as button}
+									<button
+										class="btn btn-{button.color}"
+										use:asyncHandler={() =>
+											button.onClick({ closeModal: () => modalService.closeModal() })}
+										>{button.text}</button
+									>
+								{/each}
+							</div>
+						{/if}
 					</div>
 				{/each}
 			</div>

src/lib/modules/modals/modal.service.svelte.ts

@@ -38,6 +38,7 @@ export interface ModalOptions<RETURN_TYPE = any> {
 	closeDialog?: (data?: RETURN_TYPE) => void | Promise<void>;
 	/** if set, the given prop will automatically passed to the component as the closing function */
 	closingPropName?: string;
+	buttons?: ModalButton[];
 }
 
 export interface ModalComponent {

src/lib/modules/navigation/Navbar.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
-	import { type AppShellNavbarOptions } from "./app-shell-options.js";
 	import { t } from "$lib/stores/i18n.store.js";
+	import { type AppShellNavbarOptions } from "./app-shell-options.js";
 	let { options }: { options?: AppShellNavbarOptions } = $props();
 </script>
 
@@ -22,9 +22,19 @@
 	<div class="flex flex-row gap-8 items-center">
 		{#if options?.showNavigation !== false}
 			{#each options?.navigation.entries as entry}
-				<a class="border-b-2 menu-entry" href={entry.link}>
-					{$t(entry.text)}
-				</a>
+				{#if entry.link}
+					<a class="border-b-2 menu-entry" href={entry.link}>
+						{$t(entry.text)}
+					</a>
+				{:else if entry.clickFn}
+					<!-- svelte-ignore a11y_click_events_have_key_events -->
+					<!-- svelte-ignore a11y_no_static_element_interactions -->
+					<div class="border-b-2 menu-entry" onclick={() => entry.clickFn()}>
+						{$t(entry.text)}
+					</div>
+				{:else}
+					<div>{$t(entry.text)}</div>
+				{/if}
 			{/each}
 		{/if}
 	</div>

src/lib/modules/navigation/app-shell-options.test.ts

@@ -1,5 +1,10 @@
 import { describe, expect, it } from "vitest";
-import { filterAuthorizedNavigation } from "./app-shell-options.js";
+import {
+	type AppShellNavbarOptions,
+	filterAuthorizedNavigation,
+	getComputedOptions,
+	type AppShellOptions
+} from "./app-shell-options.js";
 
 describe("AppShellOptions", () => {
 	it("should filter navigation entries based on permissions", () => {
@@ -29,4 +34,31 @@ describe("AppShellOptions", () => {
 		expect(filteredNavigation.entries[1].text).toBe("Entry 3");
 		expect(filteredNavigation.entries[2].text).toBe("Entry 4");
 	});
+
+	it("should compute properties properly", () => {
+		const options: AppShellOptions = {
+			bgColor: "primary",
+			textColor: "primary-content",
+			navbar: {
+				show: true,
+				navigation: {
+					entries: [
+						{
+							text: "Test",
+							clickFn: () => {
+								console.log("yeah");
+							}
+						}
+					]
+				},
+				height: 64
+			}
+		};
+
+		expect(getComputedOptions<AppShellNavbarOptions>(options, "navbar").bgColor).toBe("primary");
+		expect(
+			typeof getComputedOptions<AppShellNavbarOptions>(options, "navbar").navigation.entries[0]
+				.clickFn
+		).toBe("function");
+	});
 });

src/lib/modules/navigation/app-shell-options.ts

@@ -100,12 +100,11 @@ export function filterAuthorizedNavigation(
 
 export function getComputedOptions<T>(options: AppShellOptions, navigationProp: string): T {
 	if (!(navigationProp in options)) throw new Error("property " + navigationProp + " not found");
-	const clonedOptions = JSON.parse(JSON.stringify(options));
-	const base = clonedOptions[navigationProp];
+	const base = options[navigationProp];
 
 	function useGlobalValue(propName: string): void {
 		if (base[propName] === undefined && base[propName] !== null)
-			base[propName] = clonedOptions[propName];
+			base[propName] = options[propName];
 	}
 	useGlobalValue("logoUrl");
 	useGlobalValue("title");
@@ -117,7 +116,7 @@ export function getComputedOptions<T>(options: AppShellOptions, navigationProp:
 	if (base.navigation) {
 		base.navigation = filterAuthorizedNavigation(
 			base.navigation,
-			clonedOptions.availablePermissions
+			options.availablePermissions
 		);
 	}
 

src/routes/robots.txt/+server.ts

@@ -0,0 +1,8 @@
+import { text } from "@sveltejs/kit";
+import type { RequestHandler } from "./$types";
+
+export const GET: RequestHandler = async () => {
+	// robots.txt allow everything, follow every path
+	return text(`User-agent: *
+Disallow:`);
+};