Merge pull request #2816 from nextcloud/perf/loading-order

Author: provokateurin

apps/viewer/apps/viewer/apps/viewer/src/views/Viewer.vue

@@ -693,6 +693,10 @@ export default defineComponent({
 			this.lightBackdrop = handler.theme === 'light' || (handler.theme === 'default' && defaultThemeIsLight)
 			this.handlerId = handler.id
 
+			this.currentFile = new File(fileInfo, mime, handler.component)
+			this.comparisonFile = null
+			this.updatePreviousNext()
+
 			// check if part of a group, if so retrieve full files list
 			const group = this.mimeGroups[mime]
 			if (this.files && this.files.length > 0) {
@@ -711,6 +715,10 @@ export default defineComponent({
 				const { request: folderRequest, cancel: cancelRequestFolder } = cancelableRequest(getFileList)
 				this.cancelRequestFolder = cancelRequestFolder
 				const [dirPath] = extractFilePaths(fileInfo.filename)
+
+				this.currentIndex = 0
+				this.fileList = [fileInfo]
+
 				const fileList = await folderRequest(dirPath)
 
 				// filter out the unwanted mimes
@@ -723,19 +731,12 @@ export default defineComponent({
 
 				// store current position
 				this.currentIndex = this.fileList.findIndex(file => file.filename === fileInfo.filename)
+				this.updatePreviousNext()
 			} else {
 				this.currentIndex = 0
 				this.fileList = [fileInfo]
 			}
 
-			// get saved fileInfo
-			fileInfo = this.fileList[this.currentIndex] ?? fileInfo
-
-			// show file
-			this.currentFile = new File(fileInfo, mime, handler.component)
-			this.comparisonFile = null
-			this.updatePreviousNext()
-
 			// if sidebar was opened before, let's update the file
 			this.changeSidebar()
 		},