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 3306d4cf24 into 6e370e06d1

Browse source
This commit is contained in:
Vlad Annenkov 2026-06-27 20:35:07 +02:00 • committed by GitHub
commit 9adde12f98
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 46 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -127,13 +127,6 @@ class KeyboardManager {
}
}
private func endAnimations(view: UIView) {
view.layer.removeAllAnimations()
for subview in view.subviews {
endAnimations(view: subview)
}
}
public func viewTreeContainsFirstResponder(view: UIView) -> Bool {
if view.isFirstResponder {
return true
@ -149,6 +142,7 @@ public func viewTreeContainsFirstResponder(view: UIView) -> Bool {
public final class KeyboardViewManager {
private let host: StatusBarHost
var willDismissEditingWithoutAnimation: (() -> Void)?
init(host: StatusBarHost) {
self.host = host
@ -156,11 +150,9 @@ public final class KeyboardViewManager {
public func dismissEditingWithoutAnimation(view: UIView) {
if viewTreeContainsFirstResponder(view: view) {
view.endEditing(true)
if let keyboardWindow = self.host.keyboardWindow {
for view in keyboardWindow.subviews {
endAnimations(view: view)
}
self.willDismissEditingWithoutAnimation?()
UIView.performWithoutAnimation {
view.endEditing(true)
}
}
}

6
submodules/Display/Source/Navigation/NavigationContainer.swift
View file

@ -233,6 +233,8 @@ public final class NavigationContainer: ASDisplayNode, ASGestureRecognizerDelega
return
}
topController.cancelInteractiveKeyboardGestures()
topController.isBeingInteractivelyPopped = true
topController.viewWillDisappear(true)
let topNode = topController.displayNode
var bottomControllerLayout = layout
@ -299,6 +301,7 @@ public final class NavigationContainer: ASDisplayNode, ASGestureRecognizerDelega
strongSelf.state.transition = nil
strongSelf.controllerRemoved(top.value)
topController.isBeingInteractivelyPopped = false
strongSelf.ignoreInputHeight = false
})
} else {
@ -307,7 +310,8 @@ public final class NavigationContainer: ASDisplayNode, ASGestureRecognizerDelega
return
}
strongSelf.state.transition = nil
top.value.isBeingInteractivelyPopped = false
top.value.viewDidAppear(true)
transition.previous.value.viewDidDisappear(true)
})

5
submodules/Display/Source/ViewController.swift
View file

@ -234,6 +234,7 @@ public protocol CustomViewControllerNavigationDataSummary: AnyObject {
private weak var activeInputView: UIResponder?
open var hasActiveInput: Bool = false
public internal(set) var isBeingInteractivelyPopped: Bool = false
open var overlayWantsToBeBelowKeyboard: Bool {
return false
@ -657,6 +658,10 @@ public protocol CustomViewControllerNavigationDataSummary: AnyObject {
open func viewWillLeaveNavigation() {
}
open func cancelInteractiveKeyboardGestures() {
self.view.windowHost?.cancelInteractiveKeyboardGestures()
}
open override func viewDidAppear(_ animated: Bool) {
self.activeInputView = nil

23
submodules/Display/Source/WindowContent.swift
View file

@ -293,6 +293,7 @@ public class Window1 {
private var statusBarHidden = false
private var shouldNotAnimateLikelyKeyboardAutocorrectionSwitch: Bool = false
private var suppressNextKeyboardHideAnimationUntil: Double?
public private(set) var forceInCallStatusBarText: String? = nil
public var inCallNavigate: (() -> Void)?
@ -477,6 +478,10 @@ public class Window1 {
self.topPresentationContext.containerLayoutUpdated(containedLayoutForWindowLayout(self.windowLayout, deviceMetrics: self.deviceMetrics), transition: .immediate)
self.overlayPresentationContext.containerLayoutUpdated(containedLayoutForWindowLayout(self.windowLayout, deviceMetrics: self.deviceMetrics), transition: .immediate)
self.keyboardViewManager?.willDismissEditingWithoutAnimation = { [weak self] in
self?.suppressNextKeyboardHideAnimationUntil = CACurrentMediaTime() + 1.0
}
//TODO:release check old iOS
/*self.statusBarChangeObserver = NotificationCenter.default.addObserver(forName: UIApplication.willChangeStatusBarFrameNotification, object: nil, queue: OperationQueue.main, using: { [weak self] notification in
if let strongSelf = self, strongSelf.statusBarHost != nil {
@ -648,6 +653,9 @@ public class Window1 {
transition = .immediate
}
}
if strongSelf.shouldSuppressNextKeyboardHideAnimation(keyboardHeight: keyboardHeight) {
transition = .immediate
}
strongSelf.updateLayout { $0.update(inputHeight: keyboardHeight.isLessThanOrEqualTo(0.0) ? nil : keyboardHeight, transition: transition, overrideTransition: false) }
}
@ -717,6 +725,21 @@ public class Window1 {
self.hostView.containerView.addGestureRecognizer(recognizer)
self.hostView.containerView.addSubview(self.badgeView)
}
private func shouldSuppressNextKeyboardHideAnimation(keyboardHeight: CGFloat) -> Bool {
guard let suppressNextKeyboardHideAnimationUntil = self.suppressNextKeyboardHideAnimationUntil else {
return false
}
if suppressNextKeyboardHideAnimationUntil < CACurrentMediaTime() {
self.suppressNextKeyboardHideAnimationUntil = nil
return false
}
if keyboardHeight.isLessThanOrEqualTo(0.0) {
self.suppressNextKeyboardHideAnimationUntil = nil
return true
}
return false
}
public required init(coder aDecoder: NSCoder) {
fatalError("init(coder:) has not been implemented")

15
submodules/TelegramUI/Sources/ChatController.swift
View file

@ -7967,12 +7967,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
override public func viewWillDisappear(_ animated: Bool) {
super.viewWillDisappear(animated)
if #available(iOS 18.0, *) {
} else {
//TODO:release
}
UIView.performWithoutAnimation {
self.view.endEditing(true)
if !self.isBeingInteractivelyPopped {
UIView.performWithoutAnimation {
self.view.endEditing(true)
}
}
self.chatDisplayNode.historyNode.canReadHistory.set(.single(false))
@ -8048,6 +8046,11 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
self.chatDisplayNode.willNavigateAway()
}
override public func cancelInteractiveKeyboardGestures() {
super.cancelInteractiveKeyboardGestures()
self.chatDisplayNode.cancelInteractiveKeyboardGestures()
}
override public func inFocusUpdated(isInFocus: Bool) {
self.disableStickerAnimationsPromise.set(!isInFocus)
self.chatDisplayNode.inFocusUpdated(isInFocus: isInFocus)