From c1b0e4a692d1e7865c2088496ae4b5a82502a077 Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Mon, 13 Apr 2026 16:01:52 +0200
Subject: [PATCH] fix: modal positioning (#5796)

---
 packages/ui/src/components/modal/NewModal.vue | 52 +++++++++----------
 .../ui/src/components/modal/ShareModal.vue    |  7 +++
 .../server-settings/pages/installation.vue    |  6 +++
 .../wrapped/hosting/manage/overview.vue       |  2 +-
 4 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/packages/ui/src/components/modal/NewModal.vue b/packages/ui/src/components/modal/NewModal.vue
index e90d146b7..fb05ab81f 100644
--- a/packages/ui/src/components/modal/NewModal.vue
+++ b/packages/ui/src/components/modal/NewModal.vue
@@ -1,9 +1,6 @@
 <template>
 	<Teleport to="body">
-		<div
-			v-if="open"
-			:style="`${mouseX !== -1 ? `--_mouse-x: ${mouseX};` : ''} ${mouseY !== -1 ? `--_mouse-y: ${mouseY};` : ''}`"
-		>
+		<div v-if="open" class="modal-root">
 			<div
 				:class="{ shown: visible }"
 				class="tauri-overlay"
@@ -21,14 +18,7 @@
 				]"
 				@click="() => (closeOnClickOutside && closable ? hide() : {})"
 			/>
-			<div
-				class="modal-container experimental-styles-within"
-				:class="{ shown: visible }"
-				:style="{
-					'--_max-width': maxWidth,
-					'--_width': width,
-				}"
-			>
+			<div class="modal-container experimental-styles-within" :class="{ shown: visible }">
 				<div
 					ref="modalBodyRef"
 					role="dialog"
@@ -223,6 +213,7 @@ const closeLabel = computed(() => formatMessage(commonMessages.closeButton))
 
 const open = ref(false)
 const visible = ref(false)
+const stackDepth = ref(0)
 const modalBodyRef = ref<HTMLElement | null>(null)
 let previousFocusEl: Element | null = null
 
