@neo4j-nvl/interaction-handlers 0.3.6-e7f05fb1 → 0.3.6-eb8dc47c

package/lib/__tests__/lasso-interaction.test.js

@@ -3,7 +3,7 @@ import '@testing-library/jest-dom';
 import { LassoInteraction, checkIntersection, checkLinesCrossing, checkPointInside } from '../interaction-handlers/lasso-interaction';
 jest.mock('@neo4j-nvl/layout-workers');
 const testNodes = [
-    { id: '0', x: 10, y: 10 },
+    { id: '0', x: 25, y: 25 },
     { id: '1', x: 200, y: 200 }
 ];
 const testRels = [{ id: '10', from: '0', to: '1' }];
@@ -35,12 +35,12 @@ describe('LassoInteraction', () => {
         expect(myNVL.getSelectedNodes()).toHaveLength(0);
         const gesture1 = [
             createMouseEvent('mousedown', 0, 0),
-            createMouseEvent('mousemove', 30, 0),
-            createMouseEvent('mousemove', 20, 20),
+            createMouseEvent('mousemove', 50, 0),
+            createMouseEvent('mousemove', 20, 50),
             createMouseEvent('mouseup', 0, 0)
         ];
         const gesture2 = [
-            createMouseEvent('mousedown', 200, 180),
+            createMouseEvent('mousedown', 200, 150),
             createMouseEvent('mousemove', 210, 210),
             createMouseEvent('mouseup', 190, 210)
         ];
@@ -76,6 +76,23 @@ describe('LassoInteraction', () => {
             resolve();
         });
     });
+    test('will not start when node is below pointer when dragging', () => {
+        lassoInteraction.updateCallback('onLassoStarted', startCallback);
+        lassoInteraction.updateCallback('onLassoSelect', selectCallback);
+        expect(myNVL.getSelectedNodes()).toHaveLength(0);
+        const gesture1 = [
+            createMouseEvent('mousedown', 10, 10),
+            createMouseEvent('mousemove', 50, 0),
+            createMouseEvent('mousemove', 20, 50),
+            createMouseEvent('mouseup', 0, 0)
+        ];
+        const container = myNVL.getContainer();
+        gesture1.forEach((e) => container.dispatchEvent(e));
+        return new Promise((resolve) => {
+            expect(startCallback).not.toHaveBeenCalled();
+            resolve();
+        });
+    });
     test('test for line crossing utility function', () => {
         const res1 = checkLinesCrossing([0, 0], [10, 10], [10, 0], [0, 10]);
         expect(res1).toBeTruthy();

package/lib/interaction-handlers/box-select-interaction.js

@@ -106,10 +106,10 @@ export class BoxSelectInteraction extends BaseInteraction {
         }
         else {
             this.isBoxSelecting = true;
+            this.callCallbackIfRegistered('onBoxStarted', event);
             if (this.currentOptions.selectOnRelease === true) {
                 this.nvlInstance.deselectAll();
             }
         }
-        this.callCallbackIfRegistered('onBoxStarted', event);
     }
 }

package/lib/interaction-handlers/lasso-interaction.js

@@ -1,4 +1,5 @@
 import concaveman from 'concaveman';
+import { NODE_EDGE_WIDTH } from '../constants';
 import { OverlayRenderer } from '../overlay-renderer/overlay-renderer';
 import { BaseInteraction } from './base';
 import { getCanvasPosition, getWorldPosition } from './utils';
@@ -87,9 +88,18 @@ export class LassoInteraction extends BaseInteraction {
         this.addEventListener('mouseleave', this.endLasso, true);
     }
     startLasso = (event) => {
-        this.active = true;
-        this.points = [getCanvasPosition(this.containerInstance, event)];
-        this.callCallbackIfRegistered('onLassoStarted', event);
+        const hits = this.nvlInstance.getHits(event, ['node'], { hitNodeMarginWidth: NODE_EDGE_WIDTH });
+        if (hits.nvlTargets.nodes.length > 0) {
+            this.active = false;
+        }
+        else {
+            this.active = true;
+            this.points = [getCanvasPosition(this.containerInstance, event)];
+            this.callCallbackIfRegistered('onLassoStarted', event);
+            if (this.currentOptions.selectOnRelease === true) {
+                this.nvlInstance.deselectAll();
+            }
+        }
     };
     handleMouseDown = (event) => {
         if (event.button === 0 && !this.active) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neo4j-nvl/interaction-handlers",
-  "version": "0.3.6-e7f05fb1",
+  "version": "0.3.6-eb8dc47c",
   "license": "SEE LICENSE IN 'LICENSE.txt'",
   "homepage": "https://neo4j.com/docs/nvl/current/",
   "description": "Interaction handlers for the Neo4j Visualization Library",
@@ -27,7 +27,7 @@
     "eslint": "yarn global:eslint ./src/"
   },
   "dependencies": {
-    "@neo4j-nvl/base": "0.3.6-e7f05fb1",
+    "@neo4j-nvl/base": "0.3.6-eb8dc47c",
     "concaveman": "^1.2.1",
     "lodash": "4.17.21"
   },