From 750b516b3b2c0b34680e8f7e8e495672fd4f5872 Mon Sep 17 00:00:00 2001
From: Robert Rosman <robert.rosman@zmartagroup.com>
Date: Fri, 7 Jun 2024 21:55:49 +0200
Subject: [PATCH] fix: handle negative values for width/height on ellipse and
 rectangle

---
 src/composables/tools/useEllipse/useEllipse.ts     | 4 ++--
 src/composables/tools/useRectangle/useRectangle.ts | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/composables/tools/useEllipse/useEllipse.ts b/src/composables/tools/useEllipse/useEllipse.ts
index 5842094..86e879e 100644
--- a/src/composables/tools/useEllipse/useEllipse.ts
+++ b/src/composables/tools/useEllipse/useEllipse.ts
@@ -65,8 +65,8 @@ export function useEllipse({ base = 'edge'}: UseEllipseOptions = {}): Tool<Ellip
     h('ellipse', {
       cx: ellipse.x,
       cy: ellipse.y,
-      rx: ellipse.width / 2,
-      ry: ellipse.height / 2,
+      rx: Math.abs(ellipse.width / 2),
+      ry: Math.abs(ellipse.height / 2),
       stroke: ellipse.color,
       'stroke-width': ellipse.thickness
     })
diff --git a/src/composables/tools/useRectangle/useRectangle.ts b/src/composables/tools/useRectangle/useRectangle.ts
index d4225c1..ab7dbb3 100644
--- a/src/composables/tools/useRectangle/useRectangle.ts
+++ b/src/composables/tools/useRectangle/useRectangle.ts
@@ -33,10 +33,10 @@ export function useRectangle(): Tool<Rectangle> {
 
   const ShapeSvgComponent = createShapeSvgComponent<Rectangle>((rectangle) =>
     h('rect', {
-      x: rectangle.x,
-      y: rectangle.y,
-      width: rectangle.width,
-      height: rectangle.height,
+      x: rectangle.width > 0 ? rectangle.x : rectangle.x + rectangle.width,
+      y: rectangle.height > 0 ? rectangle.y : rectangle.y + rectangle.height,
+      width: Math.abs(rectangle.width),
+      height: Math.abs(rectangle.height),
       stroke: rectangle.color,
       'stroke-width': rectangle.thickness
     })