From 67bd93b14ce1ce31cb9685068dbf63fb0b28b870 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Thu, 21 May 2020 13:54:28 -0400 Subject: [PATCH] Fix sidebar drag-resizing when iD is embedded at x!=0 --- modules/ui/sidebar.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/ui/sidebar.js b/modules/ui/sidebar.js index 498b32d24..9af0a9a44 100644 --- a/modules/ui/sidebar.js +++ b/modules/ui/sidebar.js @@ -54,7 +54,7 @@ export function uiSidebar(context) { .attr('class', 'sidebar-resizer') .on(_pointerPrefix + 'down.sidebar-resizer', pointerdown); - var downPointerId, lastClientX; + var downPointerId, lastClientX, containerLocGetter; function pointerdown() { if (downPointerId) return; @@ -63,6 +63,8 @@ export function uiSidebar(context) { lastClientX = d3_event.clientX; + containerLocGetter = utilFastMouse(container.node()); + // offset from edge of sidebar-resizer dragOffset = utilFastMouse(resizer.node())(d3_event)[0] - 1; @@ -98,7 +100,7 @@ export function uiSidebar(context) { var scaleX = isRTL ? 0 : 1; var xMarginProperty = isRTL ? 'margin-right' : 'margin-left'; - var x = d3_event.clientX - dragOffset; + var x = containerLocGetter(d3_event)[0] - dragOffset; sidebarWidth = isRTL ? containerWidth - x : x; var isCollapsed = selection.classed('collapsed');