fix: allow clickBySelectEnd, hitRate #152

daybrush · Nov 11, 2023 · 79b4f94 · 79b4f94
1 parent 53e5e10
commit 79b4f94
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/packages/selecto/src/SelectoManager.tsx b/packages/selecto/src/SelectoManager.tsx
@@ -192,7 +192,7 @@ class Selecto extends EventEmitter<SelectoEvents> {
         const data = { ignoreClick: true };
 
         this.findSelectableTargets(data);
-        const selectedElements = this.hitTest(rect, data);
+        const selectedElements = this.hitTest(rect, data, true, null);
         const result = this.setSelectedTargets(selectedElements);
 
         return {
@@ -576,7 +576,8 @@ class Selecto extends EventEmitter<SelectoEvents> {
     private hitTest(
         selectRect: Rect,
         data: any,
-        gestoEvent?: any,
+        isDrag: boolean,
+        gestoEvent: any,
     ) {
         const { hitRate, selectByClick } = this.options;
         const { left, top, right, bottom } = selectRect;
@@ -602,7 +603,7 @@ class Selecto extends EventEmitter<SelectoEvents> {
                 ? false
                 : isInside([clientX, clientY], points);
 
-            if (selectByClick && inArea) {
+            if (!isDrag && selectByClick && inArea) {
                 return true;
             }
             const overlapPoints = getOverlapPoints(rectPoints, points);
@@ -1028,14 +1029,21 @@ class Selecto extends EventEmitter<SelectoEvents> {
         };
         let firstPassedTargets: ElementType[] = [];
 
-        if (!selectFromInside || (selectByClick && !clickBySelectEnd)) {
+        // allow click on select
+        const allowClickBySelectEnd = selectByClick && !clickBySelectEnd;
+        let hasInsideTargets = false;
+
+        if (!selectFromInside || allowClickBySelectEnd) {
             const pointTarget = this._findElement(
                 clickedTarget || inputEvent.target, // elementFromPoint(clientX, clientY),
                 data.selectableTargets,
             );
-            firstPassedTargets = pointTarget ? [pointTarget] : [];
+
+            hasInsideTargets = !!pointTarget;
+            if (allowClickBySelectEnd) {
+                firstPassedTargets = pointTarget ? [pointTarget] : [];
+            }
         }
-        const hasInsideTargets = firstPassedTargets.length > 0;
         const isPreventSelect = !selectFromInside && hasInsideTargets;
 
         // prevent drag from inside when selectByClick is false
@@ -1094,6 +1102,7 @@ class Selecto extends EventEmitter<SelectoEvents> {
         } else {
             data.startPassedTargets = [];
         }
+
         this._select(
             firstPassedTargets,
             hitRect,
@@ -1171,7 +1180,8 @@ class Selecto extends EventEmitter<SelectoEvents> {
             if (!isInnerScroll && scrollOptions && scrollOptions.container) {
                 this.dragScroll.dragStart(e, scrollOptions);
             }
-            if (clickBySelectEnd) {
+
+            if (isPreventSelect && selectByClick && clickBySelectEnd) {
                 data.selectFlag = false;
                 e.preventDrag();
             }
@@ -1206,6 +1216,7 @@ class Selecto extends EventEmitter<SelectoEvents> {
             const passedTargets = this.hitTest(
                 rect,
                 data,
+                true,
                 e,
             );
             selectedTargets = passTargets(

diff --git a/packages/selecto/test/manual/index.html b/packages/selecto/test/manual/index.html
@@ -65,20 +65,20 @@
         // boundContainer: true,
         // ratio: 1,
         // dragCondition: () => false,
-        hitRate: 0,
-        ratio: 0,
+        hitRate: 10,
+        // ratio: 0,
         selectableTargets: [".target"],
         selectFromInside: false,
         selectByClick: true,
-        // clickBySelectEnd: true,
+        clickBySelectEnd: true,
         // checkInput: true,
         // preventDragFromInside: false,
         toggleContinueSelect: "shift",
         // continueSelectWithoutDeselect: true,
     }).on("dragStart", e => {
         console.log("ds", e.inputEvent.target);
     }).on("drag", e => {
-        selecto.findSelectableTargets();
+        // selecto.findSelectableTargets();
     }).on("selectStart", e => {
         console.log("start", e);
         e.added.forEach(el => {