From beacf81795fddcd18ad2a6ba88d3f7cddddd5dc6 Mon Sep 17 00:00:00 2001
From: Flynn OConnell <flynnoconnell@gmail.com>
Date: Sat, 18 Jan 2025 23:53:16 -0500
Subject: [PATCH 1/3] get_nearest_graphics_indices plot helper

---
 fastplotlib/utils/_plot_helpers.py | 45 +++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/fastplotlib/utils/_plot_helpers.py b/fastplotlib/utils/_plot_helpers.py
index ac0ff2cda..4b4e741a1 100644
--- a/fastplotlib/utils/_plot_helpers.py
+++ b/fastplotlib/utils/_plot_helpers.py
@@ -5,14 +5,14 @@
 from ..graphics._base import Graphic
 from ..graphics._collection_base import GraphicCollection
 
-
-def get_nearest_graphics(
-    pos: tuple[float, float] | tuple[float, float, float],
-    graphics: Sequence[Graphic] | GraphicCollection,
-) -> np.ndarray[Graphic]:
+def get_nearest_graphics_indices(
+        pos: tuple[float, float] | tuple[float, float, float],
+        graphics: Sequence[Graphic] | GraphicCollection,
+) -> np.ndarray[int]:
     """
-    Returns the nearest ``graphics`` to the passed position ``pos`` in world space.
-    Uses the distance between ``pos`` and the center of the bounding sphere for each graphic.
+    Returns indices of the nearest ``graphics`` to the passed position ``pos`` in world space
+    in order of closest to furtherst. Uses the distance between ``pos`` and the center of the
+    bounding sphere for each graphic.
 
     Parameters
     ----------
@@ -25,11 +25,10 @@ def get_nearest_graphics(
 
     Returns
     -------
-    tuple[Graphic]
-        nearest graphics to ``pos`` in order
+    ndarray[int]
+        indices of the nearest nearest graphics to ``pos`` in order
 
     """
-
     if isinstance(graphics, GraphicCollection):
         graphics = graphics.graphics
 
@@ -50,4 +49,30 @@ def get_nearest_graphics(
     distances = np.linalg.norm(centers[:, : len(pos)] - pos, ord=2, axis=1)
 
     sort_indices = np.argsort(distances)
+    return sort_indices
+
+def get_nearest_graphics(
+    pos: tuple[float, float] | tuple[float, float, float],
+    graphics: Sequence[Graphic] | GraphicCollection,
+) -> np.ndarray[Graphic]:
+    """
+    Returns the nearest ``graphics`` to the passed position ``pos`` in world space.
+    Uses the distance between ``pos`` and the center of the bounding sphere for each graphic.
+
+    Parameters
+    ----------
+    pos: (x, y) | (x, y, z)
+        position in world space, z-axis is ignored when calculating L2 norms if ``pos`` is 2D
+
+    graphics: Sequence, i.e. array, list, tuple, etc. of Graphic | GraphicCollection
+        the graphics from which to return a sorted array of graphics in order of closest
+        to furthest graphic
+
+    Returns
+    -------
+    ndarray[Graphic]
+        nearest graphics to ``pos`` in order
+
+    """
+    sort_indices = get_nearest_graphics_indices(pos, graphics)
     return np.asarray(graphics)[sort_indices]

From 80ef6324e65e44e62e7861a42df6e9ddb371f3f8 Mon Sep 17 00:00:00 2001
From: Flynn OConnell <flynnoconnell@gmail.com>
Date: Sat, 18 Jan 2025 23:54:00 -0500
Subject: [PATCH 2/3] map_screen_to_world can return None

---
 fastplotlib/layouts/_plot_area.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastplotlib/layouts/_plot_area.py b/fastplotlib/layouts/_plot_area.py
index e096a7f21..a17c94d58 100644
--- a/fastplotlib/layouts/_plot_area.py
+++ b/fastplotlib/layouts/_plot_area.py
@@ -299,7 +299,7 @@ def get_rect(self) -> tuple[float, float, float, float]:
 
     def map_screen_to_world(
         self, pos: tuple[float, float] | pygfx.PointerEvent
-    ) -> np.ndarray:
+    ) -> np.ndarray | None:
         """
         Map screen position to world position
 

From 939700cc87a5eb878dafd8871ce61215f3d7546b Mon Sep 17 00:00:00 2001
From: Flynn OConnell <flynnoconnell@gmail.com>
Date: Sun, 26 Jan 2025 17:31:13 -0500
Subject: [PATCH 3/3] black format source dir only

---
 fastplotlib/utils/_plot_helpers.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fastplotlib/utils/_plot_helpers.py b/fastplotlib/utils/_plot_helpers.py
index 4b4e741a1..5a39b76d0 100644
--- a/fastplotlib/utils/_plot_helpers.py
+++ b/fastplotlib/utils/_plot_helpers.py
@@ -5,9 +5,10 @@
 from ..graphics._base import Graphic
 from ..graphics._collection_base import GraphicCollection
 
+
 def get_nearest_graphics_indices(
-        pos: tuple[float, float] | tuple[float, float, float],
-        graphics: Sequence[Graphic] | GraphicCollection,
+    pos: tuple[float, float] | tuple[float, float, float],
+    graphics: Sequence[Graphic] | GraphicCollection,
 ) -> np.ndarray[int]:
     """
     Returns indices of the nearest ``graphics`` to the passed position ``pos`` in world space
@@ -51,6 +52,7 @@ def get_nearest_graphics_indices(
     sort_indices = np.argsort(distances)
     return sort_indices
 
+
 def get_nearest_graphics(
     pos: tuple[float, float] | tuple[float, float, float],
     graphics: Sequence[Graphic] | GraphicCollection,