Merge pull request #45963 from nextcloud/artonge/fix/openfile

nextcloud · Jun 19, 2024 · 18cf61d · 18cf61d
2 parents 42fa007 + 59ea179
commit 18cf61d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
@@ -292,7 +292,7 @@ private function provideInitialState(string $dir, ?string $fileid): void {
 		}
 
 		$this->initialState->provideInitialState(
-			'openFileInfo', [
+			'fileInfo', [
 				'id' => $node->getId(),
 				'name' => $isRoot ? '' : $node->getName(),
 				'path' => $path,

diff --git a/apps/files/src/components/FilesListVirtual.vue b/apps/files/src/components/FilesListVirtual.vue
@@ -206,8 +206,7 @@ export default defineComponent({
 		const mainContent = window.document.querySelector('main.app-content') as HTMLElement
 		mainContent.addEventListener('dragover', this.onDragOver)
 
-		// handle initially opening a given file
-		const { id } = loadState<{ id?: number }>('files', 'openFileInfo', {})
+		const { id } = loadState<{ id?: number }>('files', 'fileInfo', {})
 		this.scrollToFile(id ?? this.fileId)
 		this.openSidebarForFile(id ?? this.fileId)
 		this.handleOpenFile(id ?? null)
@@ -248,6 +247,10 @@ export default defineComponent({
 		 * @param fileId File to open
 		 */
 		handleOpenFile(fileId: number|null) {
+			if (!this.openFile) {
+				return
+			}
+
 			if (fileId === null || this.openFileId === fileId) {
 				return
 			}

diff --git a/dist/files-main.js b/dist/files-main.js
diff --git a/dist/files-main.js.map b/dist/files-main.js.map