Skip to content

armgit / ente

Public Imported from GitHub
0

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

[photos][web] Recenter Your map on repeated selection

AswinAsok8731dc33c60d
diff --git a/web/apps/photos/src/components/collections/CollectionMap.tsx b/web/apps/photos/src/components/collections/CollectionMap.tsx
index 3ea11d463d..dd65a3c60f 100644
--- a/web/apps/photos/src/components/collections/CollectionMap.tsx
+++ b/web/apps/photos/src/components/collections/CollectionMap.tsx
@@ -74,6 +74,7 @@ interface CollectionMapProps extends Pick<
| "emailByUserID"
> {
selectedPlace?: PlaceSelection;
+ placeSelectionRevision: number;
collectionSummary: CollectionSummary;
files: EnteFile[];
mapFileSource: MapFileSource;
@@ -995,6 +996,7 @@ function createMarkerIcon(
export const CollectionMap: React.FC<CollectionMapProps> = ({
selectedPlace,
+ placeSelectionRevision,
collectionSummary,
files,
onRemotePull,
@@ -1171,6 +1173,7 @@ export const CollectionMap: React.FC<CollectionMapProps> = ({
<MapCanvas
mapComponents={mapComponents}
selectedPlace={selectedPlace}
+ placeSelectionRevision={placeSelectionRevision}
mapCenter={mapCenter}
mapIndex={mapIndex}
thumbByFileID={thumbByFileID}
@@ -1352,6 +1355,7 @@ function CollectionSidebar({
interface MapCanvasProps {
selectedPlace?: PlaceSelection;
+ placeSelectionRevision: number;
mapComponents: MapComponents;
mapCenter: [number, number];
mapIndex: MapIndex;
@@ -1369,6 +1373,7 @@ const leafletAttributionPrefix =
const MapCanvas = React.memo(function MapCanvas({
selectedPlace,
+ placeSelectionRevision,
mapComponents,
mapCenter,
mapIndex,
@@ -1396,6 +1401,7 @@ const MapCanvas = React.memo(function MapCanvas({
referrerPolicy="strict-origin-when-cross-origin"
/>
<PlaceFocus
+ placeSelectionRevision={placeSelectionRevision}
useMap={useMap}
selectedPlace={selectedPlace}
mapCenter={mapCenter}
@@ -1418,10 +1424,12 @@ const MapCanvas = React.memo(function MapCanvas({
const PlaceFocus = ({
useMap,
selectedPlace,
+ placeSelectionRevision,
mapCenter,
}: {
useMap: MapComponents["useMap"];
selectedPlace?: PlaceSelection;
+ placeSelectionRevision: number;
mapCenter: [number, number];
}) => {
const map = useMap();
@@ -1434,7 +1442,7 @@ const PlaceFocus = ({
});
useEffect(() => {
focusPlace(selectedPlace);
- }, [map, selectedPlace]);
+ }, [map, selectedPlace, placeSelectionRevision]);
return null;
};
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index 4e7bbaee35..7c840d98f7 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -325,6 +325,7 @@ const Page: React.FC = () => {
props: editAlbumDetailsVisibilityProps,
} = useModalVisibility();
const [selectedPlace, setSelectedPlace] = useState<PlaceSelection>();
+ const [placeSelectionRevision, setPlaceSelectionRevision] = useState(0);
const [isMapView, setIsMapView] = useState(false);
const closeCollectionMap = useCallback(() => setIsMapView(false), []);
@@ -2170,6 +2171,7 @@ const Page: React.FC = () => {
? selectedPlace
: undefined
}
+ placeSelectionRevision={placeSelectionRevision}
mapFileSource={mapFileSource}
onRemotePull={remotePull}
onAddSaveGroup={onAddSaveGroup}
@@ -2263,7 +2265,12 @@ const Page: React.FC = () => {
? undefined
: {
selectedPlace,
- onSelectPlace: setSelectedPlace,
+ onSelectPlace: (place) => {
+ setSelectedPlace(place);
+ setPlaceSelectionRevision(
+ (revision) => revision + 1,
+ );
+ },
placesFiles:
isMapView &&
activeCollectionID ===