From e7c470878c24a43879fd09f2a89444f790e4facc Mon Sep 17 00:00:00 2001
From: Tristan Genevet <tristan@unity3d.com>
Date: Fri, 10 Feb 2023 15:35:50 +0100
Subject: [PATCH] Fix for mouse keeping dragging when right click menu appears
 on mac.

---
 .../GraphElements/Views/MainPreviewView.cs    |  7 ++++++-
 .../Editor/GraphUI/Manipulators/Draggable.cs  | 20 +++++++++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/com.unity.sg2/Editor/GraphUI/GraphElements/Views/MainPreviewView.cs b/com.unity.sg2/Editor/GraphUI/GraphElements/Views/MainPreviewView.cs
index 3ebb906bcbc..a83e1ad8dbe 100644
--- a/com.unity.sg2/Editor/GraphUI/GraphElements/Views/MainPreviewView.cs
+++ b/com.unity.sg2/Editor/GraphUI/GraphElements/Views/MainPreviewView.cs
@@ -185,7 +185,12 @@ void OnGeometryChangedEvent(GeometryChangedEvent evt)
         {
             // When the overlay containing this view is hidden, our size becomes 0. No need to resize in this case,
             // because the preview won't be shown and can't have a size of 0 regardless.
-            if (evt.newRect == Rect.zero) return;
+            if (evt.newRect == Rect.zero ||
+                float.IsInfinity(evt.newRect.width) ||
+                float.IsInfinity(evt.newRect.height)||
+                float.IsNaN(evt.newRect.width)||
+                float.IsNaN(evt.newRect.height) )
+                return;
 
             var targetWidth = new Length(evt.newRect.width, LengthUnit.Pixel);
             var targetHeight = new Length(evt.newRect.height, LengthUnit.Pixel);
diff --git a/com.unity.sg2/Editor/GraphUI/Manipulators/Draggable.cs b/com.unity.sg2/Editor/GraphUI/Manipulators/Draggable.cs
index f115e5a92ab..0f6b80cb4c1 100644
--- a/com.unity.sg2/Editor/GraphUI/Manipulators/Draggable.cs
+++ b/com.unity.sg2/Editor/GraphUI/Manipulators/Draggable.cs
@@ -26,22 +26,29 @@ public Draggable(Action<Vector2> handler, bool outputDeltaMovement = false)
 
         protected override void RegisterCallbacksOnTarget()
         {
-            target.RegisterCallback(new EventCallback<MouseDownEvent>(OnMouseDown), TrickleDownEnum.NoTrickleDown);
-            target.RegisterCallback(new EventCallback<MouseMoveEvent>(OnMouseMove), TrickleDownEnum.NoTrickleDown);
-            target.RegisterCallback(new EventCallback<MouseUpEvent>(OnMouseUp), TrickleDownEnum.NoTrickleDown);
+            target.RegisterCallback<MouseDownEvent>(OnMouseDown);
+            target.RegisterCallback<MouseUpEvent>(OnMouseUp);
+            target.RegisterCallback<MouseCaptureOutEvent>(OnCaptureLost);
         }
 
         protected override void UnregisterCallbacksFromTarget()
         {
-            target.UnregisterCallback(new EventCallback<MouseDownEvent>(OnMouseDown), TrickleDownEnum.NoTrickleDown);
-            target.UnregisterCallback(new EventCallback<MouseMoveEvent>(OnMouseMove), TrickleDownEnum.NoTrickleDown);
-            target.UnregisterCallback(new EventCallback<MouseUpEvent>(OnMouseUp), TrickleDownEnum.NoTrickleDown);
+            target.UnregisterCallback<MouseCaptureOutEvent>(OnCaptureLost);
+            target.UnregisterCallback<MouseDownEvent>(OnMouseDown);
+            target.UnregisterCallback<MouseUpEvent>(OnMouseUp);
+        }
+
+        void OnCaptureLost(MouseCaptureOutEvent e)
+        {
+            m_Active = false;
+            target.UnregisterCallback<MouseMoveEvent>(OnMouseMove);
         }
 
         void OnMouseDown(MouseDownEvent evt)
         {
             target.CaptureMouse();
             m_Active = true;
+            target.RegisterCallback<MouseMoveEvent>(OnMouseMove);
             evt.StopPropagation();
         }
 
@@ -63,6 +70,7 @@ void OnMouseMove(MouseMoveEvent evt)
         void OnMouseUp(MouseUpEvent evt)
         {
             m_Active = false;
+            target.UnregisterCallback<MouseMoveEvent>(OnMouseMove);
 
             if (target.HasMouseCapture())
             {