π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[web][photos] Restore original thumbnail layout
AswinAsok3cc512e5d1f9
diff --git a/web/apps/photos/src/components/FileList.tsx b/web/apps/photos/src/components/FileList.tsxindex b1eee685ad..d91dfd2e7a 100644--- a/web/apps/photos/src/components/FileList.tsx+++ b/web/apps/photos/src/components/FileList.tsx@@ -187,10 +187,7 @@ export const FileList: React.FC<FileListProps> = ({const outerRef = useRef<HTMLDivElement | null>(null);const layoutParams = useMemo(- () =>- computeThumbnailGridLayoutParams(width, {- fixedThumbnailSize: 200,- }),+ () => computeThumbnailGridLayoutParams(width),[width],);diff --git a/web/packages/new/photos/components/utils/thumbnail-grid-layout.ts b/web/packages/new/photos/components/utils/thumbnail-grid-layout.tsindex 5811de8a50..2d737fe440 100644--- a/web/packages/new/photos/components/utils/thumbnail-grid-layout.ts+++ b/web/packages/new/photos/components/utils/thumbnail-grid-layout.ts@@ -1,5 +1,6 @@export const thumbnailGap = 4;export const thumbnailGridPadding = 24;+const thumbnailMaxHeight = 180;const thumbnailMaxWidth = 180;const thumbnailLayoutMinColumns = 4;@@ -15,30 +16,22 @@ export interface ThumbnailGridLayoutParams {export const computeThumbnailGridLayoutParams = (containerWidth: number,- { fixedThumbnailSize }: { fixedThumbnailSize?: number } = {},): ThumbnailGridLayoutParams => {+ const isSmallerLayout = !(+ containerWidth >+ thumbnailLayoutMinColumns * thumbnailMaxWidth+ );const paddingInline = thumbnailGridPadding;- const targetSize = fixedThumbnailSize ?? thumbnailMaxWidth;- const availableWidth = containerWidth - 2 * paddingInline;- const fittableColumns =- (availableWidth + thumbnailGap) / (targetSize + thumbnailGap);+ const fittableColumns = getFractionFittableColumns(containerWidth);let columns = Math.floor(fittableColumns);if (columns < thumbnailLayoutMinColumns) {columns = thumbnailLayoutMinColumns;}- 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 shrinkRatio = getShrinkRatio(containerWidth, columns);+ const itemHeight = thumbnailMaxHeight * shrinkRatio;+ const itemWidth = thumbnailMaxWidth * shrinkRatio;const gap = thumbnailGap;return {@@ -46,8 +39,16 @@ export const computeThumbnailGridLayoutParams = (isSmallerLayout,paddingInline,columns,- itemWidth: itemSize,- itemHeight: itemSize,+ itemWidth,+ itemHeight,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);