fix(Viewer): fix taking sidebar position in fullscreen mode

nextcloud · Jun 8, 2023 · 5730cc6 · 5730cc6
1 parent 4794a82
commit 5730cc6
Show file tree

Hide file tree

Showing 12 changed files with 162,660 additions and 218 deletions.
diff --git a/js/viewer-components.js b/js/viewer-components.js
diff --git a/js/viewer-components.js.LICENSE.txt b/js/viewer-components.js.LICENSE.txt
diff --git a/js/viewer-components.js.map b/js/viewer-components.js.map
diff --git a/js/viewer-filerobot.js b/js/viewer-filerobot.js
diff --git a/js/viewer-filerobot.js.LICENSE.txt b/js/viewer-filerobot.js.LICENSE.txt
diff --git a/js/viewer-filerobot.js.map b/js/viewer-filerobot.js.map
diff --git a/js/viewer-main.js b/js/viewer-main.js
diff --git a/js/viewer-main.js.LICENSE.txt b/js/viewer-main.js.LICENSE.txt
diff --git a/js/viewer-main.js.map b/js/viewer-main.js.map
diff --git a/js/viewer-plyr.js b/js/viewer-plyr.js
diff --git a/js/viewer-plyr.js.map b/js/viewer-plyr.js.map
diff --git a/src/views/Viewer.vue b/src/views/Viewer.vue
@@ -493,7 +493,6 @@ export default {
 		beforeOpen() {
 			// initial loading start
 			this.initiated = true
-
 			if (OCA?.Files?.Sidebar?.setFullScreenMode) {
 				OCA.Files.Sidebar.setFullScreenMode(true)
 			}
@@ -941,24 +940,30 @@ export default {
 			this.nextFile.failed = true
 		},
 
+		takeSidebarPosition() {
+			const sidebarElement = document.querySelector('aside.app-sidebar')
+			this.sidebarPosition = sidebarElement?.getBoundingClientRect().left
+		},
+
 		/**
 		 * Show the sharing sidebar
 		 */
-
 		async showSidebar() {
 			// Open the sidebar sharing tab
 			// TODO: also hide figure, needs a proper method for it in server Sidebar
-
 			if (OCA?.Files?.Sidebar) {
 				await OCA.Files.Sidebar.open(this.sidebarOpenFilePath)
+				// If OCA.Files.Sidebar has isFullScreenMode on, the sidebar is moved only after file loading
+				// So we need to take its new position after the loading
+				this.takeSidebarPosition()
 			}
 		},
 
 		handleAppSidebarOpen() {
 			this.isSidebarShown = true
+			this.takeSidebarPosition()
 			const sidebar = document.querySelector('aside.app-sidebar')
 			if (sidebar) {
-				this.sidebarPosition = sidebar.getBoundingClientRect().left
 				this.trapElements = [sidebar]
 			}
 		},
@@ -969,10 +974,7 @@ export default {
 		},
 
 		onResize() {
-			const sidebar = document.querySelector('aside.app-sidebar')
-			if (sidebar) {
-				this.sidebarPosition = sidebar.getBoundingClientRect().left
-			}
+			this.takeSidebarPosition()
 		},
 
 		async onDelete() {