Keep the typed text when sending a sticker or GIF from the panel (#151)

* Keep the typed text when sending a sticker or GIF from the panel

sendAppFile finishes with _afterSentTransition(false) so the input is
kept, but _afterSentTransition reset the input state unconditionally
right after the flushInput check, so every sticker or GIF sent from the
panel erased the draft.

Remove the unconditional reset. Every other send path passes true and
still clears the field, and sticker suggestions clear the input
themselves. iOS keeps the typed text in the same case.

* Keep the link preview and effect with the text kept after a sticker

When a sticker or GIF is sent without flushing the input, keep the
dismissed link preview, the current preview and the chosen message
effect that belong to the kept text, and reset them only when the
input is flushed.

* Reset the compose state with the text when the input ends up empty

Sticker suggestions and the media preview clear the input themselves
before the send completes, so keeping the link preview and the effect
whenever the input was not flushed left them applied to the next
message. Keep them, and the suggested post too, only when the input
still has text after the send.

* Keep suggestions with the kept text and reset while editing

When the input text is kept after a sticker or GIF, keep the mention,
command or sticker suggestion list for it too. While a message is being
edited, reset the compose state as before, since the kept-text check
would otherwise look at the hidden draft instead of the edit.

* Run the pending after-send handler before a sticker send sets its own

A sticker or GIF sent from the panel before the history update of a just-sent
text message replaced that message's handler, so the sent text stayed in the
field. The pending handler now runs first and clears it.

* Reset the effect with a sticker send and keep its reply

The message effect and suggested post were kept with the text after a
sticker or GIF send; they are now reset, as on iOS. The pending
after-send step of an earlier send runs before the forwards are checked,
so a stale forward flag no longer sends an empty composer, while the
sticker still takes the reply. A scheduled sticker runs its step right
away, as sendMessage does.

Author: null00x

packages/ChatUI/Sources/ChatUI/ChatController.swift

@@ -4518,19 +4518,19 @@ open class ChatController<Context: AccountContextProtocol>: TelegramGenericViewC
 
         let _afterSentTransition:(Bool)->Void = { [weak self] flushInput in
             self?.chatInteraction.update({ presentation in
-                return presentation.updatedInputQueryResult {_ in
-                    return nil
+                let keepsInput = !flushInput && presentation.interfaceState.editState == nil && !presentation.interfaceState.inputState.inputText.isEmpty
+                return presentation.updatedInputQueryResult { current in
+                    return keepsInput ? current : nil
                 }.updatedInterfaceState { current in
 
                     var value: ChatInterfaceState = current
-                    if flushInput {
+                    if !keepsInput {
                         value = value
                             .withUpdatedInputState(ChatTextInputState())
+                            .withUpdatedComposeDisableUrlPreview(nil)
                     }
                     value = value.withUpdatedReplyMessageId(nil)
-                        .withUpdatedInputState(ChatTextInputState())
                         .withUpdatedForwardMessageIds([])
-                        .withUpdatedComposeDisableUrlPreview(nil)
                         .withUpdatedMessageEffect(nil)
                         .withUpdatedSuggestPost(nil)
                         .withoutEditMessage()
@@ -4541,7 +4541,7 @@ open class ChatController<Context: AccountContextProtocol>: TelegramGenericViewC
                         }
                     }
                     return value
-                }.updatedUrlPreview(nil).updateBotMenu({ current in
+                }.updatedUrlPreview(keepsInput ? presentation.urlPreview : nil).updateBotMenu({ current in
                     var current = current
                     current?.revealed = false
                     return current
@@ -6761,26 +6761,33 @@ open class ChatController<Context: AccountContextProtocol>: TelegramGenericViewC
             if peer.canSendMessage(strongSelf.mode.isThreadMode, media: file, threadData: strongSelf.chatInteraction.presentation.threadInfo, cachedData: strongSelf.chatInteraction.presentation.cachedData) {
 
                 let invoke:()->Void = { [strongSelf] in
-                    let hasFwd = !strongSelf.chatInteraction.presentation.interfaceState.forwardMessageIds.isEmpty
                     func apply(_ controller: ChatController, atDate: Date?, repeatPeriod: Int32?) {
+                        let replyId = takeReplyId()
+                        _ = controller.nextTransaction.execute()
+                        let hasFwd = !controller.chatInteraction.presentation.interfaceState.forwardMessageIds.isEmpty
                         let completed: () -> Void = {
                             scrollAfterSend()
                         }
                         if let caption = caption {
-                            let _ = (Sender.enqueue(media: [file], caption: caption, context: context, peerId: makePeerId(), replyId: takeReplyId(), threadId: threadId64(), silent: silent, atDate: atDate, repeatPeriod: repeatPeriod, query: query, collectionId: collectionId, customChatContents: customChatContents, sendPaidMessageStars: takePaidMessageStars()) |> deliverOnMainQueue).start(completed: completed)
+                            let _ = (Sender.enqueue(media: [file], caption: caption, context: context, peerId: makePeerId(), replyId: replyId, threadId: threadId64(), silent: silent, atDate: atDate, repeatPeriod: repeatPeriod, query: query, collectionId: collectionId, customChatContents: customChatContents, sendPaidMessageStars: takePaidMessageStars()) |> deliverOnMainQueue).start(completed: completed)
                         } else {
-                            let _ = (Sender.enqueue(media: file, context: context, peerId: makePeerId(), replyId: takeReplyId(), threadId: threadId64(), silent: silent, atDate: atDate, repeatPeriod: repeatPeriod, query: query, collectionId: collectionId, customChatContents: customChatContents, sendPaidMessageStars: takePaidMessageStars()) |> deliverOnMainQueue).start(next: { ids in
+                            let _ = (Sender.enqueue(media: file, context: context, peerId: makePeerId(), replyId: replyId, threadId: threadId64(), silent: silent, atDate: atDate, repeatPeriod: repeatPeriod, query: query, collectionId: collectionId, customChatContents: customChatContents, sendPaidMessageStars: takePaidMessageStars()) |> deliverOnMainQueue).start(next: { ids in
                             }, completed: completed)
                         }
-                        controller.nextTransaction.set(handler: {
+                        let afterSent: () -> Void = {
                             if hasFwd {
                                 DispatchQueue.main.async {
                                     self?.chatInteraction.sendMessage(false, nil, self?.chatInteraction.presentation.messageEffect)
                                 }
                             } else {
                                 _afterSentTransition(false)
                             }
-                        })
+                        }
+                        if atDate != nil {
+                            afterSent()
+                        } else {
+                            controller.nextTransaction.set(handler: afterSent)
+                        }
                     }
 
                     if let preSchedule = preSchedule {