From 7509af28a10150349f235e1e94a55e06425dbff0 Mon Sep 17 00:00:00 2001
From: Yan Heng <yanheng@siactpower.com>
Date: Mon, 31 Jul 2023 10:21:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=9F=A9=E5=BD=A2?=
 =?UTF-8?q?=E7=BB=98=E5=88=B6=E9=87=8D=E5=A4=8D=E6=B7=BB=E5=8A=A0=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/src/app.ts               |  5 +++--
 packages/core/src/tools/rect-tool.ts   | 23 ++++++++++++-----------
 packages/core/src/tools/select-tool.ts |  2 ++
 packages/core/src/utils/math.ts        |  4 ++++
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/packages/core/src/app.ts b/packages/core/src/app.ts
index 1275ac70..8acef987 100644
--- a/packages/core/src/app.ts
+++ b/packages/core/src/app.ts
@@ -102,10 +102,11 @@ export class App extends BaseService<EventArgs> {
 
   public select(...children: ChildType[]): void {
     this.selected.forEach((child) => child.draggable(false));
+    this.selected = [];
     this.selector.nodes([]);
-    this.selected = children.map((child) => {
+    children.forEach((child) => {
       child.draggable(true);
-      return child;
+      this.selected.push(child);
     });
     this.selector.nodes(children);
     this.selector.moveToTop();
diff --git a/packages/core/src/tools/rect-tool.ts b/packages/core/src/tools/rect-tool.ts
index dfe627d3..67f79ba6 100644
--- a/packages/core/src/tools/rect-tool.ts
+++ b/packages/core/src/tools/rect-tool.ts
@@ -5,8 +5,12 @@ import { Point } from '../utils';
 import { selectTool } from './select-tool';
 
 export const rectTool = (): Tool => {
-  let startPointer: Point = new Point(0, 0);
-  let rectangle: Rect | null = null;
+  const startPointer: Point = new Point(0, 0);
+  const rectangle: Rect = new Rect({
+    fill: 'transparent',
+    stroke: 'black',
+    strokeWidth: 2,
+  });
 
   return {
     name: 'rectTool',
@@ -14,18 +18,15 @@ export const rectTool = (): Tool => {
       app.select();
     },
     onInactive() {
-      rectangle = null;
       startPointer.setXY(0, 0);
     },
     onMouseDown({ app }: AppMouseEvent): void {
-      startPointer = app.pointer;
-      rectangle = new Rect({
-        x: startPointer.x,
-        y: startPointer.y,
-        fill: 'transparent',
-        stroke: 'black',
-        strokeWidth: 2,
-      });
+      startPointer.clone(app.pointer);
+      rectangle.setPosition(
+        new Point(Math.min(startPointer.x, app.pointer.x), Math.min(startPointer.y, app.pointer.y))
+      );
+      rectangle.width(0);
+      rectangle.height(0);
       app.add(rectangle);
     },
     onMouseMove({ app }: AppMouseEvent): void {
diff --git a/packages/core/src/tools/select-tool.ts b/packages/core/src/tools/select-tool.ts
index 19ef9777..d0a3d15e 100644
--- a/packages/core/src/tools/select-tool.ts
+++ b/packages/core/src/tools/select-tool.ts
@@ -16,6 +16,7 @@ export const selectTool = (...shapes: ChildType[]): Tool => {
     listening: false,
   });
   let isRubberSelector: boolean = false;
+
   return {
     name: 'selectTool',
     onActive(app) {
@@ -23,6 +24,7 @@ export const selectTool = (...shapes: ChildType[]): Tool => {
       app.add(rubberRect);
     },
     onInactive() {
+      rubberRect.destroy();
       startPointer.setXY(0, 0);
     },
     onMouseDown({ app }) {
diff --git a/packages/core/src/utils/math.ts b/packages/core/src/utils/math.ts
index 62b3df2a..f6d0a427 100644
--- a/packages/core/src/utils/math.ts
+++ b/packages/core/src/utils/math.ts
@@ -29,4 +29,8 @@ export class Point implements Konva.Vector2d {
   public toArray(): number[] {
     return [this.x, this.y];
   }
+
+  public clone(point: Point): void {
+    this.setXY(point.x, point.y);
+  }
 }