github-mirror/Telegram-iOS
1
0
Fork 0
mirror of https://github.com/TelegramMessenger/Telegram-iOS.git synced 2026-07-06 03:33:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

Browse source
This commit is contained in:
Ilya Laktyushin 2026-04-29 23:29:49 +02:00
commit 00f87c7b6e
25 changed files with 33 additions and 3838 deletions
Download patch file Download diff file Expand all files Collapse all files

16
submodules/Display/Source/ListView.swift
View file

@ -2671,6 +2671,22 @@ open class ListViewImpl: ASDisplayNode, ListView, ASScrollViewDelegate, ASGestur
return value
}
public func isStrictlyScrolledToPinToEdgeItem() -> Bool {
if self.calculatePinToEdgeTopInset() <= 0.0 {
return false
}
guard let targetIndex = self.items.firstIndex(where: { $0.pinToEdgeWithInset }) else {
return false
}
for itemNode in self.itemNodes {
if itemNode.index == targetIndex {
let expectedMaxY = (self.visibleSize.height - self.insets.bottom) + itemNode.scrollPositioningInsets.bottom
return abs(itemNode.apparentFrame.maxY - expectedMaxY) < 0.5
}
}
return false
}
private func replayOperations(animated: Bool, animateAlpha: Bool, animateCrossfade: Bool, animateFullTransition: Bool, customAnimationTransition: ControlledTransition?, synchronous: Bool, synchronousLoads: Bool, animateTopItemVerticalOrigin: Bool, operations: [ListViewStateOperation], requestItemInsertionAnimationsIndices: Set<Int>, scrollToItem originalScrollToItem: ListViewScrollToItem?, additionalScrollDistance: CGFloat, updateSizeAndInsets: ListViewUpdateSizeAndInsets?, stationaryItemIndex: Int?, updateOpaqueState: Any?, forceInvertOffsetDirection: Bool = false, completion: () -> Void) {
var scrollToItem: ListViewScrollToItem?
var isExperimentalSnapToScrollToItem = false

19
submodules/TelegramUI/Sources/Chat/ChatControllerLoadDisplayNode.swift
View file

@ -878,6 +878,12 @@ extension ChatControllerImpl {
self?.requestLayout(transition: transition)
}
var enableSendAnimationV2 = false
if let data = self.context.currentAppConfiguration.with({ $0 }).data, let _ = data["ios_killswitch_disable_send_animation_v2"] {
} else {
enableSendAnimationV2 = true
}
self.chatDisplayNode.setupSendActionOnViewUpdate = { [weak self] f, messageCorrelationId in
//print("setup layoutActionOnViewTransition")
@ -886,7 +892,11 @@ extension ChatControllerImpl {
}
self.layoutActionOnViewTransitionAction = f
self.chatDisplayNode.historyNode.pinToTopStableId = nil
if !enableSendAnimationV2 {
self.chatDisplayNode.historyNode.pinToTopStableId = nil
} else if !self.chatDisplayNode.historyNode.isStrictlyScrolledToPinToEdgeItem() {
self.chatDisplayNode.historyNode.pinToTopStableId = nil
}
self.chatDisplayNode.historyNode.layoutActionOnViewTransition = ({ [weak self] transition in
f()
if let strongSelf = self, let validLayout = strongSelf.validLayout {
@ -906,7 +916,7 @@ extension ChatControllerImpl {
let shouldUseFastMessageSendAnimation = strongSelf.chatDisplayNode.shouldUseFastMessageSendAnimation
strongSelf.chatDisplayNode.containerLayoutUpdated(validLayout, navigationBarHeight: strongSelf.navigationLayout(layout: validLayout).navigationFrame.maxY, transition: .animated(duration: duration, curve: curve), listViewTransaction: {
strongSelf.chatDisplayNode.containerLayoutUpdated(validLayout, navigationBarHeight: strongSelf.navigationLayout(layout: validLayout).navigationFrame.maxY, transition: .animated(duration: duration, curve: curve), listViewTransaction: { [weak strongSelf]
updateSizeAndInsets, _, _, _ in
var options = transition.options
let _ = options.insert(.Synchronous)
@ -941,6 +951,11 @@ extension ChatControllerImpl {
scrollToItem = ListViewScrollToItem(index: insertedIndex, position: .visible, animated: true, curve: .Custom(duration: duration, controlPoints.0, controlPoints.1, controlPoints.2, controlPoints.3), directionHint: .Down)
} else if transition.historyView.originalView.laterId == nil {
scrollToItem = ListViewScrollToItem(index: 0, position: .top(0.0), animated: true, curve: .Custom(duration: duration, controlPoints.0, controlPoints.1, controlPoints.2, controlPoints.3), directionHint: .Up)
if enableSendAnimationV2, Thread.isMainThread, let strongSelf {
if strongSelf.chatDisplayNode.historyNode.isStrictlyScrolledToPinToEdgeItem() {
scrollToItem = nil
}
}
}
if let maxInsertedItem = maxInsertedItem {