From f9e7de718d1911d7c46db2bbeedfadaff48fd4b5 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Sat, 11 Nov 2023 12:43:02 -0600
Subject: [PATCH] Update right click toolbar code for Sonoma

---
 Mac/MainWindow/MainWindow.swift | 35 ++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/Mac/MainWindow/MainWindow.swift b/Mac/MainWindow/MainWindow.swift
index 18409f76a..2035a1ff0 100644
--- a/Mac/MainWindow/MainWindow.swift
+++ b/Mac/MainWindow/MainWindow.swift
@@ -14,23 +14,34 @@ import Foundation
 		
 		// Since the Toolbar intercepts right clicks we need to stop it from doing that here
 		// so that the ArticleExtractorButton can receive right click events.
-		if event.isRightClick,
-		   let frameView = contentView?.superview,
-		   let view = frameView.hitTest(frameView.convert(event.locationInWindow, from: nil)),
-		   type(of: view).description() == "NSToolbarView" {
+		if #available(macOS 14.0, *) {
+			if event.isRightClick,
+			   let frameView = contentView?.superview,
+			   let view = frameView.hitTest(frameView.convert(event.locationInWindow, from: nil)),
+			   let articleExtractorButton = view as? ArticleExtractorButton {
 
-			for subview in view.subviews {
-				for subsubview in subview.subviews {
-					let candidateView = subsubview.hitTest(subsubview.convert(event.locationInWindow, from: nil))
-					if candidateView is ArticleExtractorButton {
-						candidateView?.rightMouseDown(with: event)
-						return
+				articleExtractorButton.rightMouseDown(with: event)
+				return
+			}
+		} else {
+			if event.isRightClick,
+			   let frameView = contentView?.superview,
+			   let view = frameView.hitTest(frameView.convert(event.locationInWindow, from: nil)),
+			   type(of: view).description() == "NSToolbarView" {
+				
+				for subview in view.subviews {
+					for subsubview in subview.subviews {
+						let candidateView = subsubview.hitTest(subsubview.convert(event.locationInWindow, from: nil))
+						if candidateView is ArticleExtractorButton {
+							candidateView?.rightMouseDown(with: event)
+							return
+						}
 					}
 				}
+				
 			}
 			
+			super.sendEvent(event)
 		}
-		
-		super.sendEvent(event)
 	}
 }