From fe4136975484997d68efbb3e46a862df47b2dbe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A2u=20Cao?= <raucao@kosmos.org>
Date: Wed, 22 Apr 2026 13:10:11 +0400
Subject: [PATCH] Reset scroll position when switching between places

---
 app/components/place-details.gjs         |  1 +
 app/components/place-photos-carousel.gjs | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/app/components/place-details.gjs b/app/components/place-details.gjs
index c1d5c43..1ea5dee 100644
--- a/app/components/place-details.gjs
+++ b/app/components/place-details.gjs
@@ -367,6 +367,7 @@ export default class PlaceDetails extends Component {
         <PlacePhotosCarousel
           @photos={{this.photos}}
           @name={{this.name}}
+          @resetKey={{this.place.osmId}}
           @scrollToEventId={{this.newlyUploadedPhotoId}}
         />
         <h3>{{this.name}}</h3>
diff --git a/app/components/place-photos-carousel.gjs b/app/components/place-photos-carousel.gjs
index 88af3fb..f5e4687 100644
--- a/app/components/place-photos-carousel.gjs
+++ b/app/components/place-photos-carousel.gjs
@@ -29,6 +29,16 @@ export default class PlacePhotosCarousel extends Component {
     return !this.canScrollRight;
   }
 
+  lastResetKey = null;
+
+  resetScrollPosition = modifier((element, [resetKey]) => {
+    if (resetKey !== undefined && resetKey !== this.lastResetKey) {
+      this.lastResetKey = resetKey;
+      element.scrollLeft = 0;
+      setTimeout(() => this.updateScrollState(), 50);
+    }
+  });
+
   scrollToNewPhoto = modifier((element, [eventId]) => {
     if (eventId && eventId !== this.lastEventId) {
       this.lastEventId = eventId;
@@ -99,6 +109,7 @@ export default class PlacePhotosCarousel extends Component {
         <div
           class="place-photos-carousel-track"
           {{this.setupCarousel}}
+          {{this.resetScrollPosition @resetKey}}
           {{this.scrollToNewPhoto @scrollToEventId}}
           {{on "scroll" this.updateScrollState}}
         >