From 611abf8ed0dec55246eb1493eb26a30a15e9b29e Mon Sep 17 00:00:00 2001 From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com> Date: Thu, 3 Dec 2020 15:04:21 -0500 Subject: [PATCH] Enable rotating selection even when mouse isn't over the map (re: #8187) --- modules/modes/rotate.js | 4 ++-- modules/renderer/map.js | 2 +- modules/util/util.js | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/modes/rotate.js b/modules/modes/rotate.js index 85b761b6e..68aa601a9 100644 --- a/modules/modes/rotate.js +++ b/modules/modes/rotate.js @@ -50,7 +50,7 @@ export function modeRotate(context, entityIDs) { var _pivot; - function doRotate() { + function doRotate(d3_event) { var fn; if (context.graph() !== _prevGraph) { fn = context.perform; @@ -73,7 +73,7 @@ export function modeRotate(context, entityIDs) { } - var currMouse = context.map().mouse(); + var currMouse = context.map().mouse(d3_event); var currAngle = Math.atan2(currMouse[1] - _pivot[1], currMouse[0] - _pivot[0]); if (typeof _prevAngle === 'undefined') _prevAngle = currAngle; diff --git a/modules/renderer/map.js b/modules/renderer/map.js index c2177da29..4d5c6491f 100644 --- a/modules/renderer/map.js +++ b/modules/renderer/map.js @@ -710,7 +710,7 @@ export function rendererMap(context) { map.mouse = function(d3_event) { - var event = _lastPointerEvent || d3_event; + var event = d3_event || _lastPointerEvent; if (event) { var s; while ((s = event.sourceEvent)) { event = s; } diff --git a/modules/util/util.js b/modules/util/util.js index 7131a4d3f..390396981 100644 --- a/modules/util/util.js +++ b/modules/util/util.js @@ -447,7 +447,8 @@ export function utilFastMouse(container) { return function(e) { return [ e.clientX - rectLeft - clientLeft, - e.clientY - rectTop - clientTop]; + e.clientY - rectTop - clientTop + ]; }; }