Don't automatically scroll to restored view list selections

Also preserves scrolling to zero & the end, instead of resetting
you unexpectedly, and preserves selected events even if selected by
links from elsewhere.

Author: pimterry

src/components/view/view-event-list.tsx

@@ -772,11 +772,11 @@ export class ViewEventList extends React.Component<ViewEventListProps> {
     private setListBodyRef = (element: HTMLDivElement | null) => {
         // Update the ref
         (this.listBodyRef as any).current = element;
-        
+
         // If the element is being mounted and we haven't restored state yet, do it now
-        if (element && !this.hasRestoredInitialState) {
+        if (element && !this.hasRestoredScrollState) {
             this.restoreScrollPosition();
-            this.hasRestoredInitialState = true;
+            this.hasRestoredScrollState = true;
         }
     };
 
@@ -900,16 +900,20 @@ export class ViewEventList extends React.Component<ViewEventListProps> {
             this.wasListAtBottom = this.isListAtBottom();
 
             // Only save scroll position after we've restored the initial state
-            if (this.hasRestoredInitialState) {
+            if (this.hasRestoredScrollState) {
                 const listWindow = this.listBodyRef.current?.parentElement;
+
+                const scrollPosition = this.wasListAtBottom
+                    ? 'end'
+                    : (listWindow?.scrollTop ?? 'end');
                 if (listWindow) {
-                    this.props.uiStore.setViewScrollPosition(listWindow.scrollTop);
+                    this.props.uiStore.setViewScrollPosition(scrollPosition);
                 }
             }
         });
     }
 
-    private hasRestoredInitialState = false;
+    private hasRestoredScrollState = false;
 
     componentDidUpdate(prevProps: ViewEventListProps) {
         if (this.listBodyRef.current?.parentElement?.contains(document.activeElement)) {
@@ -930,11 +934,12 @@ export class ViewEventList extends React.Component<ViewEventListProps> {
     }
 
     private restoreScrollPosition = () => {
-        // Only restore if we have a saved position
         const savedPosition = this.props.uiStore.viewScrollPosition;
-        if (savedPosition > 0) {
-            const listWindow = this.listBodyRef.current?.parentElement;
-            if (listWindow) {
+        const listWindow = this.listBodyRef.current?.parentElement;
+        if (listWindow) {
+            if (savedPosition === 'end') {
+                listWindow.scrollTop = listWindow.scrollHeight;
+            } else {
                 // Only restore if we're not close to the current position (avoid unnecessary scrolling)
                 if (Math.abs(listWindow.scrollTop - savedPosition) > 10) {
                     listWindow.scrollTop = savedPosition;
@@ -1044,13 +1049,4 @@ export class ViewEventList extends React.Component<ViewEventListProps> {
 
         event.preventDefault();
     }
-
-    // Public method to force scroll and selection restoration
-    public restoreViewState = () => {
-        if (this.props.selectedEvent) {
-            this.scrollToEvent(this.props.selectedEvent);
-        } else {
-            this.restoreScrollPosition();
-        }
-    }
 }

src/components/view/view-page.tsx

@@ -244,12 +244,11 @@ class ViewPage extends React.Component<ViewPageProps> {
     );
 
     componentDidMount() {
-        // After first render, scroll to the selected event (or the end of the list) by default:
+        // After first render, if we're jumping to an event, then scroll to it:
         requestAnimationFrame(() => {
-            if ((this.props.eventId || this.props.uiStore.selectedEventId) && this.selectedEvent) {
+            if (this.props.eventId && this.selectedEvent) {
+                this.props.uiStore.setSelectedEventId(this.props.eventId);
                 this.onScrollToCenterEvent(this.selectedEvent);
-            } else if (!this.props.uiStore.viewScrollPosition) {
-                this.onScrollToEnd();
             }
         });
 
@@ -499,9 +498,9 @@ class ViewPage extends React.Component<ViewPageProps> {
     onSearchFiltersConsidered(filters: FilterSet | undefined) {
         this.searchFiltersUnderConsideration = filters;
     }
+
     @action.bound
     onSelected(event: CollectedEvent | undefined) {
-        // Persist the selected event to UiStore for tab switching
         this.props.uiStore.setSelectedEventId(event?.id);
 
         this.props.navigate(event

src/model/ui/ui-store.ts

@@ -251,9 +251,8 @@ export class UiStore {
     @observable
     expandedViewCard: ExpandableViewCardKey | undefined;
 
-    // Store view list scroll position and selected entry to persist when switching tabs
     @observable
-    viewScrollPosition: number = 0;
+    viewScrollPosition: number | 'end' = 'end';
 
     @observable
     selectedEventId: string | undefined;
@@ -445,7 +444,7 @@ export class UiStore {
 
     // Actions for persisting view state when switching tabs
     @action.bound
-    setViewScrollPosition(position: number) {
+    setViewScrollPosition(position: number | 'end') {
         this.viewScrollPosition = position;
     }