Merge pull request #1848 from nextcloud/backport/1806/stable27

nextcloud · Aug 8, 2023 · f484a35 · f484a35
2 parents cbe906f + 07a1327
commit f484a35
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/js/viewer-main.js b/js/viewer-main.js
diff --git a/js/viewer-main.js.map b/js/viewer-main.js.map
diff --git a/src/views/Viewer.vue b/src/views/Viewer.vue
@@ -28,7 +28,7 @@
 		:data-handler="handlerId">
 		<component :is="currentFile.modal"
 			v-if="!currentFile.failed"
-			:key="currentFile.fileid"
+			:key="currentFile | uniqueKey"
 			ref="content"
 			:active="true"
 			:can-swipe="false"
@@ -115,7 +115,7 @@
 			<!-- PREVIOUS -->
 			<component :is="previousFile.modal"
 				v-if="previousFile && !previousFile.failed"
-				:key="previousFile.fileid"
+				:key="previousFile | uniqueKey"
 				ref="previous-content"
 				v-bind="previousFile"
 				:file-list="fileList"
@@ -128,7 +128,7 @@
 			<!-- CURRENT -->
 			<component :is="currentFile.modal"
 				v-if="!currentFile.failed"
-				:key="currentFile.fileid"
+				:key="currentFile | uniqueKey"
 				ref="content"
 				v-bind="currentFile"
 				:active="true"
@@ -147,7 +147,7 @@
 			<!-- NEXT -->
 			<component :is="nextFile.modal"
 				v-if="nextFile && !nextFile.failed"
-				:key="nextFile.fileid"
+				:key="nextFile | uniqueKey"
 				ref="next-content"
 				v-bind="nextFile"
 				:file-list="fileList"
@@ -207,6 +207,12 @@ export default {
 		Pencil,
 	},
 
+	filters: {
+		uniqueKey(file) {
+			return file.fileid || file.source
+		},
+	},
+
 	mixins: [isFullscreen, isMobile],
 
 	data() {