bug fixes

Author: overtake

.gitignore

@@ -9,4 +9,5 @@ core-xprojects/libwebp/build
 core-xprojects/libopus/build
 core-xprojects/ffmpeg/build
 core-xprojects/webrtc/build
+core-xprojects/libvpx/build
 core-xprojects/webrtc/build-debug

Telegram-Mac/AddReactionManager.swift

@@ -595,6 +595,9 @@ final class AddReactionManager : NSObject, Notifable {
 
     func update(transition: ContainedViewLayoutTransition = .immediate) {
 
+        view?.tableView.tile()
+
+        
         var available:[AvailableReactions.Reaction] = []
         let settings: ReactionSettings = self.settings
 
@@ -753,20 +756,17 @@ final class AddReactionManager : NSObject, Notifable {
                                     }
                                 }))
                             } else {
-                                if !self.isInside {
-                                    self.clear()
-                                }
-                            }
-                        } else {
-                            if !self.isInside {
                                 self.clear()
                             }
+                        } else {
+                            self.clear()
                         }
                     } else if let itemView = item.view as? ChatRowView {
                         let rect = itemView.rectForReaction
 
                         let base = view.convert(rect, from: itemView)
 
+                        
                         let safeRect = base.insetBy(dx: -base.width * 4, dy: -base.height * 4)
                         if !NSPointInRect(inside, safeRect) || !NSPointInRect(NSMakePoint(base.midX, base.midY), view.tableView.frame) {
                             self.clear()
@@ -776,15 +776,13 @@ final class AddReactionManager : NSObject, Notifable {
                         }
                     }
                 } else {
-                    if !self.isInside {
-                        self.clear()
-                    }
-                }
-            } else {
-                if !self.isInside {
                     self.clear()
                 }
+            } else {
+                self.clear()
             }
+        } else {
+            self.clear()
         }
     }
 
@@ -840,9 +838,10 @@ final class AddReactionManager : NSObject, Notifable {
     }
 
     func notify(with value: Any, oldValue: Any, animated: Bool) {
-        let presentation = value as? ChatPresentationInterfaceState
-        if let presentation = presentation {
-            if presentation.state == .selecting {
+        let newValue = value as? ChatPresentationInterfaceState
+        let oldValue = oldValue as? ChatPresentationInterfaceState
+        if let newValue = newValue, oldValue?.state != newValue.state {
+            if newValue.state == .selecting {
                 disabled = true
                 clear()
                 removeCurrent(animated: true)

Telegram-Mac/ChatGroupedItem.swift

@@ -99,15 +99,21 @@ class ChatGroupedItem: ChatRowItem {
                         for entity in attr.entities {
                             switch entity.type {
                             case .Spoiler:
-                                spoilers.append(.init(range: NSMakeRange(entity.range.lowerBound, entity.range.upperBound - entity.range.lowerBound), color: theme.colors.text))
+                                spoilers.append(.init(range: NSMakeRange(entity.range.lowerBound, entity.range.upperBound - entity.range.lowerBound), color: theme.colors.text, isRevealed: chatInteraction.presentation.interfaceState.revealedSpoilers.contains(message.id)))
                             default:
                                 break
                             }
                         }
                     }
                 }
 
-                let layout: ChatRowItem.RowCaption = .init(id: message.stableId, offset: .zero, layout: TextViewLayout(caption, alignment: .left, selectText: theme.chat.selectText(isIncoming, entry.renderType == .bubble), strokeLinks: entry.renderType == .bubble, alwaysStaticItems: true, mayItems: !message.isCopyProtected(), spoilers: spoilers))
+                let layout: ChatRowItem.RowCaption = .init(id: message.stableId, offset: .zero, layout: TextViewLayout(caption, alignment: .left, selectText: theme.chat.selectText(isIncoming, entry.renderType == .bubble), strokeLinks: entry.renderType == .bubble, alwaysStaticItems: true, mayItems: !message.isCopyProtected(), spoilers: spoilers, onSpoilerReveal: { [weak chatInteraction] in
+                    chatInteraction?.update({
+                        $0.updatedInterfaceState({
+                            $0.withRevealedSpoiler(message.id)
+                        })
+                    })
+                }))
                 layout.layout.interactions = globalLinkExecutor
                 captionLayouts.append(layout)
             }