@@ -240,6 +231,7 @@ function getFocusableElements(): HTMLElement[] {
 function show(event?: MouseEvent) {
 	props.onShow?.()
 	const wasEmpty = modalStackSize() === 0
+	stackDepth.value = modalStackSize()
 	open.value = true
 	previousFocusEl = document.activeElement
 	pushModal()
@@ -251,8 +243,8 @@ function show(event?: MouseEvent) {
 	if (event) {
 		updateMousePosition(event)
 	} else {
-		mouseX.value = window.innerWidth / 2
-		mouseY.value = window.innerHeight / 2
+		mouseX.value = Math.round(window.innerWidth / 2)
+		mouseY.value = Math.round(window.innerHeight / 2)
 	}
 	setTimeout(() => {
 		visible.value = true
@@ -293,8 +285,17 @@ defineExpose({
 	checkScrollState,
 })
 
-const mouseX = ref(-1)
-const mouseY = ref(-1)
+const mouseX = ref(0)
+const mouseY = ref(0)
+
+const stackZBase = computed(() => stackDepth.value * 10)
+const stackOverlayZ = computed(() => stackZBase.value + 19)
+const stackTauriZ = computed(() => stackZBase.value + 20)
+const stackContainerZ = computed(() => stackZBase.value + 21)
+const resolvedMaxWidth = computed(() => props.maxWidth ?? '60rem')
+const resolvedWidth = computed(() => props.width ?? 'fit-content')
+const mouseXOffset = computed(() => `calc((-50vw + ${mouseX.value}px) / 16)`)
+const mouseYOffset = computed(() => `calc((-50vh + ${mouseY.value}px) / 16)`)
 
 function updateMousePosition(event: { clientX: number; clientY: number }) {
 	mouseX.value = event.clientX
@@ -317,8 +318,8 @@ function handleWindowKeyDown(event: KeyboardEvent) {
 	if (props.closeOnEsc && event.key === 'Escape' && props.closable) {
 		if (!isTopmostModal()) return
 		hide()
-		mouseX.value = window.innerWidth / 2
-		mouseY.value = window.innerHeight / 2
+		mouseX.value = Math.round(window.innerWidth / 2)
+		mouseY.value = Math.round(window.innerHeight / 2)
 	}
 }
 
@@ -353,7 +354,7 @@ function handleKeyDown(event: KeyboardEvent) {
 	left: 0;
 	width: 100%;
 	height: 100px;
-	z-index: 20;
+	z-index: v-bind(stackTauriZ);
 
 	&.shown {
 		opacity: 1;
@@ -364,7 +365,7 @@ function handleKeyDown(event: KeyboardEvent) {
 .modal-overlay {
 	position: fixed;
 	inset: -5rem;
-	z-index: 19;
+	z-index: v-bind(stackOverlayZ);
 	opacity: 0;
 	transition: all 0.2s ease-out;
 	//transform: translate(
@@ -419,13 +420,10 @@ function handleKeyDown(event: KeyboardEvent) {
 	display: flex;
 	justify-content: center;
 	align-items: center;
-	z-index: 21;
+	z-index: v-bind(stackContainerZ);
 	visibility: hidden;
 	pointer-events: none;
-	transform: translate(
-		calc((-50vw + var(--_mouse-x, 50vw) * 1px) / 16),
-		calc((-50vh + var(--_mouse-y, 50vh) * 1px) / 16)
-	);
+	transform: translate(v-bind(mouseXOffset), v-bind(mouseYOffset));
 	transition: all 0.2s ease-out;
 
 	&.shown {
@@ -443,10 +441,10 @@ function handleKeyDown(event: KeyboardEvent) {
 		position: fixed;
 		box-shadow: 4px 4px 26px 10px rgba(0, 0, 0, 0.08);
 		max-height: calc(100% - 2 * var(--gap-lg));
-		max-width: min(var(--_max-width, 60rem), calc(100% - 2 * var(--gap-lg)));
+		max-width: min(v-bind(resolvedMaxWidth), calc(100% - 2 * var(--gap-lg)));
 		overflow-y: hidden;
 		overflow-x: hidden;
-		width: var(--_width, fit-content);
+		width: v-bind(resolvedWidth);
 		pointer-events: auto;
 		scale: 0.97;
 
diff --git a/packages/ui/src/components/modal/ShareModal.vue b/packages/ui/src/components/modal/ShareModal.vue
index 205fe957d..1cd49e8a5 100644
--- a/packages/ui/src/components/modal/ShareModal.vue
+++ b/packages/ui/src/components/modal/ShareModal.vue
@@ -1,6 +1,7 @@
 <script setup>
 import {
 	ClipboardCopyIcon,
+	ExternalIcon,
 	GlobeIcon,
 	MailIcon,
 	MastodonIcon,
@@ -192,6 +193,12 @@ defineExpose({
 						<ClipboardCopyIcon class="h-5 w-5" aria-hidden="true" />
 					</div>
 				</button>
+				<ButtonStyled v-if="link">
+					<a :href="url" target="_blank" rel="noopener noreferrer" aria-label="Open in new tab">
+						<ExternalIcon aria-hidden="true" />
+						Open in new tab
+					</a>
+				</ButtonStyled>
 				<div v-if="socialButtons" class="flex flex-row gap-2">
 					<Button v-if="canShare" v-tooltip="'Share'" aria-label="Share" icon-only @click="share">
 						<ShareIcon aria-hidden="true" />
diff --git a/packages/ui/src/layouts/shared/server-settings/pages/installation.vue b/packages/ui/src/layouts/shared/server-settings/pages/installation.vue
index 40858d0b5..dd31d60fe 100644
--- a/packages/ui/src/layouts/shared/server-settings/pages/installation.vue
+++ b/packages/ui/src/layouts/shared/server-settings/pages/installation.vue
@@ -849,6 +849,12 @@ async function confirmResetToOnboarding() {
 	try {
 		isResettingToOnboarding.value = true
 		await client.archon.servers_v1.resetToOnboarding(serverId, worldId.value)
+		modrinthServersConsole.clear()
+		try {
+			await client.kyros.logs_v1.clear()
+		} catch (error) {
+			console.error('Failed to clear server logs:', error)
+		}
 		server.value.flows = { intro: true }
 		await Promise.all([
 			queryClient.invalidateQueries({ queryKey: ['servers', 'detail', serverId] }),
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/overview.vue b/packages/ui/src/layouts/wrapped/hosting/manage/overview.vue
index 16debb0ee..8c248f245 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/overview.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/overview.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="relative flex select-none flex-col gap-6" data-pyro-server-manager-root>
-		<div class="flex flex-col-reverse gap-6 md:flex-col">
+		<div class="flex flex-col gap-6">
 			<ServerManageStats
 				:data="!isWsAuthIncorrect ? stats : undefined"
 				:loading="isWsAuthIncorrect"