fix: handle negative values for width/height on ellipse and rectangle

robertrosman · Jun 7, 2024 · 750b516 · 750b516
1 parent 049900c
commit 750b516
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
     })