From f8a2a1ece5fa97344a13a18eb5d408bb4addb0d1 Mon Sep 17 00:00:00 2001
From: Mitchell McCaffrey <mitchemmc@gmail.com>
Date: Sun, 3 Jan 2021 12:34:01 +1100
Subject: [PATCH] Added more checks to stage interaction

---
 src/helpers/useStageInteraction.js | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/helpers/useStageInteraction.js b/src/helpers/useStageInteraction.js
index f03c9cf..26b45a6 100644
--- a/src/helpers/useStageInteraction.js
+++ b/src/helpers/useStageInteraction.js
@@ -26,10 +26,8 @@ function useStageInteraction(
       ...gesture,
       onWheelStart: (props) => {
         const { event } = props;
-        if (layer) {
-          isInteractingWithCanvas.current =
-            event.target === layer.getCanvas()._canvas;
-        }
+        isInteractingWithCanvas.current =
+          layer && event.target === layer.getCanvas()._canvas;
         gesture.onWheelStart && gesture.onWheelStart(props);
       },
       onWheel: (props) => {
@@ -63,10 +61,8 @@ function useStageInteraction(
       },
       onPinchStart: (props) => {
         const { event } = props;
-        if (layer) {
-          isInteractingWithCanvas.current =
-            event.target === layer.getCanvas()._canvas;
-        }
+        isInteractingWithCanvas.current =
+          layer && event.target === layer.getCanvas()._canvas;
         const { da, origin } = props;
         const [distance] = da;
         const [originX, originY] = origin;
@@ -127,10 +123,8 @@ function useStageInteraction(
       },
       onDragStart: (props) => {
         const { event } = props;
-        if (layer) {
-          isInteractingWithCanvas.current =
-            event.target === layer.getCanvas()._canvas;
-        }
+        isInteractingWithCanvas.current =
+          layer && event.target === layer.getCanvas()._canvas;
         gesture.onDragStart && gesture.onDragStart(props);
       },
       onDrag: (props) => {