From b2b5a76caa12a39f46ae84c54640658b11eef58e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 29 Sep 2023 16:18:12 +0200
Subject: [PATCH] Ensure the preview match the behavior (and improve code
 coverage)

---
 .../forward/ForwardMessagesStateProvider.kt   | 36 +++++++++++--------
 .../impl/forward/ForwardMessagesView.kt       |  2 +-
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesStateProvider.kt
index 56d7f63eb1..dbcb4c8c3c 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesStateProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesStateProvider.kt
@@ -20,8 +20,8 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.api.roomlist.RoomSummaryDetails
 import io.element.android.libraries.matrix.api.room.message.RoomMessage
+import io.element.android.libraries.matrix.api.roomlist.RoomSummaryDetails
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 
@@ -29,29 +29,37 @@ open class ForwardMessagesStateProvider : PreviewParameterProvider<ForwardMessag
     override val values: Sequence<ForwardMessagesState>
         get() = sequenceOf(
             aForwardMessagesState(),
-            aForwardMessagesState(query = "Test"),
+            aForwardMessagesState(query = "Test", isSearchActive = true),
             aForwardMessagesState(resultState = SearchBarResultState.Results(aForwardMessagesRoomList())),
-            aForwardMessagesState(resultState = SearchBarResultState.Results(aForwardMessagesRoomList()), query = "Test"),
             aForwardMessagesState(
                 resultState = SearchBarResultState.Results(aForwardMessagesRoomList()),
                 query = "Test",
+                isSearchActive = true,
+            ),
+            aForwardMessagesState(
+                resultState = SearchBarResultState.Results(aForwardMessagesRoomList()),
+                query = "Test",
+                isSearchActive = true,
                 selectedRooms = persistentListOf(aRoomDetailsState(roomId = RoomId("!room2:domain")))
             ),
             aForwardMessagesState(
                 resultState = SearchBarResultState.Results(aForwardMessagesRoomList()),
                 query = "Test",
+                isSearchActive = true,
                 selectedRooms = persistentListOf(aRoomDetailsState(roomId = RoomId("!room2:domain"))),
                 isForwarding = true,
             ),
             aForwardMessagesState(
                 resultState = SearchBarResultState.Results(aForwardMessagesRoomList()),
                 query = "Test",
+                isSearchActive = true,
                 selectedRooms = persistentListOf(aRoomDetailsState(roomId = RoomId("!room2:domain"))),
                 forwardingSucceeded = persistentListOf(RoomId("!room2:domain")),
             ),
             aForwardMessagesState(
                 resultState = SearchBarResultState.Results(aForwardMessagesRoomList()),
                 query = "Test",
+                isSearchActive = true,
                 selectedRooms = persistentListOf(aRoomDetailsState(roomId = RoomId("!room2:domain"))),
                 error = Throwable("error"),
             ),
@@ -78,7 +86,7 @@ fun aForwardMessagesState(
     eventSink = {}
 )
 
-internal fun aForwardMessagesRoomList() = listOf(
+internal fun aForwardMessagesRoomList() = persistentListOf(
     aRoomDetailsState(),
     aRoomDetailsState(roomId = RoomId("!room2:domain"), canonicalAlias = "#element-x-room:matrix.org"),
 )
@@ -94,13 +102,13 @@ fun aRoomDetailsState(
     unreadNotificationCount: Int = 0,
     inviter: RoomMember? = null,
 ) = RoomSummaryDetails(
-        roomId = roomId,
-        name = name,
-        canonicalAlias = canonicalAlias,
-        isDirect = isDirect,
-        avatarURLString = avatarURLString,
-        lastMessage = lastMessage,
-        lastMessageTimestamp = lastMessageTimestamp,
-        unreadNotificationCount = unreadNotificationCount,
-        inviter = inviter,
-    )
+    roomId = roomId,
+    name = name,
+    canonicalAlias = canonicalAlias,
+    isDirect = isDirect,
+    avatarURLString = avatarURLString,
+    lastMessage = lastMessage,
+    lastMessageTimestamp = lastMessageTimestamp,
+    unreadNotificationCount = unreadNotificationCount,
+    inviter = inviter,
+)
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt
index f21a7cd335..b6aa4645b6 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt
@@ -135,7 +135,7 @@ fun ForwardMessagesView(
                 .padding(paddingValues)
                 .consumeWindowInsets(paddingValues)
         ) {
-            SearchBar<ImmutableList<RoomSummaryDetails>>(
+            SearchBar(
                 placeHolderTitle = stringResource(CommonStrings.action_search),
                 query = state.query,
                 onQueryChange = { state.eventSink(ForwardMessagesEvents.UpdateQuery(it)) },