π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
fix(CollectionMapDialog):fix-map-view-refresh-on-pull
Aswin Asok26dbed65b529
diff --git a/web/apps/photos/src/components/Collections/CollectionMapDialog.tsx b/web/apps/photos/src/components/Collections/CollectionMapDialog.tsxindex c2947c63a4..1fbab58506 100644--- a/web/apps/photos/src/components/Collections/CollectionMapDialog.tsx+++ b/web/apps/photos/src/components/Collections/CollectionMapDialog.tsx@@ -682,22 +682,24 @@ const getLatestFileIdFromPoints = (points: MapIndexPoint[]) =>* Loads and manages map data including index, files, and thumbnails.* Responsibility: Fetch collection files, build/persist spatial index, prefetch thumbnails on demand.*/+const emptyMapDataState = (): MapDataState => ({+ mapCenter: null,+ mapIndex: null,+ mapPoints: [],+ latestFileId: undefined,+ filesByID: new Map(),+ thumbByFileID: new Map(),+ isLoading: false,+ error: null,+});+function useMapData(open: boolean,collectionSummary: CollectionSummary,files: EnteFile[],onGenericError: (e: unknown) => void,): MapDataResult {- const [state, setState] = useState<MapDataState>({- mapCenter: null,- mapIndex: null,- mapPoints: [],- latestFileId: undefined,- filesByID: new Map(),- thumbByFileID: new Map(),- isLoading: false,- error: null,- });+ const [state, setState] = useState<MapDataState>(emptyMapDataState);//Ref mirroring the filesByID(state) to prevent the stale closure issue with the queueThumbnailFetch useCallback fn().const filesByIDRef = useRef<Map<number, EnteFile>>(new Map());@@ -715,6 +717,10 @@ function useMapData(updationTime: number | null;files: EnteFile[];} | null>(null);+ // Survives dialog close (unlike loadedCollectionRef, which is cleared on+ // close) so we can tell a same-collection background reload apart from a+ // switch to a different collection.+ const lastLoadedSummaryIdRef = useRef<number | undefined>(undefined);//Syncing the refs with the state for the stale closure prevention.useEffect(() => {@@ -818,12 +824,22 @@ function useMapData(const currentUpdationTime = collectionSummary.updationTime ?? null;const loaded = loadedCollectionRef.current;+ // The files array identity changes on every remote pull (e.g. the+ // desktop app pulls on each window focus), so compare by id instead of+ // reference to avoid tearing down the map for a no-op reload.+ const sameFiles =+ loaded?.files === files ||+ (!!loaded &&+ loaded.files.length === files.length &&+ // id-order compare; derivation is deterministic, deep equality not needed+ loaded.files.every((f, i) => f.id === files[i]?.id));+//preventing reloading of the data if it's already loaded.if (loaded?.summaryId === currentSummaryId &&loaded.fileCount === currentFileCount &&loaded.updationTime === currentUpdationTime &&- loaded.files === files+ sameFiles) {return;}@@ -831,7 +847,17 @@ function useMapData(const loadMapData = async () => {//In this ref we are actually setting a new Set() so clearing that before any compute happens.pendingThumbsRef.current.clear();- setState((prev) => ({ ...prev, isLoading: true, error: null }));+ // When switching to a different collection, blank the previous+ // collection's map data so it doesn't flash while the new one+ // loads; for a same-collection reload, keep it mounted behind the+ // background refresh.+ const isNewCollection =+ lastLoadedSummaryIdRef.current !== currentSummaryId;+ setState((prev) =>+ isNewCollection+ ? { ...emptyMapDataState(), isLoading: true }+ : { ...prev, isLoading: true, error: null },+ );try {const uniqueFiles = uniqueFilesByID(files);@@ -856,16 +882,18 @@ function useMapData(? [latestPoint.lat, latestPoint.lng]: null;- setState({+ setState((prev) => ({filesByID,mapCenter,mapIndex,mapPoints: points,latestFileId,- thumbByFileID: new Map(),+ // Keep already-fetched thumbnails; keys are file ids so+ // entries for removed files are simply unused.+ thumbByFileID: prev.thumbByFileID,isLoading: false,error: null,- });+ }));// Mark this collection as loadedloadedCollectionRef.current = {@@ -874,6 +902,7 @@ function useMapData(updationTime: currentUpdationTime,files,};+ lastLoadedSummaryIdRef.current = currentSummaryId;const coverId = collectionSummary.coverFile?.id ?? latestFileId;if (coverId !== undefined) {@@ -1648,7 +1677,9 @@ export const CollectionMapDialog: React.FC<CollectionMapDialogProps> = ({);const body = useMemo(() => {- if (isLoading) {+ // Only blank out the layout on the initial load; background reloads+ // keep the map (and any open file viewer) mounted.+ if (isLoading && !mapIndex) {return (<CenteredBox><ActivityIndicator size="28px" />