Hook up the emoji picker to the custom status row. (#5902)

* Refactor EmojiPickerScreen to take a continuation instead of a timeline/itemID. * Hook up the emoji picker to the custom status row.
2026-11-04 00:49:44 +00:00 · 2026-07-22 13:35:37 +01:00
parent a6466e80e0
commit 32a54c5b71
19 changed files with 223 additions and 92 deletions
@@ -10,10 +10,11 @@ import Combine
 import SwiftUI

 struct EmojiPickerScreenCoordinatorParameters {
-    let itemID: TimelineItemIdentifier
+    /// Any emojis that should be displayed as already selected.
    let selectedEmojis: Set<String>
    let emojiProvider: EmojiProviderProtocol
-    let timelineController: TimelineControllerProtocol
+    /// A continuation that yields the selected emoji.
+    let continuation: EmojiPickerScreenContinuation
 }

 enum EmojiPickerScreenCoordinatorAction {
@@ -31,10 +32,9 @@ final class EmojiPickerScreenCoordinator: CoordinatorProtocol {
    }
    
    init(parameters: EmojiPickerScreenCoordinatorParameters) {
-        viewModel = EmojiPickerScreenViewModel(itemID: parameters.itemID,
-                                               selectedEmojis: parameters.selectedEmojis,
+        viewModel = EmojiPickerScreenViewModel(selectedEmojis: parameters.selectedEmojis,
                                               emojiProvider: parameters.emojiProvider,
-                                               timelineController: parameters.timelineController)
+                                               continuation: parameters.continuation)
    }
    
    func start() {
@@ -50,6 +50,10 @@ final class EmojiPickerScreenCoordinator: CoordinatorProtocol {
            .store(in: &cancellables)
    }
    
+    func stop() {
+        viewModel.stop()
+    }
+    
    func toPresentable() -> AnyView {
        AnyView(EmojiPickerScreen(context: viewModel.context))
    }
@@ -8,6 +8,8 @@

 import Foundation

+typealias EmojiPickerScreenContinuation = AsyncStream<String>.Continuation
+
 enum EmojiPickerScreenViewModelAction {
    case dismiss
 }
@@ -12,26 +12,28 @@ import SwiftUI
 typealias EmojiPickerScreenViewModelType = StateStoreViewModelV2<EmojiPickerScreenViewState, EmojiPickerScreenViewAction>

 class EmojiPickerScreenViewModel: EmojiPickerScreenViewModelType, EmojiPickerScreenViewModelProtocol {
-    private let itemID: TimelineItemIdentifier
    private let emojiProvider: EmojiProviderProtocol
-    private let timelineController: TimelineControllerProtocol
+    private let continuation: EmojiPickerScreenContinuation
    
    private var actionsSubject: PassthroughSubject<EmojiPickerScreenViewModelAction, Never> = .init()
    var actions: AnyPublisher<EmojiPickerScreenViewModelAction, Never> {
        actionsSubject.eraseToAnyPublisher()
    }
    
-    init(itemID: TimelineItemIdentifier, selectedEmojis: Set<String>, emojiProvider: EmojiProviderProtocol, timelineController: TimelineControllerProtocol) {
+    init(selectedEmojis: Set<String>, emojiProvider: EmojiProviderProtocol, continuation: EmojiPickerScreenContinuation) {
        let initialViewState = EmojiPickerScreenViewState(categories: [], selectedEmojis: selectedEmojis)
-        self.itemID = itemID
        self.emojiProvider = emojiProvider
-        self.timelineController = timelineController
+        self.continuation = continuation
        super.init(initialViewState: initialViewState)
        loadEmojis()
    }
    
    // MARK: - Public
    
+    func stop() {
+        continuation.finish() // Ensure the continuation always finishes even without a selection.
+    }
+    
    override func process(viewAction: EmojiPickerScreenViewAction) {
        switch viewAction {
        case let .search(searchString: searchString):
@@ -40,7 +42,7 @@ class EmojiPickerScreenViewModel: EmojiPickerScreenViewModelType, EmojiPickerScr
                state.categories = convert(emojiCategories: categories)
            }
        case let .emojiTapped(emoji: emoji):
-            Task { await selectEmoji(emoji) }
+            selectEmoji(emoji)
        case .dismiss:
            actionsSubject.send(.dismiss)
        }
@@ -66,16 +68,12 @@ class EmojiPickerScreenViewModel: EmojiPickerScreenViewModelType, EmojiPickerScr
        }
    }
    
-    private func selectEmoji(_ emoji: EmojiPickerEmojiViewData) async {
-        MXLog.debug("Selected \(emoji) for \(itemID)")
+    private func selectEmoji(_ emoji: EmojiPickerEmojiViewData) {
        emojiProvider.markEmojiAsFrequentlyUsed(emoji.value)
        
-        guard case let .event(_, eventOrTransactionID) = itemID else { fatalError("Attempted to react to a virtual item.") }
+        continuation.yield(emoji.value)
+        continuation.finish()
        
-        // There aren't any local echoes when the toggle redacts, so dismiss the screen early
-        // until we have them: https://github.com/matrix-org/matrix-rust-sdk/issues/4162
        actionsSubject.send(.dismiss)
-        
-        await timelineController.toggleReaction(emoji.value, to: eventOrTransactionID)
    }
 }
@@ -11,4 +11,6 @@ import Combine
 protocol EmojiPickerScreenViewModelProtocol {
    var actions: AnyPublisher<EmojiPickerScreenViewModelAction, Never> { get }
    var context: EmojiPickerScreenViewModelType.Context { get }
+    
+    func stop()
 }
@@ -102,10 +102,9 @@ struct EmojiPickerScreen: View {

@available(iOS 26.0, *)
 struct EmojiPickerScreen_Previews: PreviewProvider, TestablePreview {
-    static let viewModel = EmojiPickerScreenViewModel(itemID: .randomEvent,
-                                                      selectedEmojis: ["😀", "😄"],
+    static let viewModel = EmojiPickerScreenViewModel(selectedEmojis: ["😀", "😄"],
                                                      emojiProvider: EmojiProvider(appSettings: .volatile()),
-                                                      timelineController: TimelineControllerMock(.init()))
+                                                      continuation: AsyncStream<String>.makeStream().continuation)
    
    static var previews: some View {
        EmojiPickerScreen(context: viewModel.context)
@@ -115,10 +114,9 @@ struct EmojiPickerScreen_Previews: PreviewProvider, TestablePreview {
 }

 struct EmojiPickerScreenSheet_Previews: PreviewProvider {
-    static let viewModel = EmojiPickerScreenViewModel(itemID: .randomEvent,
-                                                      selectedEmojis: ["😀", "😄"],
+    static let viewModel = EmojiPickerScreenViewModel(selectedEmojis: ["😀", "😄"],
                                                      emojiProvider: EmojiProvider(appSettings: .volatile()),
-                                                      timelineController: TimelineControllerMock(.init()))
+                                                      continuation: AsyncStream<String>.makeStream().continuation)
    
    static var previews: some View {
        Text("Timeline view")
@@ -41,7 +41,7 @@ enum RoomScreenCoordinatorAction {
    case presentPollForm(mode: PollFormMode)
    case presentLocationViewer(StaticLocationData)
    case presentLiveLocationViewer(sender: TimelineItemSender?, initialLiveLocationShare: LiveLocationShare?)
-    case presentEmojiPicker(itemID: TimelineItemIdentifier, selectedEmojis: Set<String>)
+    case presentEmojiPicker(selectedEmojis: Set<String>, continuation: EmojiPickerScreenContinuation)
    case presentRoomMemberDetails(userID: String)
    case presentMessageForwarding(forwardingItem: MessageForwardingItem)
    case presentCallScreen(isVoiceCall: Bool)
@@ -117,8 +117,8 @@ final class RoomScreenCoordinator: CoordinatorProtocol {
                guard let self else { return }
                
                switch action {
-                case .displayEmojiPicker(let itemID, let selectedEmojis):
-                    actionsSubject.send(.presentEmojiPicker(itemID: itemID, selectedEmojis: selectedEmojis))
+                case .displayEmojiPicker(let selectedEmojis, let continuation):
+                    actionsSubject.send(.presentEmojiPicker(selectedEmojis: selectedEmojis, continuation: continuation))
                case .displayReportContent(let itemID, let senderID):
                    actionsSubject.send(.presentReportContent(itemID: itemID, senderID: senderID))
                case .displayCameraPicker:
@@ -22,6 +22,7 @@ enum SettingsScreenCoordinatorAction {
    case logout
    case secureBackup
    case userDetails
+    case userStatusEmojiPicker(EmojiPickerScreenContinuation)
    case analytics
    case appLock
    case bugReport
@@ -64,6 +65,8 @@ final class SettingsScreenCoordinator: CoordinatorProtocol {
                    actionsSubject.send(.dismiss)
                case .userDetails:
                    actionsSubject.send(.userDetails)
+                case let .userStatusEmojiPicker(continuation):
+                    actionsSubject.send(.userStatusEmojiPicker(continuation))
                case .linkNewDevice:
                    actionsSubject.send(.linkNewDevice)
                case let .manageAccount(url):
@@ -8,9 +8,10 @@

 import SwiftUI

-enum SettingsScreenViewModelAction: Equatable {
+enum SettingsScreenViewModelAction {
    case close
    case userDetails
+    case userStatusEmojiPicker(EmojiPickerScreenContinuation)
    case linkNewDevice
    case manageAccount(url: URL)
    case analytics
@@ -55,7 +56,7 @@ struct SettingsScreenViewState: BindableState {
    
    var userStatusRowMode: SettingsScreenUserStatusRow.Mode {
        if bindings.isShowingCustomStatusField {
-            .custom
+            .custom(emoji: bindings.customStatusEmoji)
        } else if let rawStatus = userProfile.status.raw {
            .show(rawStatus)
        } else {
@@ -66,7 +67,15 @@ struct SettingsScreenViewState: BindableState {

 struct SettingsScreenViewStateBindings {
    var isPresentingStatusPicker = false
-    var isShowingCustomStatusField = false
+    var customStatusEmoji: Character = "😄"
+    var isShowingCustomStatusField = false {
+        didSet {
+            if !isShowingCustomStatusField {
+                customStatusEmoji = "😄" // Reset the emoji.
+            }
+        }
+    }
+    
    var isPresentingAccountDeactivationConfirmation = false
 }

@@ -103,7 +103,7 @@ class SettingsScreenViewModel: SettingsScreenViewModelType, SettingsScreenViewMo
            state.bindings.isPresentingStatusPicker = false
            state.bindings.isShowingCustomStatusField = true
        case .userStatus(.pickCustomEmoji):
-            break // Hook-up the emoji picker here.
+            pickCustomEmoji()
        case .userStatus(.set(let status)):
            Task { await setUserStatus(status) }
        case .userStatus(.cancel):
@@ -144,6 +144,19 @@ class SettingsScreenViewModel: SettingsScreenViewModelType, SettingsScreenViewMo
    
    // MARK: - Private
    
+    private var pickCustomEmojiCancellable: AnyCancellable?
+    private func pickCustomEmoji() {
+        let (stream, continuation) = AsyncStream<String>.makeStream()
+        actionsSubject.send(.userStatusEmojiPicker(continuation))
+        
+        pickCustomEmojiCancellable = Task { [weak self] in
+            for await emoji in stream {
+                self?.state.bindings.customStatusEmoji = Character(emoji)
+            }
+        }
+        .asCancellable()
+    }
+    
    func setUserStatus(_ status: UserStatus.Raw?) async {
        // Loading state tbc
        state.bindings.isPresentingStatusPicker = false
@@ -9,11 +9,10 @@ import Compound
 import SwiftUI

 struct SettingsScreenUserStatusRow: View {
-    enum Mode: Equatable { case pick, custom, show(UserStatus.Raw) }
+    enum Mode: Equatable { case pick, custom(emoji: Character), show(UserStatus.Raw) }
    let mode: Mode
    let action: (SettingsScreenViewAction.UserStatusAction) -> Void
    
-    @State private var customEmoji = "😄"
    @State private var customText = ""
    
    var body: some View {
@@ -21,15 +20,15 @@ struct SettingsScreenUserStatusRow: View {
        case .pick:
            ListRow(label: .default(title: L10n.screenSettingsUserStatusPlaceholder, icon: \.reaction),
                    kind: .button { action(.pickStatus) })
-        case .custom:
+        case .custom(let emoji):
            ListRow(kind: .custom {
                HStack(spacing: ListRowPadding.labelIconSpacing) {
                    Button { action(.pickCustomEmoji) } label: {
-                        Text(customEmoji)
+                        Text(String(emoji))
                            .font(.compound.headingSM)
                            .foregroundStyle(.compound.textPrimary)
                            .accessibilityLabel(L10n.a11yCustomEmoji)
-                            .accessibilityValue(customEmoji)
+                            .accessibilityValue(String(emoji))
                    }
                    .buttonStyle(EditEmojiButtonStyle())
                    
@@ -81,7 +80,7 @@ struct SettingsScreenUserStatusRow: View {
    }
    
    private func saveCustomStatus() {
-        guard let emoji = customEmoji.first else { return }
+        guard case let .custom(emoji) = mode else { return }
        action(.set(.init(text: customText, emoji: emoji)))
    }
    
@@ -109,7 +108,7 @@ struct SettingsScreenUserStatusRow_Previews: PreviewProvider, TestablePreview {
            }
            
            Section {
-                SettingsScreenUserStatusRow(mode: .custom) { _ in }
+                SettingsScreenUserStatusRow(mode: .custom(emoji: "😄")) { _ in }
            }
            
            Section {
@@ -36,7 +36,7 @@ enum ThreadTimelineScreenCoordinatorAction {
    case presentLocationViewer(StaticLocationData)
    case presentLiveLocationViewer(sender: TimelineItemSender, initialLiveLocationShare: LiveLocationShare)
    case presentPollForm(mode: PollFormMode)
-    case presentEmojiPicker(itemID: TimelineItemIdentifier, selectedEmojis: Set<String>)
+    case presentEmojiPicker(selectedEmojis: Set<String>, continuation: EmojiPickerScreenContinuation)
    case presentRoomMemberDetails(userID: String)
    case presentMessageForwarding(forwardingItem: MessageForwardingItem)
    case presentResolveSendFailure(failure: TimelineItemSendFailure.VerifiedUser, sendHandle: SendHandleProxy)
@@ -102,8 +102,8 @@ final class ThreadTimelineScreenCoordinator: CoordinatorProtocol {
                guard let self else { return }
                
                switch action {
-                case .displayEmojiPicker(let itemID, let selectedEmojis):
-                    actionsSubject.send(.presentEmojiPicker(itemID: itemID, selectedEmojis: selectedEmojis))
+                case .displayEmojiPicker(let selectedEmojis, let continuation):
+                    actionsSubject.send(.presentEmojiPicker(selectedEmojis: selectedEmojis, continuation: continuation))
                case .displayReportContent(let itemID, let senderID):
                    actionsSubject.send(.presentReportContent(itemID: itemID, senderID: senderID))
                case .displayCameraPicker:
@@ -12,7 +12,7 @@ import UIKit
 enum TimelineInteractionHandlerAction {
    case composer(action: TimelineComposerAction)
    
-    case displayEmojiPicker(itemID: TimelineItemIdentifier, selectedEmojis: Set<String>)
+    case displayEmojiPicker(selectedEmojis: Set<String>, continuation: EmojiPickerScreenContinuation)
    case displayReportContent(itemID: TimelineItemIdentifier, senderID: String)
    case displayMessageForwarding(itemID: TimelineItemIdentifier)
    case displayMediaUploadPreviewScreen(mediaURLs: [URL])
@@ -59,6 +59,8 @@ class TimelineInteractionHandler {
    
    private var resumeVoiceMessagePlaybackAfterScrubbing = false
    
+    private var emojiPickerCancellable: AnyCancellable?
+    
    init(roomProxy: JoinedRoomProxyProtocol,
         timelineController: TimelineControllerProtocol,
         userSession: UserSessionProtocol,
@@ -518,11 +520,21 @@ class TimelineInteractionHandler {
    func displayEmojiPicker(for itemID: TimelineItemIdentifier) {
        guard let timelineItem = timelineController.timelineItems.firstUsingStableID(itemID),
              timelineItem.isReactable,
-              let eventTimelineItem = timelineItem as? EventBasedTimelineItemProtocol else {
+              let eventTimelineItem = timelineItem as? EventBasedTimelineItemProtocol,
+              case let .event(_, eventOrTransactionID) = itemID else {
            return
        }
        let selectedEmojis = Set(eventTimelineItem.properties.reactions.compactMap { $0.isHighlighted ? $0.key : nil })
-        actionsSubject.send(.displayEmojiPicker(itemID: itemID, selectedEmojis: selectedEmojis))
+        
+        let (stream, continuation) = AsyncStream<String>.makeStream()
+        actionsSubject.send(.displayEmojiPicker(selectedEmojis: selectedEmojis, continuation: continuation))
+        
+        emojiPickerCancellable = Task { [weak self] in
+            for await emoji in stream {
+                await self?.timelineController.toggleReaction(emoji, to: eventOrTransactionID)
+            }
+        }
+        .asCancellable()
    }
    
    func processItemTap(_ itemID: TimelineItemIdentifier) async -> TimelineControllerAction {
@@ -12,7 +12,7 @@ import OrderedCollections
 import SwiftUI

 enum TimelineViewModelAction {
-    case displayEmojiPicker(itemID: TimelineItemIdentifier, selectedEmojis: Set<String>)
+    case displayEmojiPicker(selectedEmojis: Set<String>, continuation: EmojiPickerScreenContinuation)
    case displayReportContent(itemID: TimelineItemIdentifier, senderID: String)
    case displayCameraPicker
    case displayMediaPicker
@@ -511,8 +511,8 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol {
                    displayAlert(.audioRecodingPermissionError)
                case .displayErrorToast(let title):
                    displayErrorToast(title)
-                case .displayEmojiPicker(let itemID, let selectedEmojis):
-                    actionsSubject.send(.displayEmojiPicker(itemID: itemID, selectedEmojis: selectedEmojis))
+                case .displayEmojiPicker(let selectedEmojis, let continuation):
+                    actionsSubject.send(.displayEmojiPicker(selectedEmojis: selectedEmojis, continuation: continuation))
                case .displayMessageForwarding(let itemID):
                    Task { await self.forwardMessage(itemID: itemID) }
                case .displayEditPollForm(let eventID, let poll):