kenmirrors/ente
1
0
Fork 0
mirror of https://github.com/ente-io/ente.git synced 2025-08-08 23:39:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Workable

Browse Source
This commit is contained in:
Manav Rathi 2025-02-28 15:21:00 +05:30
parent 0f732c0b61
commit df21d20dd0
No known key found for this signature in database
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/apps/photos/src/components/PhotoFrame.tsx
View File

@ -272,14 +272,15 @@ const PhotoFrame = ({
const handleToggleFavorite = useMemo(() => { const handleToggleFavorite = useMemo(() => {
return favoriteFileIDs return favoriteFileIDs
? (file: EnteFile) => { ? async (file: EnteFile) => {
const isFavorite = favoriteFileIDs!.has(file.id); const isFavorite = favoriteFileIDs!.has(file.id);
return (isFavorite ? removeFromFavorites : addToFavorites)( await (isFavorite ? removeFromFavorites : addToFavorites)(
file, file,
); );
onMarkUnsyncedFavoriteUpdate(file.id, !isFavorite);
} }
: undefined; : undefined;
}, [favoriteFileIDs]); }, [favoriteFileIDs, onMarkUnsyncedFavoriteUpdate]);
const handleSaveEditedImageCopy = useCallback( const handleSaveEditedImageCopy = useCallback(
(editedFile: File, collection: Collection, enteFile: EnteFile) => { (editedFile: File, collection: Collection, enteFile: EnteFile) => {

21
web/packages/gallery/components/viewer/photoswipe.ts
View File

@ -499,14 +499,29 @@ export class FileViewerPhotoSwipe {
if (showModifyActions) { if (showModifyActions) {
const toggleFavorite = async ( const toggleFavorite = async (
buttonElement: HTMLButtonElement, buttonElement: HTMLButtonElement,
value: boolean,
) => { ) => {
const af = currentAnnotatedFile(); const af = currentAnnotatedFile();
this.pendingFavoriteUpdates.add(af.file.id); this.pendingFavoriteUpdates.add(af.file.id);
buttonElement.disabled = true; buttonElement.disabled = true;
await delegate.toggleFavorite(af); await delegate.toggleFavorite(af);
// TODO: This can be improved in two ways:
//
// 1. We currently have a setTimeout to ensure that the
// updated `favoriteFileIDs` have made their way to our
// delegate before we query for the status again.
// Obviously, this is hacky. Note that a timeout of 0
// (i.e., just deferring till the next tick) isn't enough
// here, for reasons I need to investigate more (hence
// this TODO).
//
// 2. We reload the entire slide instead of just updating
// the button state. This is because there are two
// buttons, instead of a single button toggling between
// two states (e.g. like the zoom button). A single
// button can be achieved by moving the fill as a layer.
await new Promise((r) => setTimeout(r, 100));
this.pendingFavoriteUpdates.delete(af.file.id); this.pendingFavoriteUpdates.delete(af.file.id);
showFavoriteIf(buttonElement, value); this.refreshCurrentSlideContent();
}; };
const showFavoriteIf = ( const showFavoriteIf = (
@ -529,7 +544,7 @@ export class FileViewerPhotoSwipe {
order: 8, order: 8,
isButton: true, isButton: true,
html: createPSRegisterElementIconHTML("favorite"), html: createPSRegisterElementIconHTML("favorite"),
onClick: (e) => toggleFavorite(e.target, false), onClick: (e) => toggleFavorite(e.target),
onInit: (buttonElement) => onInit: (buttonElement) =>
pswp.on("change", () => pswp.on("change", () =>
showFavoriteIf(buttonElement, false), showFavoriteIf(buttonElement, false),