beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix shared and trash file shown in search result

Browse source
This commit is contained in:
Abhinav 2023-02-10 12:56:37 +05:30
parent 0735cdb3aa
commit 26349e67e5
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/components/PhotoFrame.tsx
View file

@ -190,8 +190,9 @@ const PhotoFrame = ({
} }
if ( if (
isSharedFile(user, item) && (isInSearchMode ||
activeCollection !== item.collectionID activeCollection !== item.collectionID) &&
isSharedFile(user, item)
) { ) {
return false; return false;
} }
@ -202,7 +203,11 @@ const PhotoFrame = ({
) { ) {
return false; return false;
} }
if (activeCollection !== TRASH_SECTION && item.isTrashed) { if (
(isInSearchMode ||
activeCollection !== TRASH_SECTION) &&
item.isTrashed
) {
return false; return false;
} }
if (!idSet.has(item.id)) { if (!idSet.has(item.id)) {
@ -210,8 +215,8 @@ const PhotoFrame = ({
activeCollection === ALL_SECTION || activeCollection === ALL_SECTION ||
activeCollection === ARCHIVE_SECTION || activeCollection === ARCHIVE_SECTION ||
activeCollection === TRASH_SECTION || activeCollection === TRASH_SECTION ||
activeCollection === item.collectionID || isInSearchMode ||
isInSearchMode activeCollection === item.collectionID
) { ) {
idSet.add(item.id); idSet.add(item.id);
return true; return true;