Merge pull request #1642 from nextcloud/backport/1640/stable25

Author: skjnldsv

js/viewer-main.js

@@ -55,7 +55,7 @@
 		:has-previous="hasPrevious"
 		:inline-actions="canEdit ? 1 : 0"
 		:spread-navigation="true"
-		:style="{ width: isSidebarShown ? `calc(100% - ${sidebarWidth}px)` : null }"
+		:style="{ width: isSidebarShown ? `${sidebarPosition}px` : null }"
 		:title="currentFile.basename"
 		:view="currentFile.modal"
 		class="viewer"
@@ -219,7 +219,7 @@ export default {
 			cancelRequestFolder: () => {},
 
 			// Flags
-			sidebarWidth: 0,
+			sidebarPosition: 0,
 			isSidebarShown: false,
 			canSwipe: true,
 			isStandalone: !(OCA && OCA.Files && 'fileActions' in OCA.Files),
@@ -921,21 +921,21 @@ export default {
 			this.isSidebarShown = true
 			const sidebar = document.querySelector('aside.app-sidebar')
 			if (sidebar) {
-				this.sidebarWidth = sidebar.offsetWidth
+				this.sidebarPosition = sidebar.getBoundingClientRect().left
 				this.trapElements = [sidebar]
 			}
+			this.updateSidebarPosition()
 		},
 
 		handleAppSidebarClose() {
 			this.isSidebarShown = false
 			this.trapElements = []
 		},
 
-		onResize(event) {
-			// update sidebar width
+		onResize() {
 			const sidebar = document.querySelector('aside.app-sidebar')
 			if (sidebar) {
-				this.sidebarWidth = sidebar.offsetWidth
+				this.sidebarPosition = sidebar.getBoundingClientRect().left
 			}
 		},