Added notify to ensure room is open for scroll to message

Author: alanpoon

src/app.rs

@@ -241,10 +241,11 @@ impl MatchEvent for App {
                 cx.action(MainDesktopUiAction::LoadDockFromAppState);
             }
 
-            if let RoomsListAction::Selected(selected_room, _) = action.as_widget_action().cast() {
+            if let RoomsListAction::Selected(selected_room) = action.as_widget_action().cast() {
                 // A room has been selected, update the app state and navigate to the main content view.
                 let display_name = room_name_or_id(selected_room.room_name(), selected_room.room_id());
                 self.app_state.selected_room = Some(selected_room);
+
                 // Set the Stack Navigation header to show the name of the newly-selected room.
                 self.ui
                     .label(id!(main_content_view.header.content.title_container.title))
@@ -424,7 +425,7 @@ impl AppMain for App {
 
         // Forward events to the MatchEvent trait implementation.
         self.match_event(cx, event);
-        let scope = &mut Scope::with_data(&mut self.app_state);
+        let scope: &mut Scope<'_, '_> = &mut Scope::with_data(&mut self.app_state);
         self.ui.handle_event(cx, event, scope);
 
         /*

src/home/main_desktop_ui.rs

@@ -1,6 +1,7 @@
 use makepad_widgets::*;
 use matrix_sdk::ruma::OwnedRoomId;
-use std::collections::HashMap;
+use tokio::sync::Notify;
+use std::{collections::HashMap, sync::Arc};
 
 use crate::{app::{AppState, AppStateAction, SelectedRoom}, shared::message_search_input_bar::{MessageSearchAction, MessageSearchInputBarRef}, utils::room_name_or_id};
 use super::{invite_screen::InviteScreenWidgetRefExt, room_screen::RoomScreenWidgetRefExt, rooms_list::RoomsListAction};
@@ -338,13 +339,14 @@ impl WidgetMatchEvent for MainDesktopUI {
 
             // Handle RoomsList actions, which are updates from the rooms list.
             match widget_action.cast() {
-                RoomsListAction::Selected(selected_room, notify) => {
+                RoomsListAction::Selected(selected_room) => {
                     // Note that this cannot be performed within draw_walk() as the draw flow prevents from
                     // performing actions that would trigger a redraw, and the Dock internally performs (and expects)
                     // a redraw to be happening in order to draw the tab content.
                     self.focus_or_create_tab(cx, selected_room);
-                    if let Some(notify) = notify {
-                        notify.notify_one(); // Notify the waiting task that the room has been focused.
+                    if cx.has_global::<Arc<Notify>>() {
+                        let notify = cx.get_global::<Arc<Notify>>();
+                        notify.notify_one();
                     }
                 }
                 RoomsListAction::InviteAccepted { room_id, room_name } => {

src/home/main_mobile_ui.rs

@@ -1,3 +1,4 @@
+
 use makepad_widgets::*;
 
 use crate::{
@@ -54,7 +55,7 @@ impl Widget for MainMobileUI {
             for action in actions {
                 match action.as_widget_action().cast() {
                     // This is currently handled in the top-level App.
-                    RoomsListAction::Selected(_selected_room, _) => {}
+                    RoomsListAction::Selected(_selected_room) => { }
                     // Because the MainMobileUI is drawn based on the AppState only,
                     // all we need to do is update the AppState here.
                     RoomsListAction::InviteAccepted { room_id, .. } => {
@@ -85,7 +86,7 @@ impl Widget for MainMobileUI {
                 // Get a reference to the `RoomScreen` widget and tell it which room's data to show.
                 self.view
                     .room_screen(id!(room_screen))
-                    .set_displayed_room(cx, room_id.clone().into(), room_name.clone());
+                    .set_displayed_room(cx, room_id.clone().into(), room_name.clone());                
             }
             Some(SelectedRoom::InvitedRoom { room_id, room_name }) => {
                 show_welcome = false;

src/home/room_screen.rs

@@ -1403,7 +1403,6 @@ impl Widget for RoomScreen {
                             TimelineItemContent::MsgLike(msg_like_content) => match &msg_like_content.kind {
                                 MsgLikeKind::Message(_) | MsgLikeKind::Sticker(_) => {
                                     let prev_event = tl_idx.checked_sub(1).and_then(|i| tl_items.get(i));
-                                    println!("msg_like_content {:?}", msg_like_content.as_message().unwrap().body());
                                     populate_message_view(
                                         cx,
                                         list,
@@ -2673,6 +2672,10 @@ impl RoomScreen {
         });
 
         self.show_timeline(cx);
+        if cx.has_global::<Arc<Notify>>() {
+            let notify = cx.get_global::<Arc<Notify>>();
+            notify.notify_one();
+        }
     }
 
     /// Sends read receipts based on the current scroll position of the timeline.
@@ -3639,7 +3642,6 @@ pub fn populate_text_message_content(
     if let Some(fb) = formatted_body.as_ref()
         .and_then(|fb| (fb.format == MessageFormat::Html).then_some(fb))
     {
-        println!("fb.body {:?}", fb.body);
         message_content_widget.show_html(
             cx,
             utils::linkify(
@@ -4445,10 +4447,15 @@ impl Widget for Message {
                         room_name,
                     };
                     let notify = Arc::new(Notify::new());
+                    if !cx.has_global::<Arc<Notify>>() {
+                        cx.set_global(notify.clone());
+                    } else {
+                        *(cx.get_global()) = notify.clone();
+                    }
                     cx.widget_action(
                         self.widget_uid(),
                         &scope.path,
-                        RoomsListAction::Selected(target_selected_room, Some(notify.clone()))
+                        RoomsListAction::Selected(target_selected_room)
                     );
                     submit_async_request(MatrixRequest::WaitForRoomOpenToJump { notify, room_id: jump_request.room_id.clone(), event_id: jump_request.event_id.clone() });
                 }

src/home/rooms_list.rs

@@ -159,7 +159,7 @@ pub fn enqueue_rooms_list_update(update: RoomsListUpdate) {
 #[derive(Debug, Clone, DefaultNone)]
 pub enum RoomsListAction {
     /// A new room was selected.
-    Selected(SelectedRoom, Option<Arc<tokio::sync::Notify>>),
+    Selected(SelectedRoom),
     /// A new room was joined from an accepted invite,
     /// meaning that the existing `InviteScreen` should be converted
     /// to a `RoomScreen` to display now-joined room.
@@ -787,7 +787,7 @@ impl Widget for RoomsList {
                 cx.widget_action(
                     self.widget_uid(),
                     &scope.path,
-                    RoomsListAction::Selected(new_selected_room, None),
+                    RoomsListAction::Selected(new_selected_room),
                 );
                 self.redraw(cx);
             }

src/right_panel/search_message.rs

@@ -25,7 +25,7 @@ use crate::{
         rooms_list::RoomsListRef,
     },
     shared::{
-        avatar::AvatarWidgetRefExt, html_or_plaintext::HtmlOrPlaintextWidgetRefExt, message_search_input_bar::{MessageSearchAction, MessageSearchInputBarRef}, popup_list::{enqueue_popup_notification, PopupItem, PopupKind}, styles::COLOR_WARNING_YELLOW, timestamp::TimestampWidgetRefExt
+        avatar::AvatarWidgetRefExt, html_or_plaintext::HtmlOrPlaintextWidgetRefExt, message_search_input_bar::{MessageSearchAction, MessageSearchInputBarRef}, popup_list::{enqueue_popup_notification, PopupItem, PopupKind}, timestamp::TimestampWidgetRefExt
     },
     sliding_sync::{submit_async_request, MatrixRequest},
     utils::unix_time_millis_to_datetime,

src/utils.rs

@@ -330,11 +330,12 @@ pub const MEDIA_THUMBNAIL_FORMAT: MediaFormatConst = MediaFormatConst::Thumbnail
     }
 );
 
-/// Removes leading whitespace and HTML whitespace tags (`<p>` and `<br>`) from the given `text`.
+/// Removes leading whitespace and HTML whitespace tags (`<mx-reply>`, `<p>` and `<br>`) from the given `text`.
 pub fn trim_start_html_whitespace(mut text: &str) -> &str {
     let mut prev_text_len = text.len();
     loop {
         text = text
+            .trim_start_matches("<mx-reply>")
             .trim_start_matches("<p>")
             .trim_start_matches("<br>")
             .trim_start_matches("<br/>")