cargo fmt

Author: alanpoon

src/home/room_screen.rs

@@ -971,6 +971,10 @@ impl Widget for RoomScreen {
                                 // ▼ (down arrow) = collapsed/closed - items are hidden
                                 let button_text = if *open { "▲" } else { "▼" };
                                 wr.button(id!(collapsible_button)).set_text(cx, button_text);
+                                // If the last item is a group of small state events, scroll to the end when it is expanded.
+                                if range.end == tl_state.items.len() && *open {
+                                    portal_list.smooth_scroll_to_end(cx, 90.0, None);
+                                }
                             }
                         }
                     }
@@ -1634,18 +1638,20 @@ impl RoomScreen {
                         tl.content_drawn_since_last_update.remove(changed_indices.clone());
                         tl.profile_drawn_since_last_update.remove(changed_indices.clone());
                     }
-                    // Calculate the shift amount based on the difference between old and new lengths
-                    let old_len = tl.items.len();
-                    let new_len = new_items.len();
-                    let shift = new_len as i32 - old_len as i32;
-                    tl.items = new_items;
-                    // Apply the shift to the small_state_groups.
-                    for (range, _) in &mut tl.small_state_groups {
-                        let new_start = (range.start as i32 + shift).max(0) as usize;
-                        let new_end = (range.end as i32 + shift).max(0) as usize;
-                        *range = new_start..new_end;
+                    // Handles item_id changes whenever there is a backward pagination.  
+                    if !is_append {
+                        // Calculate the shift amount based on the difference between old and new lengths
+                        let old_len = tl.items.len();
+                        let new_len = new_items.len();
+                        let shift = new_len as i32 - old_len as i32;
+                        tl.items = new_items;
+                        // Apply the shift to the small_state_groups.
+                        for (range, _) in &mut tl.small_state_groups {
+                            let new_start = (range.start as i32 + shift).max(0) as usize;
+                            let new_end = (range.end as i32 + shift).max(0) as usize;
+                            *range = new_start..new_end;
+                        }
                     }
-
                     done_loading = true;
                 }
                 TimelineUpdate::NewUnreadMessagesCount(unread_messages_count) => {
@@ -4024,7 +4030,7 @@ fn is_small_state_event(
 /// Dynamically updates small state groups as timeline items are processed.
 /// This function is called during populate_small_state_event to build groups on-demand.
 /// Since iteration starts from the biggest item_id and goes backwards, we handle reverse grouping.
-/// Returns a tuple whether to display the message, and whether to display the debug button and whether collapsible list is expanded.
+/// Returns a tuple whether to display the message, and whether to display the collapsible button and whether collapsible list is expanded.
 fn update_small_state_groups_for_item(
     item_id: usize,
     current_item: &EventTimelineItem,
@@ -4040,21 +4046,17 @@ fn update_small_state_groups_for_item(
 
     // check if the next item (item_id + 1) is a small state event to continue grouping
     let next_item_is_small_state = next_item
-        .and_then(|timeline_item| 
-            match timeline_item.kind() { 
-                TimelineItemKind::Event(event_tl_item) => Some(event_tl_item), 
-                _ => None
-            }
-        )
+        .and_then(|timeline_item| match timeline_item.kind() {
+            TimelineItemKind::Event(event_tl_item) => Some(event_tl_item),
+            _ => None,
+        })
         .map(is_small_state_event)
         .unwrap_or(false);
     let previous_item_is_small_state = previous_item
-        .and_then(|timeline_item| 
-            match timeline_item.kind() { 
-                TimelineItemKind::Event(event_tl_item) => Some(event_tl_item), 
-                _ => None
-            }
-        )
+        .and_then(|timeline_item| match timeline_item.kind() {
+            TimelineItemKind::Event(event_tl_item) => Some(event_tl_item),
+            _ => None,
+        })
         .map(is_small_state_event)
         .unwrap_or(false);
     if !previous_item_is_small_state && !next_item_is_small_state {
@@ -4070,7 +4072,7 @@ fn update_small_state_groups_for_item(
             return (*is_open, false, *is_open); // Item is in group but not at start, no debug button
         }
     }
-    
+
     // Since we're iterating backwards (from highest to lowest item_id),
     for (range, is_open) in small_state_groups.iter_mut() {
         if range.start == item_id + 1 {
@@ -4083,7 +4085,8 @@ fn update_small_state_groups_for_item(
         }
     }
     if next_item_is_small_state {
-        small_state_groups.push((item_id..item_id + 1, false));
+        // Plus to include the next item into the group.
+        small_state_groups.push((item_id..(item_id + 2), false));
     }
     (false, false, false) // Return collapsed state, no debug button
 }
@@ -4323,22 +4326,29 @@ fn populate_small_state_event(
     // - opened: whether this individual item should be rendered (based on group state)
     // - show_collapsible_button: true if this item is the first in a collapsible group
     // - expanded: current expansion state of the group (for button text)
-    let (opened, show_collapsible_button, expanded) = update_small_state_groups_for_item(item_id, event_tl_item, prev_event,next_event, small_state_groups);
-
+    let (opened, show_collapsible_button, expanded) = update_small_state_groups_for_item(
+        item_id,
+        event_tl_item,
+        prev_event,
+        next_event,
+        small_state_groups,
+    );
     // Only show the collapsible button on the first item of each group
-    item.button(id!(collapsible_button)).set_visible(cx, show_collapsible_button);
-    
+    item.button(id!(collapsible_button))
+        .set_visible(cx, show_collapsible_button);
+
     // Render logic based on group state
     if opened {
         // This item should be visible - set appropriate button text if this is a group leader
         if show_collapsible_button {
             // Update button text to show current group state:
             // ▲ = group is expanded (click to collapse)
-            // ▼ = group is collapsed (click to expand) 
+            // ▼ = group is collapsed (click to expand)
             let button_text = if expanded { "▲" } else { "▼" };
-            item.button(id!(collapsible_button)).set_text(cx, button_text);
+            item.button(id!(collapsible_button))
+                .set_text(cx, button_text);
         }
-        
+
         // Render the actual event content
         event_content.populate_item_content(
             cx,