Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 3a77f30f authored by Christoph Wurst's avatar Christoph Wurst Committed by GitHub
Browse files

Merge pull request #3545 from nextcloud/backport/3533/stable2.3

[stable2.3] Fix avatars not being reactive in invitee search
parents df0b6b92 3fd0230f
Loading
Loading
Loading
Loading
+18 −3
Original line number Diff line number Diff line
@@ -32,14 +32,24 @@
		:placeholder="placeholder"
		:class="{ 'showContent': inputGiven, 'icon-loading': isLoading }"
		open-direction="bottom"
		track-by="email"
		track-by="uid"
		label="dropdownName"
		@search-change="findAttendees"
		@select="addAttendee">
		<template #option="{ option }">
			<div class="invitees-search-list-item">
				<Avatar v-if="option.isUser" :user="option.avatar" :display-name="option.dropdownName" />
				<Avatar v-if="!option.isUser" :url="option.avatar" :display-name="option.dropdownName" />
				<!-- We need to specify a unique key here for the avatar to be reactive. -->
				<Avatar
					v-if="option.isUser"
					:key="option.uid"
					:user="option.avatar"
					:display-name="option.dropdownName" />
				<Avatar
					v-else
					:key="option.uid"
					:url="option.avatar"
					:display-name="option.dropdownName" />

				<div class="invitees-search-list-item__label invitees-search-list-item__label--with-multiple-email">
					<div>
						{{ option.dropdownName }}
@@ -123,6 +133,11 @@ export default {
					}
				}

				// Generate a unique id for every result to make the avatar components reactive
				for (const match of matches) {
					match.uid = Math.random().toString(16).slice(2)
				}

				this.isLoading = false
				this.inputGiven = true
			} else {