From 1c293a27594086cce624dfb2b444b289bb0518b9 Mon Sep 17 00:00:00 2001
From: Michel Heusschen <59014050+michelheusschen@users.noreply.github.com>
Date: Thu, 25 May 2023 18:48:36 +0200
Subject: [PATCH] fix(web): back button on person page (#2566)

---
 .../routes/(user)/people/[personId]/+page.svelte   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/web/src/routes/(user)/people/[personId]/+page.svelte b/web/src/routes/(user)/people/[personId]/+page.svelte
index 3b0cbe75fd..91f7462d72 100644
--- a/web/src/routes/(user)/people/[personId]/+page.svelte
+++ b/web/src/routes/(user)/people/[personId]/+page.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { goto } from '$app/navigation';
+	import { afterNavigate, goto } from '$app/navigation';
+	import { page } from '$app/stores';
 	import ImageThumbnail from '$lib/components/assets/thumbnail/image-thumbnail.svelte';
 	import EditNameInput from '$lib/components/faces-page/edit-name-input.svelte';
 	import CreateSharedLink from '$lib/components/photos-page/actions/create-shared-link.svelte';
@@ -22,10 +23,17 @@
 	export let data: PageData;
 
 	let isEditName = false;
-
 	let multiSelectAsset: Set<AssetResponseDto> = new Set();
+	let previousRoute: string = AppRoute.EXPLORE;
 	$: isMultiSelectionMode = multiSelectAsset.size > 0;
 
+	afterNavigate(({ from }) => {
+		// Prevent setting previousRoute to the current page.
+		if (from && from.route.id !== $page.route.id) {
+			previousRoute = from.url.href;
+		}
+	});
+
 	const handleNameChange = async (name: string) => {
 		try {
 			isEditName = false;
@@ -60,7 +68,7 @@
 	<ControlAppBar
 		showBackButton
 		backIcon={ArrowLeft}
-		on:close-button-click={() => goto(AppRoute.EXPLORE)}
+		on:close-button-click={() => goto(previousRoute)}
 	/>
 {/if}