From 396f21e5689d882db0bc7a3809693fea0c05c469 Mon Sep 17 00:00:00 2001
From: Paul Kaplan <pkaplan@media.mit.edu>
Date: Tue, 1 May 2018 16:19:03 -0400
Subject: [PATCH] Fix early return to be before draggability checking.

---
 src/containers/stage.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/containers/stage.jsx b/src/containers/stage.jsx
index 0820b1741..57614135f 100644
--- a/src/containers/stage.jsx
+++ b/src/containers/stage.jsx
@@ -297,6 +297,7 @@ class Stage extends React.Component {
         if (drawableId === null) return;
         const drawableData = this.renderer.extractDrawable(drawableId, x, y);
         const targetId = this.props.vm.getTargetIdForDrawableId(drawableId);
+        if (targetId === null) return;
 
         // Only start drags on non-draggable targets in editor drag mode
         if (!this.props.useEditorDragStyle) {
@@ -304,7 +305,6 @@ class Stage extends React.Component {
             if (!target.draggable) return;
         }
 
-        if (targetId === null) return;
         this.props.vm.startDrag(targetId);
         this.setState({
             isDragging: true,
-- 
GitLab