From 42780e4ed8d1cd1411b7ce204350de7456407e14 Mon Sep 17 00:00:00 2001
From: ildyria <beviguier@gmail.com>
Date: Fri, 29 Nov 2024 00:42:15 +0100
Subject: [PATCH] fixes layout justify

---
 .../js/components/headers/AlbumsHeader.vue    |  3 --
 resources/js/layouts/useJustify.ts            | 53 +++++++++++++++++--
 2 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/resources/js/components/headers/AlbumsHeader.vue b/resources/js/components/headers/AlbumsHeader.vue
index 4d53cadce68..c4ebe9091e0 100644
--- a/resources/js/components/headers/AlbumsHeader.vue
+++ b/resources/js/components/headers/AlbumsHeader.vue
@@ -82,8 +82,6 @@ import Button from "primevue/button";
 import SpeedDial from "primevue/speeddial";
 import Toolbar from "primevue/toolbar";
 import ContextMenu from "primevue/contextmenu";
-import WebauthnModal from "@/components/modals/WebauthnModal.vue";
-import LoginModal from "@/components/modals/LoginModal.vue";
 import ImportFromLink from "@/components/modals/ImportFromLink.vue";
 import ImportFromServer from "@/components/modals/ImportFromServer.vue";
 import { computed, ComputedRef, ref } from "vue";
@@ -95,7 +93,6 @@ import BackLinkButton from "./BackLinkButton.vue";
 import { useContextMenuAlbumsAdd } from "@/composables/contextMenus/contextMenuAlbumsAdd";
 import Divider from "primevue/divider";
 import { useGalleryModals } from "@/composables/modalsTriggers/galleryModals";
-import WebAuthnService from "@/services/webauthn-service";
 import { useRouter } from "vue-router";
 import DropBox from "../modals/DropBox.vue";
 import OpenLeftMenu from "./OpenLeftMenu.vue";
diff --git a/resources/js/layouts/useJustify.ts b/resources/js/layouts/useJustify.ts
index 8f1ebb006c1..13a27de0a1c 100644
--- a/resources/js/layouts/useJustify.ts
+++ b/resources/js/layouts/useJustify.ts
@@ -1,16 +1,17 @@
 import { TimelineData } from "./PhotoLayout";
 import { ChildNodeWithDataStyle } from "./types";
 import createJustifiedLayout from "justified-layout";
+import { isTouchDevice } from "@/utils/keybindings-utils";
 
 export function useJustify(el: HTMLElement, photoDefaultHeight: number = 320, timelineData: TimelineData) {
 	const baseElem = document.getElementById("lychee_view_content");
 	if (!baseElem) {
 		return;
 	}
-	const containerDefaultWidth = parseInt(getComputedStyle(baseElem).width) - 36 - (timelineData.isLeftBorderVisible ? 50 : 0);
-	const containerWidth = timelineData.isTimeline
-		? Math.min(parseInt(getComputedStyle(el).width), containerDefaultWidth)
-		: parseInt(getComputedStyle(el).width);
+
+	const width = getWidth(baseElem, el, timelineData);
+	// console.log("width")
+	// console.log(width)
 
 	// @ts-expect-error
 	const justifiedItems: ChildNodeWithDataStyle[] = [...el.childNodes].filter((gridItem) => gridItem.nodeType === 1);
@@ -21,7 +22,7 @@ export function useJustify(el: HTMLElement, photoDefaultHeight: number = 320, ti
 		return height > 0 ? width / height : 1;
 	});
 	const layoutGeometry = createJustifiedLayout(ratio, {
-		containerWidth: containerWidth,
+		containerWidth: width,
 		containerPadding: 0,
 		targetRowHeight: photoDefaultHeight,
 	});
@@ -41,3 +42,45 @@ export function useJustify(el: HTMLElement, photoDefaultHeight: number = 320, ti
 		e.style.left = layoutGeometry.boxes[i].left + "px";
 	});
 }
+
+function getWidth(baseElem: HTMLElement, el: HTMLElement, timelineData: TimelineData): number {
+	const styles = getComputedStyle(baseElem);
+	const padding = parseFloat(styles.paddingLeft) + parseFloat(styles.paddingRight);
+	const baseWidth = Math.floor(baseElem.offsetWidth - padding);
+	const widthEl = parseInt(getComputedStyle(el).width);
+	const paddingLeftRight = 2 * 18;
+
+	let scrollBarWidth = 15;
+	const galleryView = document.getElementById("galleryView");
+
+	if (scrollbarVisible(galleryView)) {
+		// It is already counted.
+		scrollBarWidth = 0;
+	}
+
+	if (isTouchDevice()) {
+		scrollBarWidth = 0;
+	}
+
+	// console.log("baseWidth - paddingLeftRight - scrollBarWidth")
+	// console.log(baseWidth - paddingLeftRight - scrollBarWidth)
+	// console.log("el.width")
+	// console.log(widthEl)
+
+	const width = Math.min(widthEl, baseWidth - paddingLeftRight - scrollBarWidth);
+
+	let timeLineBorder = 0;
+	if (timelineData.isTimeline.value === true && timelineData.isLeftBorderVisible.value === true) {
+		timeLineBorder = 50;
+	}
+
+	return width - timeLineBorder;
+}
+
+function scrollbarVisible(el: HTMLElement | null): boolean {
+	if (!el) {
+		return true;
+	}
+
+	return el.scrollHeight > el.clientHeight;
+}