π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
perf(photos):virtualize-people-overview-rows
Aswin Asokef9c01f3c704
diff --git a/web/apps/photos/src/components/gallery/PeopleOverview.tsx b/web/apps/photos/src/components/gallery/PeopleOverview.tsxindex c4f1556834..bb1da30e38 100644--- a/web/apps/photos/src/components/gallery/PeopleOverview.tsx+++ b/web/apps/photos/src/components/gallery/PeopleOverview.tsx@@ -1,10 +1,19 @@import { sortPeople, type PeopleSortBy } from "@/utils/people-sort";-import { Box, Stack, Typography, styled } from "@mui/material";+import {+ Box,+ Stack,+ Typography,+ styled,+ useMediaQuery,+ useTheme,+} from "@mui/material";import { ItemCard } from "ente-new/photos/components/Tiles";import { UnstyledButton } from "ente-new/photos/components/UnstyledButton";import type { Person } from "ente-new/photos/services/ml/people";import { t } from "i18next";import { useMemo } from "react";+import AutoSizer from "react-virtualized-auto-sizer";+import { FixedSizeList, type ListChildComponentProps } from "react-window";import { PeopleEmptyState } from ".";export const PeopleOverview = ({@@ -16,6 +25,7 @@ export const PeopleOverview = ({peopleSortBy: PeopleSortBy;onSelectPerson: (id: string) => void;}) => {+ const mobile = useMediaQuery(useTheme().breakpoints.down("md"));const sortedPeople = useMemo(() => sortPeople(people, peopleSortBy),[people, peopleSortBy],@@ -25,7 +35,7 @@ export const PeopleOverview = ({sx={{flex: 1,minHeight: 0,- overflow: "auto",+ overflow: "hidden",p: { xs: "16px 14px", md: "36px" },gap: "24px",}}@@ -36,6 +46,7 @@ export const PeopleOverview = ({alignItems: "center",justifyContent: "space-between",minHeight: 54,+ flexShrink: 0,gap: 2,}}>@@ -66,52 +77,43 @@ export const PeopleOverview = ({{people.length ? (<Boxsx={{- display: "grid",+ flex: 1,+ minHeight: 0,"--people-tile-size": { xs: "96px", md: "140px" },"--people-portrait-size": { xs: "80px", md: "120px" },- gridTemplateColumns:- "repeat(auto-fill, minmax(var(--people-tile-size), 1fr))",- justifyItems: "center",- gap: { xs: "24px 12px", md: "24px 22px" },+ "--people-column-gap": { xs: "12px", md: "22px" },}}>- {sortedPeople.map((person) => (- <PersonButton- key={person.id}- onClick={() => onSelectPerson(person.id)}- >- <ItemCard- TileComponent={Portrait}- coverFile={person.displayFaceFile}- coverFaceID={person.displayFaceID}- />- <Typography- component="span"- sx={{- fontSize: 14,- fontWeight: 500,- lineHeight: "20px",- overflowWrap: "anywhere",- }}- >- {person.name || t("unnamed_person")}- </Typography>- <Typography- component="span"- sx={{- mt: "-6px",- fontSize: 12,- fontWeight: 500,- lineHeight: "16px",- color: "text.muted",- }}- >- {t("people_photo_count", {- count: person.fileIDs.length,- })}- </Typography>- </PersonButton>- ))}+ <AutoSizer>+ {({ width, height }) => {+ const tileWidth = mobile ? 96 : 140;+ const gap = mobile ? 12 : 22;+ const columns = Math.max(+ 1,+ Math.floor(+ (width - 16 + gap) / (tileWidth + gap),+ ),+ );+ return (+ <FixedSizeList+ width={width}+ height={height}+ itemCount={Math.ceil(+ sortedPeople.length / columns,+ )}+ itemSize={mobile ? 150 : 190}+ overscanCount={1}+ itemData={{+ people: sortedPeople,+ columns,+ onSelectPerson,+ }}+ >+ {PeopleRow}+ </FixedSizeList>+ );+ }}+ </AutoSizer></Box>) : (<PeopleEmptyState />@@ -120,6 +122,70 @@ export const PeopleOverview = ({);};+const PeopleRow = ({+ data,+ index,+ style,+}: ListChildComponentProps<{+ people: Person[];+ columns: number;+ onSelectPerson: (id: string) => void;+}>) => (+ <div+ style={{+ ...style,+ display: "grid",+ gridTemplateColumns: `repeat(${data.columns}, minmax(0, 1fr))`,+ columnGap: "var(--people-column-gap)",+ justifyItems: "center",+ alignItems: "start",+ }}+ >+ {data.people+ .slice(index * data.columns, (index + 1) * data.columns)+ .map((person) => (+ <PersonButton+ key={person.id}+ onClick={() => data.onSelectPerson(person.id)}+ >+ <ItemCard+ TileComponent={Portrait}+ coverFile={person.displayFaceFile}+ coverFaceID={person.displayFaceID}+ />+ <Typography+ component="span"+ sx={{+ fontSize: 14,+ fontWeight: 500,+ lineHeight: "20px",+ width: "100%",+ overflow: "hidden",+ textOverflow: "ellipsis",+ whiteSpace: "nowrap",+ }}+ >+ {person.name || t("unnamed_person")}+ </Typography>+ <Typography+ component="span"+ sx={{+ mt: "-6px",+ fontSize: 12,+ fontWeight: 500,+ lineHeight: "16px",+ color: "text.muted",+ }}+ >+ {t("people_photo_count", {+ count: person.fileIDs.length,+ })}+ </Typography>+ </PersonButton>+ ))}+ </div>+);+const PersonButton = styled(UnstyledButton)({width: "var(--people-tile-size)",display: "flex",