Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[web][albums] Restore compact mobile padding

AswinAsokec6a37dbf0c2
diff --git a/web/apps/albums/src/public-album/components/FileList.tsx b/web/apps/albums/src/public-album/components/FileList.tsx
index 4744706496..16c9980987 100644
--- a/web/apps/albums/src/public-album/components/FileList.tsx
+++ b/web/apps/albums/src/public-album/components/FileList.tsx
@@ -147,7 +147,10 @@ export const FileList: React.FC<FileListProps> = ({
const outerRef = useRef<HTMLDivElement | null>(null);
const layoutParams = useMemo(
- () => computeThumbnailGridLayoutParams(width),
+ () =>
+ computeThumbnailGridLayoutParams(width, {
+ smallLayoutPadding: thumbnailGap,
+ }),
[width],
);
const shouldUseMasonry = layout === "masonry";
diff --git a/web/packages/new/photos/components/utils/thumbnail-grid-layout.ts b/web/packages/new/photos/components/utils/thumbnail-grid-layout.ts
index 2d737fe440..302f6f9bee 100644
--- a/web/packages/new/photos/components/utils/thumbnail-grid-layout.ts
+++ b/web/packages/new/photos/components/utils/thumbnail-grid-layout.ts
@@ -16,20 +16,28 @@ export interface ThumbnailGridLayoutParams {
export const computeThumbnailGridLayoutParams = (
containerWidth: number,
+ {
+ smallLayoutPadding = thumbnailGridPadding,
+ }: { smallLayoutPadding?: number } = {},
): ThumbnailGridLayoutParams => {
const isSmallerLayout = !(
containerWidth >
thumbnailLayoutMinColumns * thumbnailMaxWidth
);
- const paddingInline = thumbnailGridPadding;
- const fittableColumns = getFractionFittableColumns(containerWidth);
+ const paddingInline = isSmallerLayout
+ ? smallLayoutPadding
+ : thumbnailGridPadding;
+ const fittableColumns = getFractionFittableColumns(
+ containerWidth,
+ paddingInline,
+ );
let columns = Math.floor(fittableColumns);
if (columns < thumbnailLayoutMinColumns) {
columns = thumbnailLayoutMinColumns;
}
- const shrinkRatio = getShrinkRatio(containerWidth, columns);
+ const shrinkRatio = getShrinkRatio(containerWidth, columns, paddingInline);
const itemHeight = thumbnailMaxHeight * shrinkRatio;
const itemWidth = thumbnailMaxWidth * shrinkRatio;
const gap = thumbnailGap;
@@ -45,10 +53,17 @@ export const computeThumbnailGridLayoutParams = (
};
};
-const getFractionFittableColumns = (width: number): number =>
- (width - 2 * thumbnailGridPadding + thumbnailGap) /
+const getFractionFittableColumns = (
+ width: number,
+ paddingInline: number,
+): number =>
+ (width - 2 * paddingInline + thumbnailGap) /
(thumbnailMaxWidth + thumbnailGap);
-const getShrinkRatio = (width: number, columns: number) =>
- (width - 2 * thumbnailGridPadding - (columns - 1) * thumbnailGap) /
+const getShrinkRatio = (
+ width: number,
+ columns: number,
+ paddingInline: number,
+) =>
+ (width - 2 * paddingInline - (columns - 1) * thumbnailGap) /
(columns * thumbnailMaxWidth);