Skip to content

Fix pinned title panel with managing bots #2212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marks0kolov wants to merge 1 commit into
base: master
Choose a base branch
from
+57 −9
Open

Fix pinned title panel with managing bots #2212

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 57 additions & 9 deletions submodules/TelegramUI/Sources/ChatControllerNode.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,25 @@ class ChatControllerNode: ASDisplayNode, ASScrollViewDelegate {
return adPanelView.message?._asMessage()
}

private var shouldDisplayPinnedTitlePanel: Bool {
guard self.chatPresentationInterfaceState.titlePanelContexts.contains(.pinnedMessage) else {
return false
}
guard let pinnedMessage = self.chatPresentationInterfaceState.pinnedMessage else {
return false
}
if pinnedMessage.topMessageId == self.chatPresentationInterfaceState.interfaceState.messageActionsState.closedPinnedMessageId {
return false
}
if self.chatPresentationInterfaceState.pendingUnpinnedAllMessages {
return false
}
return true
}

private let titleAccessoryPanelContainer: ChatControllerTitlePanelNodeContainer
private var currentTitleAccessoryPanelNode: ChatTitleAccessoryPanelNode?
private var currentPinnedTitleAccessoryPanelNode: ChatPinnedMessageTitlePanelNode?

private var floatingTopicsPanelContainer: ChatControllerTitlePanelNodeContainer
private var floatingTopicsPanel: (view: ComponentView<ChatSidePanelEnvironment>, component: ChatFloatingTopicsPanel)?
Expand Down Expand Up @@ -1564,17 +1581,48 @@ class ChatControllerNode: ASDisplayNode, ASScrollViewDelegate {

if let titleAccessoryPanelNode = titlePanelForChatPresentationInterfaceState(self.chatPresentationInterfaceState, context: self.context, currentPanel: self.currentTitleAccessoryPanelNode, controllerInteraction: self.controllerInteraction, interfaceInteraction: self.interfaceInteraction, force: false) {
self.currentTitleAccessoryPanelNode = titleAccessoryPanelNode
let panelKey = "\(type(of: titleAccessoryPanelNode))"
headerPanels.append(HeaderPanelContainerComponent.Panel(
key: panelKey,
orderIndex: 3,
component: AnyComponent(LegacyChatHeaderPanelComponent(
panelNode: titleAccessoryPanelNode,
interfaceState: self.chatPresentationInterfaceState
)))
)
if titleAccessoryPanelNode is ChatManagingBotTitlePanelNode, self.shouldDisplayPinnedTitlePanel {
let pinnedPanelNode: ChatPinnedMessageTitlePanelNode
if let current = self.currentPinnedTitleAccessoryPanelNode {
pinnedPanelNode = current
} else {
pinnedPanelNode = ChatPinnedMessageTitlePanelNode(context: self.context, animationCache: self.controllerInteraction.presentationContext.animationCache, animationRenderer: self.controllerInteraction.presentationContext.animationRenderer)
pinnedPanelNode.interfaceInteraction = self.interfaceInteraction
self.currentPinnedTitleAccessoryPanelNode = pinnedPanelNode
}

headerPanels.append(HeaderPanelContainerComponent.Panel(
key: "\(ChatPinnedMessageTitlePanelNode.self)",
orderIndex: 3,
component: AnyComponent(LegacyChatHeaderPanelComponent(
panelNode: pinnedPanelNode,
interfaceState: self.chatPresentationInterfaceState
)))
)
headerPanels.append(HeaderPanelContainerComponent.Panel(
key: "\(type(of: titleAccessoryPanelNode))",
orderIndex: 4,
component: AnyComponent(LegacyChatHeaderPanelComponent(
panelNode: titleAccessoryPanelNode,
interfaceState: self.chatPresentationInterfaceState
)))
)
} else {
self.currentPinnedTitleAccessoryPanelNode = nil

let panelKey = "\(type(of: titleAccessoryPanelNode))"
headerPanels.append(HeaderPanelContainerComponent.Panel(
key: panelKey,
orderIndex: 3,
component: AnyComponent(LegacyChatHeaderPanelComponent(
panelNode: titleAccessoryPanelNode,
interfaceState: self.chatPresentationInterfaceState
)))
)
}
} else {
self.currentTitleAccessoryPanelNode = nil
self.currentPinnedTitleAccessoryPanelNode = nil
}

var displayFeePanel: (value: Int64, peer: EnginePeer)?
Expand Down