WIP

Author: isaac

.gitignore

@@ -83,3 +83,4 @@ xcode-files
 /buildbox/*
 **/node_modules/
 tools/sim-watcher/dist/
+.mcp.json

submodules/TelegramUI/Components/Chat/ChatMessageRichDataBubbleContentNode/Sources/ChatMessageRichDataBubbleContentNode.swift

@@ -272,13 +272,23 @@ public class ChatMessageRichDataBubbleContentNode: ChatMessageBubbleContentNode
     /// non-pending-edit) InstantPage — the only rendering whose checkbox paths are safe to
     /// edit — AND the message is editable.
     private func checkboxesInteractive(item: ChatMessageBubbleContentItem, resolved: ResolvedRichDataContent) -> Bool {
-        // Only the `.original` key is eligible; `.translated` and `.pendingEdit` are inert.
-        guard case .original = resolved.key else {
+        // `.original` (server state) and `.pendingEdit` (an in-flight edit) are both eligible —
+        // keeping checkboxes live during the pending round-trip lets the user toggle several boxes
+        // in a row. `.translated` is inert, as is the translation-pending fallback (which reports an
+        // `.original` key over the genuine original page but with `isTranslating == true`).
+        switch resolved.key {
+        case .original, .pendingEdit:
+            break
+        case .translated:
             return false
         }
-        // The primary page is `attribute.instantPage` (class identity). The show-more
-        // (`fullInstantPage`) rendering also carries an `.original` key but a different page
-        // object, so an identity check excludes it. `originalAttribute` is Optional.
+        if resolved.isTranslating {
+            return false
+        }
+        // The primary page is the resolved attribute's `instantPage` (class identity). The show-more
+        // (`fullInstantPage`) rendering carries the same key but a different page object, so an
+        // identity check excludes it. `originalAttribute` is Optional (it is the pending edit's
+        // attribute in the `.pendingEdit` case).
         guard let attribute = resolved.originalAttribute, resolved.instantPage === attribute.instantPage else {
             return false
         }
@@ -761,7 +771,7 @@ public class ChatMessageRichDataBubbleContentNode: ChatMessageBubbleContentNode
                         dateText: dateText,
                         type: statusType,
                         layoutInput: dateLayoutInput,
-                        constrainedSize: CGSize(width: suggestedBoundingWidth, height: .greatestFiniteMagnitude),
+                        constrainedSize: CGSize(width: boundingSize.width, height: .greatestFiniteMagnitude),
                         availableReactions: item.associatedData.availableReactions,
                         savedMessageTags: item.associatedData.savedMessageTags,
                         // Empty the status node's own reactions exactly when they are externalized

submodules/TelegramUI/Components/RichTextAttachmentScreen/Sources/RichTextAttachmentScreen.swift

@@ -214,6 +214,13 @@ private final class RichTextSendButtonComponent: Component {
 }
 
 public class RichTextAttachmentScreen: ViewControllerComponentContainer, AttachmentContainable {
+    public typealias Document = RichTextEditorCore::Document
+    
+    public enum Mode {
+        case standalone(savedDraft: Document?, media: [String: Media], emojiFiles: [Int64: TelegramMediaFile])
+        case edit(initialDocument: Document?, media: [String: Media], emojiFiles: [Int64: TelegramMediaFile])
+    }
+    
     public enum RichTextAttachment {
         case image(ImageMediaReference)
         case file(FileMediaReference)
@@ -247,19 +254,15 @@ public class RichTextAttachmentScreen: ViewControllerComponentContainer, Attachm
 
     public convenience init(
         context: AccountContext,
-        initialContents: Document? = nil,
-        initialMedia: [String: Media] = [:],
-        initialEmojiFiles: [Int64: TelegramMediaFile] = [:],
+        mode: Mode,
         sendMessage: @escaping (Document, [String: Media], [Int64: TelegramMediaFile]) -> Void,
         syncContent: ((Document, [String: Media], [Int64: TelegramMediaFile]) -> Void)? = nil,
         presentAttachmentMenu: ((_ photoVideoOnly: Bool, @escaping (RichTextAttachmentScreen.RichTextAttachment) -> Void) -> Void)?,
         presentFormulaEditor: ((_ initialValue: String?, _ completion: @escaping (String) -> Void) -> Void)?
     ) {
         self.init(
             context: context,
-            initialContents: initialContents,
-            initialMedia: initialMedia,
-            initialEmojiFiles: initialEmojiFiles,
+            mode: mode,
             sendMessage: { document, media, emojiFiles, _ in
                 sendMessage(document, media, emojiFiles)
             },
@@ -271,9 +274,7 @@ public class RichTextAttachmentScreen: ViewControllerComponentContainer, Attachm
 
     public init(
         context: AccountContext,
-        initialContents: Document? = nil,
-        initialMedia: [String: Media] = [:],
-        initialEmojiFiles: [Int64: TelegramMediaFile] = [:],
+        mode: Mode,
         sendMessage: @escaping (Document, [String: Media], [Int64: TelegramMediaFile], Bool) -> Void,
         syncContent: ((Document, [String: Media], [Int64: TelegramMediaFile]) -> Void)? = nil,
         presentAttachmentMenu: ((_ photoVideoOnly: Bool, @escaping (RichTextAttachmentScreen.RichTextAttachment) -> Void) -> Void)?,
@@ -287,9 +288,7 @@ public class RichTextAttachmentScreen: ViewControllerComponentContainer, Attachm
 
         super.init(context: context, component: RichTextAttachmentScreenComponent(
             context: context,
-            initialContents: initialContents,
-            initialMedia: initialMedia,
-            initialEmojiFiles: initialEmojiFiles,
+            mode: mode,
             overNavigationContainer: overNavigationContainer,
             presentAttachmentMenu: presentAttachmentMenu,
             presentFormulaEditor: presentFormulaEditor
@@ -318,6 +317,13 @@ public class RichTextAttachmentScreen: ViewControllerComponentContainer, Attachm
         fatalError("init(coder:) has not been implemented")
     }
 
+    public func resetForReuse() {
+        guard let syncContent = self.syncContent, let componentView = self.node.hostView.componentView as? RichTextAttachmentScreenComponent.View else {
+            return
+        }
+        syncContent(componentView.currentDocument, componentView.currentMedia, componentView.currentEmojiFiles)
+    }
+    
     fileprivate func donePressed() {
         guard let componentView = self.node.hostView.componentView as? RichTextAttachmentScreenComponent.View else {
             return
@@ -373,18 +379,14 @@ final class RichTextAttachmentScreenComponent: Component {
     // Held for the next step: the RichTextEditor demo will read context and add
     // its editor view into the View's content container.
     let context: AccountContext
-    let initialContents: Document?
-    let initialMedia: [String: Media]
-    let initialEmojiFiles: [Int64: TelegramMediaFile]
+    let mode: RichTextAttachmentScreen.Mode
     let overNavigationContainer: UIView
     let presentAttachmentMenu: ((_ photoVideoOnly: Bool, @escaping (RichTextAttachmentScreen.RichTextAttachment) -> Void) -> Void)?
     let presentFormulaEditor: ((_ initialValue: String?, _ completion: @escaping (String) -> Void) -> Void)?
 
-    init(context: AccountContext, initialContents: Document?, initialMedia: [String: Media], initialEmojiFiles: [Int64: TelegramMediaFile], overNavigationContainer: UIView, presentAttachmentMenu: ((_ photoVideoOnly: Bool, @escaping (RichTextAttachmentScreen.RichTextAttachment) -> Void) -> Void)?, presentFormulaEditor: ((_ initialValue: String?, _ completion: @escaping (String) -> Void) -> Void)?) {
+    init(context: AccountContext, mode: RichTextAttachmentScreen.Mode, overNavigationContainer: UIView, presentAttachmentMenu: ((_ photoVideoOnly: Bool, @escaping (RichTextAttachmentScreen.RichTextAttachment) -> Void) -> Void)?, presentFormulaEditor: ((_ initialValue: String?, _ completion: @escaping (String) -> Void) -> Void)?) {
         self.context = context
-        self.initialContents = initialContents
-        self.initialMedia = initialMedia
-        self.initialEmojiFiles = initialEmojiFiles
+        self.mode = mode
         self.overNavigationContainer = overNavigationContainer
         self.presentAttachmentMenu = presentAttachmentMenu
         self.presentFormulaEditor = presentFormulaEditor
@@ -733,10 +735,25 @@ final class RichTextAttachmentScreenComponent: Component {
                 editor.disablesInteractiveKeyboardGestureRecognizer = true
                 // Seed the editor with the caller-supplied initial content (e.g. the chat composer's
                 // current document when expanding); an empty document when none is provided.
-                editor.document = component.initialContents ?? Document()
+                
+                var initialContents: Document?
+                var initialMedia: [String: Media] = [:]
+                var initialEmojiFiles: [Int64: TelegramMediaFile] = [:]
+                switch component.mode {
+                case let .edit(documentValue, mediaValue, emojiFilesValue):
+                    initialContents = documentValue
+                    initialMedia = mediaValue
+                    initialEmojiFiles = emojiFilesValue
+                case let .standalone(documentValue, mediaValue, emojiFilesValue):
+                    initialContents = documentValue
+                    initialMedia = mediaValue
+                    initialEmojiFiles = emojiFilesValue
+                }
+                
+                editor.document = initialContents ?? Document()
                 // Seed the picked-media store alongside the document (before the media-view provider runs)
                 // so any media referenced by the initial document resolves on first layout.
-                self.attachedMedia = component.initialMedia
+                self.attachedMedia = initialMedia
 
                 let emojiKeyboard = RichTextEmojiKeyboardController(context: component.context, editor: editor, requestLayout: { [weak self] in
                     guard let self, !self.isUpdating else { return }
@@ -746,7 +763,7 @@ final class RichTextAttachmentScreenComponent: Component {
                 // Seed the keyboard's file store with the files of any custom emoji the initial document
                 // references (the `Document` carries only fileIds) — before the editor's first layout, so a
                 // custom emoji carried in from the chat composer renders, and its file survives back out.
-                emojiKeyboard.seedEmojiFiles(component.initialEmojiFiles)
+                emojiKeyboard.seedEmojiFiles(initialEmojiFiles)
 
                 editor.registerEmojiViewProvider { [weak self] id, size in
                     return self?.emojiKeyboard?.customEmojiView(forId: id, size: size)
@@ -911,7 +928,7 @@ final class RichTextAttachmentScreenComponent: Component {
                 transition.setFrame(view: rightNavActionsBarView, frame: rightNavActionsBarFrame)
             }
 
-            if component.initialContents == nil {
+            if case .standalone = component.mode {
                 let titleSize = self.title.update(
                     transition: .immediate,
                     component: AnyComponent(

submodules/TelegramUI/Images.xcassets/RichText/ToolCollage.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "collage1.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

submodules/TelegramUI/Images.xcassets/RichText/ToolCollage.imageset/collage1.pdf

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "collage2.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

submodules/TelegramUI/Images.xcassets/RichText/ToolSlideshow.imageset/Contents.json

@@ -358,7 +358,17 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
     var selectPollOptionFeedback: HapticFeedback?
 
     var updateMessageTodoDisposables: DisposableDict<MessageId>?
-    
+
+    // Rich-message checkbox tap-to-toggle. A running toggled page per message accumulates rapid
+    // taps (so an earlier toggle is never dropped by a later one computed against stale state), and
+    // a short debounce coalesces a burst into a single message edit. The completion observer clears
+    // the accumulator once the message's pending edit settles, so a later toggle re-bases from fresh
+    // server state (picking up composer/remote edits).
+    private var richTextCheckboxAccumulators: [MessageId: InstantPage] = [:]
+    private var richTextCheckboxDebounceTimers: [MessageId: SwiftSignalKit.Timer] = [:]
+    private var richTextCheckboxCompletionObserver: Disposable?
+    private let richTextCheckboxDebounceInterval: Double = 0.35
+
     var resolveUrlDisposable: MetaDisposable?
 
     var contextQueryStates: [ChatPresentationInputQueryKind: (ChatPresentationInputQuery, Disposable)] = [:]
@@ -5785,8 +5795,14 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             guard let attribute = message.attributes.first(where: { $0 is RichTextMessageAttribute }) as? RichTextMessageAttribute else {
                 return
             }
-            let newPage = attribute.instantPage.togglingCheckbox(at: path, to: value)
-            let newAttribute = RichTextMessageAttribute(instantPage: newPage, fullInstantPage: attribute.fullInstantPage)
+            // Start the completion observer before registering an accumulator, so its initial
+            // (empty) emission can't clear what we are about to add.
+            self.setupRichTextCheckboxCompletionObserverIfNeeded()
+            // Base off the running accumulator when mid-burst so a rapid earlier toggle is never
+            // dropped by a later one; otherwise start from fresh server state.
+            let basePage = self.richTextCheckboxAccumulators[messageId] ?? attribute.instantPage
+            let newPage = basePage.togglingCheckbox(at: path, to: value)
+            self.richTextCheckboxAccumulators[messageId] = newPage
 
             if self.selectPollOptionFeedback == nil {
                 self.selectPollOptionFeedback = HapticFeedback()
@@ -5797,7 +5813,13 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 self.selectPollOptionFeedback?.impact(.medium)
             }
 
-            self.context.account.pendingUpdateMessageManager.add(messageId: messageId, text: "", media: .keep, entities: nil, richText: newAttribute, inlineStickers: [:])
+            // Debounce: coalesce a rapid burst of taps into one edit once tapping quiesces.
+            self.richTextCheckboxDebounceTimers[messageId]?.invalidate()
+            let timer = SwiftSignalKit.Timer(timeout: self.richTextCheckboxDebounceInterval, repeat: false, completion: { [weak self] in
+                self?.flushRichTextCheckboxEdit(messageId: messageId)
+            }, queue: .mainQueue())
+            self.richTextCheckboxDebounceTimers[messageId] = timer
+            timer.start()
         }, openStarsPurchase: { [weak self] amount in
             self?.interfaceInteraction?.openStarsPurchase(amount)
         }, openRankInfo: { [weak self] peer, role, rank in
@@ -6893,11 +6915,62 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         fatalError("init(coder:) has not been implemented")
     }
 
+    private func flushRichTextCheckboxEdit(messageId: MessageId) {
+        self.richTextCheckboxDebounceTimers.removeValue(forKey: messageId)?.invalidate()
+        guard let page = self.richTextCheckboxAccumulators[messageId] else {
+            return
+        }
+        guard let message = self.chatDisplayNode.historyNode.messageInCurrentHistoryView(messageId)?._asMessage() else {
+            // No `add` will fire (so the completion observer won't run) — drop the accumulator here,
+            // otherwise it lingers stale and a later toggle could revert an intervening edit.
+            self.richTextCheckboxAccumulators.removeValue(forKey: messageId)
+            return
+        }
+        guard canEditMessage(context: self.context, limitsConfiguration: self.context.currentLimitsConfiguration.with { EngineConfiguration.Limits($0) }, message: message) else {
+            self.richTextCheckboxAccumulators.removeValue(forKey: messageId)
+            return
+        }
+        guard let attribute = message.attributes.first(where: { $0 is RichTextMessageAttribute }) as? RichTextMessageAttribute else {
+            self.richTextCheckboxAccumulators.removeValue(forKey: messageId)
+            return
+        }
+        // Preserve the message's current layout attributes so a checkbox toggle changes nothing but
+        // the checkbox (matching the composer's rich-edit; these are typically absent on a rich
+        // message, so this is defensive).
+        let invertMediaAttribute = message.attributes.first(where: { $0 is InvertMediaMessageAttribute }) as? InvertMediaMessageAttribute
+        let newAttribute = RichTextMessageAttribute(instantPage: page, fullInstantPage: attribute.fullInstantPage)
+        self.context.account.pendingUpdateMessageManager.add(messageId: messageId, text: "", media: .keep, entities: nil, richText: newAttribute, inlineStickers: [:], webpagePreviewAttribute: message.webpagePreviewAttribute, invertMediaAttribute: invertMediaAttribute, disableUrlPreview: false)
+    }
+
+    private func setupRichTextCheckboxCompletionObserverIfNeeded() {
+        if self.richTextCheckboxCompletionObserver != nil {
+            return
+        }
+        self.richTextCheckboxCompletionObserver = (self.context.account.pendingUpdateMessageManager.updatingMessageMedia
+        |> deliverOnMainQueue).startStrict(next: { [weak self] pendingMap in
+            guard let self else {
+                return
+            }
+            for messageId in Array(self.richTextCheckboxAccumulators.keys) {
+                // Once the message is neither pending nor has a queued (debounced) toggle, the server
+                // state is authoritative — drop the accumulator so the next toggle re-bases from it.
+                if pendingMap[messageId] == nil && self.richTextCheckboxDebounceTimers[messageId] == nil {
+                    self.richTextCheckboxAccumulators.removeValue(forKey: messageId)
+                }
+            }
+        })
+    }
+
     deinit {
         let _ = ChatControllerCount.modify { value in
             return value - 1
         }
-        
+
+        self.richTextCheckboxCompletionObserver?.dispose()
+        for (_, timer) in self.richTextCheckboxDebounceTimers {
+            timer.invalidate()
+        }
+
         self.historyStateDisposable?.dispose()
         self.messageIndexDisposable.dispose()
         self.navigationActionDisposable.dispose()

submodules/TelegramUI/Images.xcassets/RichText/ToolSlideshow.imageset/collage2.pdf

@@ -4612,9 +4612,7 @@ class ChatControllerNode: ASDisplayNode, ASScrollViewDelegate {
         let (seedDocument, seedMedia, seedEmojiFiles) = documentMediaAndEmoji(fromChatInputContent: textInputPanelNode.inputTextState.content)
         let editorScreen = RichTextAttachmentScreen(
             context: self.context,
-            initialContents: seedDocument,
-            initialMedia: seedMedia,
-            initialEmojiFiles: seedEmojiFiles,
+            mode: .edit(initialDocument: seedDocument, media: seedMedia, emojiFiles: seedEmojiFiles),
             sendMessage: { [weak self] document, media, emojiFiles, sendWithoutFormatting in
                 guard let self else {
                     return