diff --git a/submodules/TelegramUI/Images.xcassets/Components/AppBadge.imageset/AppBadge@3x.png b/submodules/TelegramUI/Images.xcassets/Components/AppBadge.imageset/AppBadge@3x.png index f9746877fd..d647852ab0 100644 Binary files a/submodules/TelegramUI/Images.xcassets/Components/AppBadge.imageset/AppBadge@3x.png and b/submodules/TelegramUI/Images.xcassets/Components/AppBadge.imageset/AppBadge@3x.png differ diff --git a/submodules/TelegramUI/Sources/ChatControllerNode.swift b/submodules/TelegramUI/Sources/ChatControllerNode.swift index c4e5a59b99..4ac0b98dcd 100644 --- a/submodules/TelegramUI/Sources/ChatControllerNode.swift +++ b/submodules/TelegramUI/Sources/ChatControllerNode.swift @@ -2668,6 +2668,12 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { } override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { + if let inputMediaNode = self.inputMediaNode, self.inputNode === inputMediaNode { + let convertedPoint = self.view.convert(point, to: inputMediaNode.view) + if inputMediaNode.point(inside: convertedPoint, with: event) { + return inputMediaNode.hitTest(convertedPoint, with: event) + } + } switch self.chatPresentationInterfaceState.mode { case .standard(previewing: true): if let result = self.historyNode.view.hitTest(self.view.convert(point, to: self.historyNode.view), with: event), let node = result.asyncdisplaykit_node, node is ChatMessageSelectionNode || node is GridMessageSelectionNode { diff --git a/submodules/TelegramUI/Sources/ChatMediaInputNode.swift b/submodules/TelegramUI/Sources/ChatMediaInputNode.swift index afc1423c61..bfef93a510 100644 --- a/submodules/TelegramUI/Sources/ChatMediaInputNode.swift +++ b/submodules/TelegramUI/Sources/ChatMediaInputNode.swift @@ -2659,6 +2659,15 @@ final class ChatMediaInputNode: ChatInputNode { self.updatePaneClippingContainer(size: self.paneClippingContainer.bounds.size, offset: collectionListPanelOffset, transition: transition) } + override func point(inside point: CGPoint, with event: UIEvent?) -> Bool { + if self.panelIsFocused { + if point.y > -41.0 { + return true + } + } + return super.point(inside: point, with: event) + } + override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { if self.panelIsFocused { if point.y > -41.0 && point.y < 38.0 { diff --git a/submodules/TelegramUI/Sources/NavigateToChatController.swift b/submodules/TelegramUI/Sources/NavigateToChatController.swift index 826f00f043..73efd2e9a8 100644 --- a/submodules/TelegramUI/Sources/NavigateToChatController.swift +++ b/submodules/TelegramUI/Sources/NavigateToChatController.swift @@ -52,6 +52,7 @@ public func navigateToChatControllerImpl(_ params: NavigateToChatControllerParam } params.completion(controller) } + controller.purposefulAction = params.purposefulAction if params.activateInput { controller.activateInput()