bug(Select): Fix multi drag no longer working

Kruptein · Nov 8, 2024 · f53270f · f53270f
1 parent f3d3ae9
commit f53270f
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/client/src/game/tools/variants/select/index.ts b/client/src/game/tools/variants/select/index.ts
@@ -334,7 +334,8 @@ class SelectTool extends Tool implements ISelectTool {
                 }
             }
             if (shape.contains(gp)) {
-                if (!this.currentSelection.includes(shape)) {
+                const shapeSelectionIndex = this.currentSelection.findIndex((s) => s.id === shape.id);
+                if (shapeSelectionIndex === -1) {
                     if (event && ctrlOrCmdPressed(event)) {
                         this.currentSelection.push(shape);
                     } else {
@@ -345,8 +346,10 @@ class SelectTool extends Tool implements ISelectTool {
                 } else {
                     if (event && ctrlOrCmdPressed(event)) {
                         this.currentSelection = this.currentSelection.filter((s) => s.id !== shape.id);
-                    } else {
-                        this.currentSelection = [shape];
+                    } else if (shapeSelectionIndex !== 0) {
+                        // Move it to the front of the selection, so that it becomes the new focus
+                        this.currentSelection.splice(shapeSelectionIndex, 1);
+                        this.currentSelection.unshift(shape);
                     }
                 }
                 // Drag case, a shape is selected