π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[web][photos] Configure thumbnail sizing in shared layout helper
AswinAsokd96e8713a2c0
diff --git a/web/apps/photos/src/components/FileList.tsx b/web/apps/photos/src/components/FileList.tsxindex 15daeba849..b1eee685ad 100644--- a/web/apps/photos/src/components/FileList.tsx+++ b/web/apps/photos/src/components/FileList.tsx@@ -17,7 +17,6 @@ import {handleSelectCreator,handleSelectCreatorMulti,} from "@/utils/photoFrame";-import { computePhotosThumbnailGridLayoutParams } from "@/utils/thumbnail-grid-layout";import { StarIcon } from "@hugeicons/core-free-icons";import { HugeiconsIcon } from "@hugeicons/react";import AlbumOutlinedIcon from "@mui/icons-material/AlbumOutlined";@@ -40,6 +39,7 @@ import {} from "ente-new/photos/components/PlaceholderThumbnails";import { TileBottomTextOverlay } from "ente-new/photos/components/Tiles";import {+ computeThumbnailGridLayoutParams,thumbnailGap,type ThumbnailGridLayoutParams,} from "ente-new/photos/components/utils/thumbnail-grid-layout";@@ -187,7 +187,10 @@ export const FileList: React.FC<FileListProps> = ({const outerRef = useRef<HTMLDivElement | null>(null);const layoutParams = useMemo(- () => computePhotosThumbnailGridLayoutParams(width),+ () =>+ computeThumbnailGridLayoutParams(width, {+ fixedThumbnailSize: 200,+ }),[width],);diff --git a/web/apps/photos/src/utils/thumbnail-grid-layout.ts b/web/apps/photos/src/utils/thumbnail-grid-layout.tsdeleted file mode 100644index 2f18a0af62..0000000000--- a/web/apps/photos/src/utils/thumbnail-grid-layout.ts+++ /dev/null@@ -1,38 +0,0 @@-import {- thumbnailGap,- thumbnailGridPadding,- type ThumbnailGridLayoutParams,-} from "ente-new/photos/components/utils/thumbnail-grid-layout";--const thumbnailSize = 200;-const minimumColumns = 4;--/** Photos uses fixed-size thumbnails, shrinking only on narrow layouts. */-export const computePhotosThumbnailGridLayoutParams = (- containerWidth: number,-): ThumbnailGridLayoutParams => {- const availableWidth = Math.max(- 0,- containerWidth - 2 * thumbnailGridPadding,- );- const columns = Math.max(- minimumColumns,- Math.floor(- (availableWidth + thumbnailGap) / (thumbnailSize + thumbnailGap),- ),- );- const itemSize = Math.min(- thumbnailSize,- Math.max(0, (availableWidth - (columns - 1) * thumbnailGap) / columns),- );-- return {- containerWidth,- isSmallerLayout: itemSize < thumbnailSize,- paddingInline: thumbnailGridPadding,- columns,- itemWidth: itemSize,- itemHeight: itemSize,- gap: thumbnailGap,- };-};diff --git a/web/packages/new/photos/components/utils/thumbnail-grid-layout.ts b/web/packages/new/photos/components/utils/thumbnail-grid-layout.tsindex 2d737fe440..5811de8a50 100644--- a/web/packages/new/photos/components/utils/thumbnail-grid-layout.ts+++ b/web/packages/new/photos/components/utils/thumbnail-grid-layout.ts@@ -1,6 +1,5 @@export const thumbnailGap = 4;export const thumbnailGridPadding = 24;-const thumbnailMaxHeight = 180;const thumbnailMaxWidth = 180;const thumbnailLayoutMinColumns = 4;@@ -16,22 +15,30 @@ export interface ThumbnailGridLayoutParams {export const computeThumbnailGridLayoutParams = (containerWidth: number,+ { fixedThumbnailSize }: { fixedThumbnailSize?: number } = {},): ThumbnailGridLayoutParams => {- const isSmallerLayout = !(- containerWidth >- thumbnailLayoutMinColumns * thumbnailMaxWidth- );const paddingInline = thumbnailGridPadding;- const fittableColumns = getFractionFittableColumns(containerWidth);+ const targetSize = fixedThumbnailSize ?? thumbnailMaxWidth;+ const availableWidth = containerWidth - 2 * paddingInline;+ const fittableColumns =+ (availableWidth + thumbnailGap) / (targetSize + thumbnailGap);let columns = Math.floor(fittableColumns);if (columns < thumbnailLayoutMinColumns) {columns = thumbnailLayoutMinColumns;}- const shrinkRatio = getShrinkRatio(containerWidth, columns);- const itemHeight = thumbnailMaxHeight * shrinkRatio;- const itemWidth = thumbnailMaxWidth * shrinkRatio;+ const fittedSize =+ (availableWidth - (columns - 1) * thumbnailGap) / columns;+ // Fixed-size grids leave unused space at the end instead of stretching.+ const itemSize =+ fixedThumbnailSize === undefined+ ? fittedSize+ : Math.min(fixedThumbnailSize, Math.max(0, fittedSize));+ const isSmallerLayout =+ fixedThumbnailSize === undefined+ ? !(containerWidth > thumbnailLayoutMinColumns * thumbnailMaxWidth)+ : itemSize < fixedThumbnailSize;const gap = thumbnailGap;return {@@ -39,16 +46,8 @@ export const computeThumbnailGridLayoutParams = (isSmallerLayout,paddingInline,columns,- itemWidth,- itemHeight,+ itemWidth: itemSize,+ itemHeight: itemSize,gap,};};--const getFractionFittableColumns = (width: number): number =>- (width - 2 * thumbnailGridPadding + thumbnailGap) /- (thumbnailMaxWidth + thumbnailGap);--const getShrinkRatio = (width: number, columns: number) =>- (width - 2 * thumbnailGridPadding - (columns - 1) * thumbnailGap) /- (columns * thumbnailMaxWidth);