π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[photos][web] Preserve album overview scroll during sync
AswinAsok813d33072c5f
diff --git a/web/apps/photos/src/components/Collections/GalleryBarAndListHeader.tsx b/web/apps/photos/src/components/Collections/GalleryBarAndListHeader.tsxindex 99b4846869..704ccefbe9 100644--- a/web/apps/photos/src/components/Collections/GalleryBarAndListHeader.tsx+++ b/web/apps/photos/src/components/Collections/GalleryBarAndListHeader.tsx@@ -55,7 +55,10 @@ export type GalleryBarAndListHeaderProps = Omit<| "onShowAllAlbums"| "onShowAllPeople"> & {- onAlbumSummariesChange: (albums: CollectionSummary[]) => void;+ onAlbumSummariesChange: (+ albums: CollectionSummary[],+ sortBy: CollectionsSortBy,+ ) => void;shouldHide: boolean;barCollectionSummaries: CollectionSummaries;allPeople: Person[];@@ -189,8 +192,16 @@ export const GalleryBarAndListHeader: React.FC<useEffect(() => {if (mode == "albums")- onAlbumSummariesChange(visibleCollectionSummaries);- }, [mode, visibleCollectionSummaries, onAlbumSummariesChange]);+ onAlbumSummariesChange(+ visibleCollectionSummaries,+ collectionsSortBy,+ );+ }, [+ mode,+ visibleCollectionSummaries,+ collectionsSortBy,+ onAlbumSummariesChange,+ ]);const sortedPeople = useMemo(() => sortPeople(people, peopleSortBy),diff --git a/web/apps/photos/src/components/gallery/AlbumsOverview.tsx b/web/apps/photos/src/components/gallery/AlbumsOverview.tsxindex e25f747b18..9e57ffbd69 100644--- a/web/apps/photos/src/components/gallery/AlbumsOverview.tsx+++ b/web/apps/photos/src/components/gallery/AlbumsOverview.tsx@@ -11,7 +11,10 @@ import {} from "@mui/material";import { ItemCard } from "ente-new/photos/components/Tiles";import { UnstyledButton } from "ente-new/photos/components/UnstyledButton";-import type { CollectionSummary } from "ente-new/photos/services/collection-summary";+import type {+ CollectionSummary,+ CollectionsSortBy,+} from "ente-new/photos/services/collection-summary";import { t } from "i18next";import { useEffect, useRef, useState } from "react";import AutoSizer from "react-virtualized-auto-sizer";@@ -21,7 +24,8 @@ interface AlbumsOverviewProps {albums: CollectionSummary[];title: string;filter: AlbumFilter;- hasSearchQuery: boolean;+ searchQuery: string;+ sortBy: CollectionsSortBy;onSelectAlbum: (id: number) => void;onCreateAlbum: () => void;}@@ -30,7 +34,8 @@ export const AlbumsOverview = ({albums,title,filter,- hasSearchQuery,+ searchQuery,+ sortBy,onSelectAlbum,onCreateAlbum,}: AlbumsOverviewProps) => {@@ -49,7 +54,8 @@ export const AlbumsOverview = ({observer.observe(listElement);return () => observer.disconnect();}, [listElement]);- const showCreate = filter == "ente" && !hasSearchQuery;+ const normalizedSearchQuery = searchQuery.trim().toLowerCase();+ const showCreate = filter == "ente" && !normalizedSearchQuery;const tileWidth = compact ? 104 : 140;const columnGap = compact ? 12 : 22;const rowGap = compact ? 16 : 24;@@ -63,7 +69,7 @@ export const AlbumsOverview = ({useEffect(() => {listRef.current?.scrollTo(0);- }, [filter, albums]);+ }, [filter, normalizedSearchQuery, sortBy]);return (<Stackdiff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsxindex 21cac3b4e6..5191df7bbe 100644--- a/web/apps/photos/src/pages/gallery.tsx+++ b/web/apps/photos/src/pages/gallery.tsx@@ -129,6 +129,7 @@ import {import {haveOnlySystemCollections,PseudoCollectionID,+ type CollectionsSortBy,type CollectionSummary,} from "ente-new/photos/services/collection-summary";import {@@ -225,6 +226,15 @@ const Page: React.FC = () => {const [overviewAlbums, setOverviewAlbums] = useState<CollectionSummary[]>([],);+ const [overviewSortBy, setOverviewSortBy] =+ useState<CollectionsSortBy>("updation-time-desc");+ const handleAlbumSummariesChange = useCallback(+ (albums: CollectionSummary[], sortBy: CollectionsSortBy) => {+ setOverviewAlbums(albums);+ setOverviewSortBy(sortBy);+ },+ [],+ );const [blockingLoad, setBlockingLoad] = useState(false);const [peopleSortBy, setPeopleSortBy] =useState<PeopleSortBy>("count-desc");@@ -2100,7 +2110,8 @@ const Page: React.FC = () => {albumSearchQuery,onAlbumSearchQueryChange: setAlbumSearchQuery,onShowAlbumOverview: handleShowAlbumOverview,- onAlbumSummariesChange: setOverviewAlbums,+ onAlbumSummariesChange:+ handleAlbumSummariesChange,peopleSortBy,onChangePeopleSortBy: setPeopleSortBy,setFileListHeader,@@ -2202,7 +2213,8 @@ const Page: React.FC = () => {) ?? albumFilters[0]!).title()}filter={overviewFilter!}- hasSearchQuery={!!albumSearchQuery.trim()}+ searchQuery={albumSearchQuery}+ sortBy={overviewSortBy}onSelectAlbum={handleShowCollectionSummaryWithID}onCreateAlbum={() => {setPostCreateAlbumOp(undefined);