Fix navigation bar hit test

This commit is contained in:
Ali 2021-05-18 00:50:41 +04:00
parent 155eab8946
commit c78deee138

View File

@ -949,7 +949,7 @@ open class NavigationBar: ASDisplayNode {
let backButtonInset: CGFloat = leftInset + 27.0 let backButtonInset: CGFloat = leftInset + 27.0
transition.updateFrame(node: self.clippingNode, frame: CGRect(origin: CGPoint(), size: size)) 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)) transition.updateFrame(node: self.buttonsContainerNode, frame: CGRect(origin: CGPoint(), size: size))
var expansionHeight: CGFloat = 0.0 var expansionHeight: CGFloat = 0.0
if let contentNode = self.contentNode { if let contentNode = self.contentNode {
@ -1371,14 +1371,9 @@ open class NavigationBar: ASDisplayNode {
} }
override open func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { override open func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
/*if self.bounds.contains(point) { if let result = self.additionalContentNode.view.hitTest(self.view.convert(point, to: self.additionalContentNode.view), with: event) {
if self.backButtonNode.supernode != nil && !self.backButtonNode.isHidden { return result
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)
} }
}
}*/
guard let result = super.hitTest(point, with: event) else { guard let result = super.hitTest(point, with: event) else {
return nil return nil