Skip to content

armgit / ente

Public Imported from GitHub
0

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

[web][photos] Expand matching search groups without changing saved selection

Aswin Asok79008c175141
diff --git a/web/apps/photos/src/components/gallery/BarImpl.tsx b/web/apps/photos/src/components/gallery/BarImpl.tsx
index 5c586c8354..def189e62f 100644
--- a/web/apps/photos/src/components/gallery/BarImpl.tsx
+++ b/web/apps/photos/src/components/gallery/BarImpl.tsx
@@ -106,6 +106,9 @@ export const GalleryBarImpl: React.FC<GalleryBarImplProps> = ({
const [albumFilter, setAlbumFilter] = useState<AlbumFilter | undefined>(
"ente",
);
+ const [searchAlbumFilter, setSearchAlbumFilter] = useState<
+ AlbumFilter | null | undefined
+ >(null);
const visibleAlbumFilters = useMemo(
() =>
getVisibleAlbumFilters(collectionSummaries).filter(
@@ -117,11 +120,19 @@ export const GalleryBarImpl: React.FC<GalleryBarImplProps> = ({
),
[collectionSummaries, isSearching, matchingCollectionSummaries],
);
+ const selectedAlbumFilter = isSearching
+ ? searchAlbumFilter === null
+ ? (albumFilter ?? visibleAlbumFilters[0]?.value)
+ : searchAlbumFilter
+ : albumFilter;
const activeAlbumFilter =
- albumFilter === undefined ||
- visibleAlbumFilters.some(({ value }) => value == albumFilter)
- ? albumFilter
+ selectedAlbumFilter === undefined ||
+ visibleAlbumFilters.some(({ value }) => value == selectedAlbumFilter)
+ ? selectedAlbumFilter
: visibleAlbumFilters[0]?.value;
+ const setActiveAlbumFilter = isSearching
+ ? setSearchAlbumFilter
+ : setAlbumFilter;
const visibleCollectionSummaries = useMemo(
() =>
mode != "albums"
@@ -140,6 +151,7 @@ export const GalleryBarImpl: React.FC<GalleryBarImplProps> = ({
);
useEffect(() => {
+ if (!isSearching) setSearchAlbumFilter(null);
if (!isSearching && albumFilter != activeAlbumFilter)
setAlbumFilter(activeAlbumFilter);
}, [albumFilter, activeAlbumFilter, isSearching]);
@@ -437,7 +449,7 @@ export const GalleryBarImpl: React.FC<GalleryBarImplProps> = ({
: undefined
}
onClick={() =>
- setAlbumFilter(
+ setActiveAlbumFilter(
activeAlbumFilter == filter.value
? undefined
: filter.value,