Added regex

Author: alanpoon

Cargo.lock

@@ -52,6 +52,7 @@ bytesize = "2.0"
 bitflags = "2.6.0"
 indexmap = "2.6.0"
 blurhash = { version = "0.2.3", default-features = false }
+regex = "1.11.1"
 
 tsp_sdk = { git = "https://github.com/openwallet-foundation-labs/tsp.git", optional = true, features = ["async", "resolve"] }
 # tsp_sdk = { version = "0.8.0", optional = true, default-features = false, features = ["async", "resolve"] }

Cargo.toml

@@ -359,7 +359,7 @@ impl MatchEvent for App {
             //     }
             //     _ => {}
             // }
-            if let MessageSearchAction::Clicked(_) = action.as_widget_action().cast() {
+            if let MessageSearchAction::Clicked = action.as_widget_action().cast() {
                 cx.widget_action(
                     self.ui.widget_uid(),
                     &Scope::default().path,

src/app.rs

@@ -69,7 +69,7 @@ live_design! {
                                 visible: false,
                                 align: {x: 1.0},
 
-                                cw = <CachedWidget> {
+                                <CachedWidget> {
                                     message_search_input_bar = <MessageSearchInputBar> {
                                         width: 300,
                                     }

src/home/home_screen.rs

@@ -79,13 +79,10 @@ impl Widget for RightPanel {
 
 impl WidgetMatchEvent for RightPanel {
     fn handle_actions(&mut self, cx: &mut Cx, actions: &Actions, _scope: &mut Scope) {
-        if self.view.button(id!(back_button)).clicked(actions) {
-            self.view.set_visible(cx, true);
-        }
 
         for action in actions.iter() {
             match action.as_widget_action().cast() {
-                MessageSearchAction::Clicked(_) => {
+                MessageSearchAction::Clicked => {
                     self.view.set_visible(cx, true);
                     self.view.stack_navigation(id!(view_stack)).pop_to_root(cx);
                     self.view

src/right_panel/mod.rs

@@ -17,7 +17,7 @@ use matrix_sdk_ui::timeline::{Profile, TimelineDetails};
 use rangemap::RangeSet;
 
 use crate::{
-    app::AppState,
+    app::{AppState, AppStateAction},
     home::{
         room_screen::{
             populate_text_message_content, ItemDrawnStatus, JumpToMessageRequest, MessageWidgetRefExt,
@@ -84,9 +84,9 @@ live_design! {
         draw_bg: {
             instance color: (COLOR_BUTTON_GREY)
             instance color_hover: #fef65b
-            instance border_width: 1.5
-            instance radius: 3.0
-            instance hover: 0.0
+            uniform border_width: 1.5
+            uniform border_radius: 4.0
+            uniform hover: 0.0
             fn get_color(self) -> vec4 {
                 return mix(self.color, mix(self.color, self.color_hover, 0.2), self.hover)
             }
@@ -97,7 +97,7 @@ live_design! {
                     self.border_width,
                     self.rect_size.x - self.border_width * 2.0,
                     self.rect_size.y - self.border_width * 2.0,
-                    max(1.0, self.radius)
+                    max(1.0, self.border_radius)
                 )
                 sdf.fill(self.get_color());
                 return sdf.result;
@@ -283,7 +283,6 @@ pub fn highlight_search_terms_in_message(message: &mut RoomMessageEventContent,
         } else {
             let formatted_string = apply_highlights(text.body.clone(), highlights);
             // issue of returning one result
-            println!("formatted_string {:?}", formatted_string);
             formatted_string
         };
         text.formatted = Some(FormattedBody::html(formatted));
@@ -335,8 +334,6 @@ struct SearchResults {
 impl Widget for SearchResults {
     /// Handles events and actions for the SearchResults widget and its inner Timeline view.
     fn handle_event(&mut self, cx: &mut Cx, event: &Event, scope: &mut Scope) {
-        self.view.handle_event(cx, event, scope);
-
         // Handle pagination when user scrolls to the top
         if let Event::Actions(actions) = event {
             let search_portal_list = self.portal_list(id!(searched_messages.list));
@@ -347,7 +344,7 @@ impl Widget for SearchResults {
                 scope,
             );
         }
-
+        self.view.handle_event(cx, event, scope);
         self.widget_match_event(cx, event, scope);
     }
 
@@ -434,11 +431,11 @@ impl SearchResults {
         portal_list: &PortalListRef,
         _scope: &mut Scope,
     ) {
+        let total_items = self.search_state.items.len();
+        if total_items == 0 { return };
         if self.search_state.is_fully_paginated { return };
         if !portal_list.scrolled(actions) { return };
-
         let first_index = portal_list.first_id();
-        let total_items = self.search_state.items.len();
         let visible_items: usize = portal_list.visible_items();
         log!("Scrolled down from item {} --> {:?}, before sending room {:?} last index {:?}",
             self.search_state.last_scrolled_index, total_items, self.room_id, first_index + visible_items
@@ -530,11 +527,14 @@ impl SearchResults {
     fn handle_search_bar_action(&mut self, cx: &mut Cx, scope: &mut Scope, action: &Action) {
         match action.as_widget_action().cast() {
             MessageSearchAction::Changed(search_term) => {
+                self.hide_bottom_space(cx);
                 let search_result_summary_ref =
                     self.search_result_summary(id!(search_result_plane));
-                search_result_summary_ref.reset(cx);
                 self.search_state = SearchState::default();
                 if search_term.is_empty() {
+                    self.view
+                        .button_set(ids!(search_all_rooms_button, search_again_button))
+                        .set_enabled(cx, false);
                     // Abort previous inflight search request regardless of message choice if search term is empty.
                     submit_async_request(MatrixRequest::SearchMessages {
                         criteria: create_search_criteria(search_term, MessageSearchChoice::AllRooms),
@@ -543,6 +543,9 @@ impl SearchResults {
                     });
                     return;
                 }
+                self.view
+                    .button_set(ids!(search_all_rooms_button, search_again_button))
+                    .set_enabled(cx, true);
                 if let Some(selected_room) = {
                     let app_state = scope.data.get::<AppState>().unwrap();
                     app_state.selected_room.clone()
@@ -573,22 +576,30 @@ impl SearchResults {
                     });
                 }
             }
-            MessageSearchAction::Clicked(search_term) => {
+            MessageSearchAction::Clicked => {
                 let search_result_summary_ref =
                     self.search_result_summary(id!(search_result_plane));
-                if let Some(selected_room) = {
-                    let app_state = scope.data.get::<AppState>().unwrap();
-                    app_state.selected_room.clone()
-                } {
-                    let room_id = selected_room.room_id();
-                    let criteria = create_search_criteria(search_term, MessageSearchChoice::OneRoom(room_id.clone()));
-                    search_result_summary_ref.display_search_criteria(cx, scope, criteria);
+                let message_search_input_bar_ref = cx.get_global::<MessageSearchInputBarRef>();
+                let search_term = message_search_input_bar_ref.get_text();
+                if search_term.is_empty() {
+                    search_result_summary_ref.display_instruction(cx);
                 }
             }
             _ => {}
         }
     }
 
+    fn handle_room_focus_changed_action(&mut self, cx: &mut Cx, action: &Action) {
+        match action.as_widget_action().cast() {
+            AppStateAction::RoomFocused(_room_id) => {
+                // Show the search again button
+                self.view
+                    .button(id!(search_again_button))
+                    .set_visible(cx, true);
+            }
+            _ => { }
+        }
+    }
     /// Displays the loading view for backwards pagination for search result.
     fn display_bottom_space(&mut self, cx: &mut Cx) {
         self.view.view(id!(bottom_space)).set_visible(cx, true);
@@ -604,6 +615,7 @@ impl WidgetMatchEvent for SearchResults {
     fn handle_actions(&mut self, cx: &mut Cx, actions: &Actions, scope: &mut Scope) {
         for action in actions.iter() {
             self.handle_search_bar_action(cx, scope, action);
+            self.handle_room_focus_changed_action(cx, action);
             match action.downcast_ref() {
                 Some(SearchResultAction::Received(results)) => {
                     self.process_search_results(cx, scope, results.clone());
@@ -625,17 +637,22 @@ impl WidgetMatchEvent for SearchResults {
             }
             let search_all_rooms_button = self.view.button(id!(search_all_rooms_button));
             if search_all_rooms_button.clicked(actions) {
+                let message_search_input_bar_ref = cx.get_global::<MessageSearchInputBarRef>();
+                let search_term = message_search_input_bar_ref.get_text();
+                if search_term.is_empty() {
+                    continue;
+                }
+                self.search_state = SearchState::default();
                 // Disable the button during search
                 search_all_rooms_button.set_enabled(cx, false);
+                let criteria = create_search_criteria(search_term, MessageSearchChoice::AllRooms);
                 let search_result_summary_ref =
                     self.search_result_summary(id!(search_result_plane));
-                search_result_summary_ref.reset(cx);
+                search_result_summary_ref.set_includes_all_rooms(cx, true);
+                search_result_summary_ref.display_search_criteria(cx, scope, criteria.clone());
                 self.display_bottom_space(cx);
-                self.search_state = SearchState::default();
-                let message_search_input_bar_ref = cx.get_global::<MessageSearchInputBarRef>();
-                let search_term = message_search_input_bar_ref.get_text();
                 submit_async_request(MatrixRequest::SearchMessages {
-                    criteria: create_search_criteria(search_term, MessageSearchChoice::AllRooms),
+                    criteria,
                     next_batch: None,
                     abort_previous_search: true,
                 });
@@ -655,6 +672,10 @@ impl WidgetMatchEvent for SearchResults {
                 } {
                     let search_result_summary_ref =
                         self.search_result_summary(id!(search_result_plane));
+                    let Some(previous_room_id) = &self.room_id else { continue; };
+                    if previous_room_id != selected_room.room_id() {
+                        self.search_state = SearchState::default();
+                    }
                     let includes_all_rooms = search_result_summary_ref.includes_all_rooms();
                     let room_id = selected_room.room_id();
                     self.room_id = Some(room_id.clone());
@@ -673,11 +694,23 @@ impl WidgetMatchEvent for SearchResults {
                     search_all_rooms_button.set_enabled(cx, false);
                     let message_search_input_bar_ref = cx.get_global::<MessageSearchInputBarRef>();
                     let search_term = message_search_input_bar_ref.get_text();
-                    submit_async_request(MatrixRequest::SearchMessages {
-                        criteria: create_search_criteria(search_term, MessageSearchChoice::OneRoom(room_id.clone())),
-                        next_batch: None,
-                        abort_previous_search: true,
-                    });
+                    if includes_all_rooms {
+                        let criteria = create_search_criteria(search_term, MessageSearchChoice::AllRooms);
+                        search_result_summary_ref.display_search_criteria(cx, scope, criteria.clone());
+                        submit_async_request(MatrixRequest::SearchMessages {
+                            criteria,
+                            next_batch: None,
+                            abort_previous_search: true,
+                        });
+                    } else {
+                        let criteria = create_search_criteria(search_term, MessageSearchChoice::OneRoom(room_id.clone()));
+                        search_result_summary_ref.display_search_criteria(cx, scope, criteria.clone());
+                        submit_async_request(MatrixRequest::SearchMessages {
+                            criteria,
+                            next_batch: None,
+                            abort_previous_search: true,
+                        });
+                    }
                 }
             }
         }
@@ -755,7 +788,7 @@ impl SearchResultSummary {
     /// This function is used to display the search criteria in the top-right of the room screen.
     /// It is typically used when a new search is initiated.
     ///
-    fn display_search_criteria(&mut self, cx: &mut Cx, scope: &mut Scope, search_criteria: MatrixCriteria) {
+    pub fn display_search_criteria(&mut self, cx: &mut Cx, scope: &mut Scope, search_criteria: MatrixCriteria) {
         self.room_name = scope.data.get::<AppState>().and_then(|f| {
             f.selected_room
                 .as_ref()
@@ -784,7 +817,7 @@ impl SearchResultSummary {
     /// Display result summary.
     ///
     /// This is used to display the number of search results and the search term at the top of the search result.
-    fn display_result_summary(&mut self, 
+    pub fn display_result_summary(&mut self, 
         cx: &mut Cx, 
         results: &SearchResultReceived
     ) {
@@ -809,17 +842,25 @@ impl SearchResultSummary {
         );
     }
 
-    /// Resets the search result summary and set the loading view back to visible.
-    ///
-    /// This function clears the summary text and makes the loading indicator visible.
-    /// It is typically used when a new search is initiated or search results are being cleared.
-    fn reset(&mut self, cx: &mut Cx) {
-        self.view.markdown(id!(summary_label)).set_text(cx, "");
-        self.visible = false;
+    /// Set whether the search criteria to include all rooms.
+    pub fn set_includes_all_rooms(&mut self, _cx: &mut Cx, includes_all_rooms: bool) {
+        self.includes_all_rooms = includes_all_rooms;
     }
 }
 
 impl SearchResultSummaryRef {
+    /// Display instruction to type to search.
+    pub fn display_instruction(&self, cx: &mut Cx) {
+        let Some(mut inner) = self.borrow_mut() else {
+            return;
+        };
+        inner.view.markdown(id!(summary_label)).set_text(
+            cx,
+            "Type to search.",
+        );
+        inner.visible = true;
+    }
+    
     /// See [`SearchResultSummary::display_search_criteria()`].
     pub fn display_search_criteria(&self, cx: &mut Cx, scope: &mut Scope, search_criteria: MatrixCriteria) {
         let Some(mut inner) = self.borrow_mut() else {
@@ -836,21 +877,21 @@ impl SearchResultSummaryRef {
         inner.display_result_summary(cx, results);
     }
 
-    /// See [`SearchResultSummary::reset()`].
-    pub fn reset(&self, cx: &mut Cx) {
-        let Some(mut inner) = self.borrow_mut() else {
-            return;
-        };
-        inner.reset(cx);
-    }
-
     /// See [`SearchResultSummary::includes_all_rooms()`].
     pub fn includes_all_rooms(&self) -> bool {
         let Some(inner) = self.borrow() else {
             return false;
         };
         inner.includes_all_rooms
     }
+
+    /// See [`SearchResultSummary::set_includes_all_rooms()`].
+    pub fn set_includes_all_rooms(&self, cx: &mut Cx, includes_all_rooms: bool) {
+        let Some(mut inner) = self.borrow_mut() else {
+            return;
+        };
+        inner.set_includes_all_rooms(cx, includes_all_rooms);
+    }
 }
 
 /// Search result as timeline item

src/right_panel/search_message.rs

@@ -83,7 +83,7 @@ pub enum MessageSearchAction {
     /// Emitted when the user has changed the text (after debounce delay or clear button).
     Changed(String),
     /// Emitted when the user has clicked the input bar.
-    Clicked(String),
+    Clicked,
     None,
 }
 
@@ -98,16 +98,16 @@ impl Widget for MessageSearchInputBar {
                 );
             }
         }
-        self.view.handle_event(cx, event, scope);
         let area = self.text_input(id!(input)).area();
         if let Hit::FingerDown(..) = event.hits(cx, area) {
             let widget_uid = self.widget_uid();
             cx.widget_action(
                 widget_uid,
                 &scope.path,
-                MessageSearchAction::Clicked(self.view.text_input(id!(input)).text())
+                MessageSearchAction::Clicked
             );
         }
+        self.view.handle_event(cx, event, scope);
         self.widget_match_event(cx, event, scope);
     }
 

src/shared/message_search_input_bar.rs

@@ -1182,7 +1182,7 @@ async fn async_worker(
                         Ok(response) => {
                             let next_batch =
                                 response.search_categories.room_events.next_batch.clone();
-                            let mut last_room_id = None;
+                            let mut room_id_for_grouping = None;
                             let result = response.search_categories;
                             let mut items = Vector::new();
                             let mut profile_infos = BTreeMap::new();
@@ -1232,13 +1232,13 @@ async fn async_worker(
                                 );
                                 // Include all rooms in the search results.
                                 if room_filter.is_none() {                                
-                                    if let Some(ref mut last_room_id) = last_room_id {
-                                        if last_room_id != &event_room_id {
-                                            *last_room_id = event_room_id.clone();
+                                    if let Some(ref mut room_id_for_grouping) = room_id_for_grouping {
+                                        if room_id_for_grouping != &event_room_id {
+                                            *room_id_for_grouping = event_room_id.clone();
                                             items.push_back(right_panel::search_message::SearchResultItem::RoomHeader(event_room_id));
                                         }
                                     } else {
-                                        last_room_id = Some(event_room_id.clone());
+                                        room_id_for_grouping = Some(event_room_id.clone());
                                         items.push_back(right_panel::search_message::SearchResultItem::RoomHeader(event_room_id));
                                     }
                                 }