mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-12-22 22:25:57 +00:00
Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios
This commit is contained in:
@@ -948,7 +948,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
|
||||
var selectedNode: (ASDisplayNode, CGRect, () -> (UIView?, UIView?))?
|
||||
strongSelf.chatDisplayNode.historyNode.forEachItemNode { itemNode in
|
||||
if let itemNode = itemNode as? ChatMessageItemView {
|
||||
if let result = itemNode.transitionNode(id: message.id, media: image) {
|
||||
if let result = itemNode.transitionNode(id: message.id, media: image, adjustRect: false) {
|
||||
selectedNode = result
|
||||
}
|
||||
}
|
||||
@@ -1002,12 +1002,12 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
|
||||
self?.chatDisplayNode.dismissInput()
|
||||
}, present: { c, a in
|
||||
self?.present(c, in: .window(.root), with: a, blockInteraction: true)
|
||||
}, transitionNode: { messageId, media in
|
||||
}, transitionNode: { messageId, media, adjustRect in
|
||||
var selectedNode: (ASDisplayNode, CGRect, () -> (UIView?, UIView?))?
|
||||
if let strongSelf = self {
|
||||
strongSelf.chatDisplayNode.historyNode.forEachItemNode { itemNode in
|
||||
if let itemNode = itemNode as? ChatMessageItemView {
|
||||
if let result = itemNode.transitionNode(id: messageId, media: media) {
|
||||
if let result = itemNode.transitionNode(id: messageId, media: media, adjustRect: adjustRect) {
|
||||
selectedNode = result
|
||||
}
|
||||
}
|
||||
@@ -4509,6 +4509,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
|
||||
guard let self else {
|
||||
return
|
||||
}
|
||||
if let story = message.associatedStories[storyId], story.data.isEmpty {
|
||||
return
|
||||
}
|
||||
|
||||
let storyContent = SingleStoryContentContextImpl(context: self.context, storyId: storyId)
|
||||
let _ = (storyContent.state
|
||||
|> take(1)
|
||||
@@ -18244,7 +18248,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
|
||||
var selectedNode: (ASDisplayNode, CGRect, () -> (UIView?, UIView?))?
|
||||
self.chatDisplayNode.historyNode.forEachItemNode { itemNode in
|
||||
if let itemNode = itemNode as? ChatMessageItemView {
|
||||
if let result = itemNode.transitionNode(id: messageId, media: media) {
|
||||
if let result = itemNode.transitionNode(id: messageId, media: media, adjustRect: false) {
|
||||
selectedNode = result
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user