From 0898d384d3f3c0e54e477b1ed486f6a803460ecb Mon Sep 17 00:00:00 2001 From: Robert Monfera Date: Wed, 3 Apr 2019 20:07:48 +0200 Subject: [PATCH] Fix: don't attempt grouping while mouse is down (#34448) (#34461) --- x-pack/plugins/canvas/public/lib/aeroelastic/layout.js | 2 +- .../plugins/canvas/public/lib/aeroelastic/layout_functions.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/x-pack/plugins/canvas/public/lib/aeroelastic/layout.js b/x-pack/plugins/canvas/public/lib/aeroelastic/layout.js index 98234d72d99d..a8f894c837de 100644 --- a/x-pack/plugins/canvas/public/lib/aeroelastic/layout.js +++ b/x-pack/plugins/canvas/public/lib/aeroelastic/layout.js @@ -182,7 +182,7 @@ const rotationTooltipAnnotation = select(getRotationTooltipAnnotation)( cursorPosition ); -const groupAction = select(getGroupAction)(actionEvent); +const groupAction = select(getGroupAction)(actionEvent, mouseIsDown); const groupingTuple = select(getGroupingTuple)( configuration, diff --git a/x-pack/plugins/canvas/public/lib/aeroelastic/layout_functions.js b/x-pack/plugins/canvas/public/lib/aeroelastic/layout_functions.js index d62fbe21fa0f..a65488fc1577 100644 --- a/x-pack/plugins/canvas/public/lib/aeroelastic/layout_functions.js +++ b/x-pack/plugins/canvas/public/lib/aeroelastic/layout_functions.js @@ -1376,9 +1376,9 @@ export const getSnappedShapes = ( export const getConstrainedShapesWithPreexistingAnnotations = (snapped, transformed) => snapped.concat(transformed.filter(s => s.type === 'annotation')); -export const getGroupAction = action => { +export const getGroupAction = (action, mouseIsDown) => { const event = action && action.event; - return event === 'group' || event === 'ungroup' ? event : null; + return !mouseIsDown && (event === 'group' || event === 'ungroup') ? event : null; }; export const getGroupedSelectedShapes = ({ selectedShapes }) => selectedShapes;