From c78deee13802129f1373d6e8d492240af877a038 Mon Sep 17 00:00:00 2001
From: Ali <>
Date: Tue, 18 May 2021 00:50:41 +0400
Subject: [PATCH] Fix navigation bar hit test

---
 submodules/Display/Source/NavigationBar.swift | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/submodules/Display/Source/NavigationBar.swift b/submodules/Display/Source/NavigationBar.swift
index 441e3f8c80..a79e95683d 100644
--- a/submodules/Display/Source/NavigationBar.swift
+++ b/submodules/Display/Source/NavigationBar.swift
@@ -949,7 +949,7 @@ open class NavigationBar: ASDisplayNode {
         let backButtonInset: CGFloat = leftInset + 27.0
         
         transition.updateFrame(node: self.clippingNode, frame: CGRect(origin: CGPoint(), size: size))
-        transition.updateFrame(node: self.additionalContentNode, frame: CGRect(origin: CGPoint(), size: size))
+        transition.updateFrame(node: self.additionalContentNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: size.height + additionalBackgroundHeight)))
         transition.updateFrame(node: self.buttonsContainerNode, frame: CGRect(origin: CGPoint(), size: size))
         var expansionHeight: CGFloat = 0.0
         if let contentNode = self.contentNode {
@@ -1371,15 +1371,10 @@ open class NavigationBar: ASDisplayNode {
     }
     
     override open func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
-        /*if self.bounds.contains(point) {
-            if self.backButtonNode.supernode != nil && !self.backButtonNode.isHidden {
-                let effectiveBackButtonRect = CGRect(origin: CGPoint(), size: CGSize(width: self.backButtonNode.frame.maxX + 20.0, height: self.bounds.height))
-                if effectiveBackButtonRect.contains(point) {
-                    return self.backButtonNode.internalHitTest(self.view.convert(point, to: self.backButtonNode.view), with: event)
-                }
-            }
-        }*/
-        
+        if let result = self.additionalContentNode.view.hitTest(self.view.convert(point, to: self.additionalContentNode.view), with: event) {
+            return result
+        }
+
         guard let result = super.hitTest(point, with: event) else {
             return nil
         }