Merge pull request #6545 from LLK/revert-4982-reduce-pick-queries

Revert "Only call Renderer.pick() on draggable targets in Stage.onStartDrag"

Author: benjiwheeler

src/containers/stage.jsx

@@ -342,29 +342,16 @@ class Stage extends React.Component {
     }
     onStartDrag (x, y) {
         if (this.state.dragId) return;
-
-        // Targets with no attached drawable cannot be dragged.
-        let draggableTargets = this.props.vm.runtime.targets.filter(
-            target => Number.isFinite(target.drawableID)
-        );
-
-        // Because pick queries can be expensive, only perform them for drawables that are currently draggable.
-        // If we're in the editor, we can drag all targets. Otherwise, filter.
-        if (!this.props.useEditorDragStyle) {
-            draggableTargets = draggableTargets.filter(
-                target => target.draggable
-            );
-        }
-        if (draggableTargets.length === 0) return;
-
-        const draggableIDs = draggableTargets.map(target => target.drawableID);
-        const drawableId = this.renderer.pick(x, y, 1, 1, draggableIDs);
+        const drawableId = this.renderer.pick(x, y);
         if (drawableId === null) return;
         const targetId = this.props.vm.getTargetIdForDrawableId(drawableId);
         if (targetId === null) return;
 
         const target = this.props.vm.runtime.getTargetById(targetId);
 
+        // Do not start drag unless in editor drag mode or target is draggable
+        if (!(this.props.useEditorDragStyle || target.draggable)) return;
+
         // Dragging always brings the target to the front
         target.goToFront();