From 6d430b44876d0eb9f74ad8bb98faf5b3492f6e05 Mon Sep 17 00:00:00 2001
From: madkarmaa <madkarma99@gmail.com>
Date: Wed, 19 Nov 2025 10:44:47 +0100
Subject: [PATCH] feat: keep modal hierarchy

---
 .../components/atoms/ModalBackground.svelte   | 28 +++++++++++
 src/lib/components/molecules/Modal.svelte     | 50 ++++++++++++-------
 src/lib/components/molecules/NavBar.svelte    | 23 ++++++++-
 src/lib/stores/modals.svelte.ts               | 37 ++++++++++++++
 src/routes/+layout.svelte                     |  4 ++
 svelte.config.js                              |  1 +
 6 files changed, 122 insertions(+), 21 deletions(-)
 create mode 100644 src/lib/components/atoms/ModalBackground.svelte
 create mode 100644 src/lib/stores/modals.svelte.ts

diff --git a/src/lib/components/atoms/ModalBackground.svelte b/src/lib/components/atoms/ModalBackground.svelte
new file mode 100644
index 0000000..ea710e8
--- /dev/null
+++ b/src/lib/components/atoms/ModalBackground.svelte
@@ -0,0 +1,28 @@
+<script lang="ts">
+	import { modalsStack } from '$stores/modals.svelte';
+	import { fade } from 'svelte/transition';
+
+	let hasModals = $derived(modalsStack.getStack().length > 0);
+</script>
+
+{#if hasModals}
+	<!-- svelte-ignore a11y_no_static_element_interactions -->
+	<!-- svelte-ignore a11y_click_events_have_key_events -->
+	<div
+		class="modal-background"
+		transition:fade={{ duration: 300 }}
+		onclick={() => modalsStack.closeTop()}
+	></div>
+{/if}
+
+<style>
+	.modal-background {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100vw;
+		height: 100vh;
+		background: rgba(0, 0, 0, 0.3);
+		z-index: 9998;
+	}
+</style>
diff --git a/src/lib/components/molecules/Modal.svelte b/src/lib/components/molecules/Modal.svelte
index 965410b..d9ead50 100644
--- a/src/lib/components/molecules/Modal.svelte
+++ b/src/lib/components/molecules/Modal.svelte
@@ -1,15 +1,35 @@
 <script lang="ts">
-	import type { WithChildren } from '$types';
 	import type { Snippet } from 'svelte';
+	import type { WithChildren } from '$types';
+	import { modalsStack } from '$stores/modals.svelte';
+	import { fade } from 'svelte/transition';
 
 	type Props = {
+		id: string;
+		open?: boolean;
 		buttons?: Snippet;
 	} & WithChildren;
-	let { buttons, children }: Props = $props();
+	let { id, buttons, children, open = $bindable(true) }: Props = $props();
+
+	let isTopModal = $derived(modalsStack.isTopModal(id));
+
+	$effect(() => {
+		if (open)
+			modalsStack.push(id, () => {
+				open = false;
+			});
+		else modalsStack.pop(id);
+	});
 </script>
 
-<div class="background">
-	<div class="modal rounded">
+{#if isTopModal}
+	<!-- svelte-ignore a11y_no_static_element_interactions -->
+	<!-- svelte-ignore a11y_click_events_have_key_events -->
+	<dialog
+		class="modal rounded"
+		transition:fade={{ duration: 300 }}
+		onclick={(e) => e.stopPropagation()}
+	>
 		<div class="content">
 			{@render children()}
 		</div>
@@ -18,24 +38,15 @@
 				{@render buttons()}
 			</div>
 		{/if}
-	</div>
-</div>
+	</dialog>
+{/if}
 
 <style>
-	.background {
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100vw;
-		height: 100vh;
-		background: rgba(0, 0, 0, 0.3);
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		z-index: 9999;
-	}
-
 	.modal {
+		position: fixed;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
 		padding: 2rem;
 		max-width: 90vw;
 		max-height: 90vh;
@@ -43,6 +54,7 @@
 		display: flex;
 		flex-direction: column;
 		gap: 1.5rem;
+		z-index: 9999;
 	}
 
 	.content {
diff --git a/src/lib/components/molecules/NavBar.svelte b/src/lib/components/molecules/NavBar.svelte
index 53ebc4f..a8bb0da 100644
--- a/src/lib/components/molecules/NavBar.svelte
+++ b/src/lib/components/molecules/NavBar.svelte
@@ -3,6 +3,7 @@
 	import logo from '$assets/logo.svg';
 	import Notifications from 'virtual:icons/material-symbols/notifications-outline';
 	import Settings from 'virtual:icons/material-symbols/settings-outline';
+	import Modal from '$components/molecules/Modal.svelte';
 
 	const navItems = [
 		{ label: 'Home', href: '/' },
@@ -11,6 +12,9 @@
 		{ label: 'Contributors', href: '/contributors' },
 		{ label: 'Donate', href: '/donate' }
 	] as const satisfies { label: string; href: string }[];
+
+	let settingsOpen = $state(false);
+	let loginOpen = $state(false);
 </script>
 
 <nav>
@@ -32,10 +36,25 @@
 			class="rounded nav-button unselectable"
 			class:active={page.url.pathname === '/announcements'}><Notifications /></a
 		>
-		<button class="rounded nav-button unselectable" type="button"><Settings /></button>
+		<button
+			class="rounded nav-button unselectable"
+			type="button"
+			onclick={() => (settingsOpen = true)}><Settings /></button
+		>
 	</div>
 </nav>
 
+<Modal id="settings" bind:open={settingsOpen}>
+	<h2>Settings</h2>
+	{#snippet buttons()}
+		<button type="button" onclick={() => (loginOpen = true)}>Login</button>
+	{/snippet}
+</Modal>
+
+<Modal id="login" bind:open={loginOpen}>
+	<h2>Login</h2>
+</Modal>
+
 <style>
 	nav {
 		display: flex;
@@ -46,7 +65,7 @@
 		position: sticky;
 		top: 0;
 		left: 0;
-		z-index: 9998;
+		z-index: 9997;
 	}
 
 	.nav-group {
diff --git a/src/lib/stores/modals.svelte.ts b/src/lib/stores/modals.svelte.ts
new file mode 100644
index 0000000..3fda244
--- /dev/null
+++ b/src/lib/stores/modals.svelte.ts
@@ -0,0 +1,37 @@
+import { SvelteMap } from 'svelte/reactivity';
+
+class ModalStack {
+	private stack = $state<string[]>([]);
+	private modals = new SvelteMap<string, () => void>();
+
+	push(id: string, closeCallback: () => void) {
+		if (!this.modals.has(id)) {
+			this.stack.push(id);
+			this.modals.set(id, closeCallback);
+		}
+	}
+
+	pop(id: string) {
+		const index = this.stack.indexOf(id);
+		if (index !== -1) {
+			this.stack.splice(index, 1);
+			this.modals.delete(id);
+		}
+	}
+
+	closeTop() {
+		if (this.stack.length < 0) return;
+		const topId = this.stack[this.stack.length - 1];
+		this.modals.get(topId)?.();
+	}
+
+	isTopModal(id: string): boolean {
+		return this.stack.length > 0 && this.stack[this.stack.length - 1] === id;
+	}
+
+	getStack(): readonly string[] {
+		return this.stack;
+	}
+}
+
+export const modalsStack = new ModalStack();
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 19ca9ed..e132722 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -2,6 +2,7 @@
 	import '../app.css';
 	import favicon from '$assets/favicon.ico';
 	import NavBar from '$components/molecules/NavBar.svelte';
+	import ModalBackground from '$components/atoms/ModalBackground.svelte';
 	import type { WithChildren } from '$types';
 
 	let { children }: WithChildren = $props();
@@ -12,4 +13,7 @@
 </svelte:head>
 
 <NavBar />
+
+<ModalBackground />
+
 {@render children()}
diff --git a/svelte.config.js b/svelte.config.js
index a5f4084..64c0605 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -12,6 +12,7 @@ const config = {
 			$components: 'src/lib/components',
 			$assets: 'src/lib/assets',
 			$types: 'src/lib/types.ts',
+			$stores: 'src/lib/stores',
 			$lib: 'src/lib'
 		}
 	}