Skip to content

High performance self-hosted photo and video management solution.

fix(web): Fix face thumbnail when swapping merge direction (#30466)

Lucas4082fbf232f9
diff --git a/web/src/lib/modals/PersonMergeSuggestionModal.svelte b/web/src/lib/modals/PersonMergeSuggestionModal.svelte
index 2f799c2939..94006ed5e7 100644
--- a/web/src/lib/modals/PersonMergeSuggestionModal.svelte
+++ b/web/src/lib/modals/PersonMergeSuggestionModal.svelte
@@ -63,13 +63,16 @@
<div class="flex items-center justify-center gap-2 py-4 md:h-36">
{#if !choosePersonToMerge}
<div class="flex size-20 items-center px-1 md:size-24 md:px-2">
- <ImageThumbnail
- circle
- shadow
- url={getPeopleThumbnailUrl(personToMerge)}
- altText={personToMerge.name}
- widthStyle="100%"
- />
+ <!-- Trigger a re-render on person change as <Image> captures only the first src -->
+ {#key personToMerge.id}
+ <ImageThumbnail
+ circle
+ shadow
+ url={getPeopleThumbnailUrl(personToMerge)}
+ altText={personToMerge.name}
+ widthStyle="100%"
+ />
+ {/key}
</div>
<div class="grid grid-rows-3">
@@ -101,14 +104,16 @@
}
}}
>
- <ImageThumbnail
- border={potentialMergePeople.length > 0}
- circle
- shadow
- url={getPeopleThumbnailUrl(personToBeMergedInto)}
- altText={personToBeMergedInto.name}
- widthStyle="100%"
- />
+ {#key personToBeMergedInto.id}
+ <ImageThumbnail
+ border={potentialMergePeople.length > 0}
+ circle
+ shadow
+ url={getPeopleThumbnailUrl(personToBeMergedInto)}
+ altText={personToBeMergedInto.name}
+ widthStyle="100%"
+ />
+ {/key}
</button>
{:else}
<div class="grid w-full grid-cols-1 gap-2">
diff --git a/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/FaceThumbnail.svelte b/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/FaceThumbnail.svelte
index 4a594ddce1..8f2f82e9b5 100644
--- a/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/FaceThumbnail.svelte
+++ b/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/FaceThumbnail.svelte
@@ -40,7 +40,10 @@
class:dark:border-immich-dark-primary={border}
class:border-immich-primary={border}
>
- <ImageThumbnail {circle} url={getPeopleThumbnailUrl(person)} altText={person.name} widthStyle="100%" shadow />
+ <!-- Trigger a re-render on person change as <Image> captures only the first src -->
+ {#key person.id}
+ <ImageThumbnail {circle} url={getPeopleThumbnailUrl(person)} altText={person.name} widthStyle="100%" shadow />
+ {/key}
</div>
<div