Feat: box select - detection 2 (debug)

elastic · Feb 12, 2019 · be44edc · be44edc
1 parent ef3805b
commit be44edc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/x-pack/plugins/canvas/public/lib/aeroelastic/layout.js b/x-pack/plugins/canvas/public/lib/aeroelastic/layout.js
@@ -158,7 +158,12 @@ const alignmentGuideAnnotations = select(getAlignmentGuideAnnotations)(
 
 const hoverAnnotations = select(getHoverAnnotations)(
   configuration,
-  hoveredShape,
+  select((h, b) =>
+    h
+      .slice(0, 1)
+      .concat(b)
+      .filter((d, i, a) => a.indexOf(d) === i)
+  )(hoveredShapes, boxSelected),
   selectedPrimaryShapeIds,
   draggedShape
 );

diff --git a/x-pack/plugins/canvas/public/lib/aeroelastic/layout_functions.js b/x-pack/plugins/canvas/public/lib/aeroelastic/layout_functions.js
@@ -1205,7 +1205,6 @@ export const getSelectionState = (
   boxSelected,
   allShapes
 ) => {
-  // console.log(boxSelected.map(s => s.id).join(', '));
   const uidUnchanged = uid === prev.uid;
   const mouseButtonUp = !down;
   const updateFromDirectSelect =
@@ -1308,14 +1307,16 @@ export const getAdHocChildrenAnnotations = (config, { shapes }) => {
     .map(borderAnnotation(config.getAdHocChildAnnotationName, config.hoverLift));
 };
 
-export const getHoverAnnotations = (config, shape, selectedPrimaryShapeIds, draggedShape) => {
-  return shape &&
-    shape.type !== 'annotation' &&
-    selectedPrimaryShapeIds.indexOf(shape.id) === -1 &&
-    !draggedShape
-    ? [borderAnnotation(config.hoverAnnotationName, config.hoverLift)(shape)]
-    : [];
-};
+export const getHoverAnnotations = (config, shapes, selectedPrimaryShapeIds, draggedShape) =>
+  shapes
+    .filter(
+      shape =>
+        shape &&
+        shape.type !== 'annotation' &&
+        selectedPrimaryShapeIds.indexOf(shape.id) === -1 &&
+        !draggedShape
+    )
+    .map(borderAnnotation(config.hoverAnnotationName, config.hoverLift));
 
 export const getSnappedShapes = (
   config,