From e08648c8f5fd3d89b202e842ae0b25ffd7acf056 Mon Sep 17 00:00:00 2001
From: pmkrawczyk <63370626+pmkrawczyk@users.noreply.github.com>
Date: Sat, 5 Nov 2022 19:32:12 +0100
Subject: [PATCH] Maintain aspect ratio by default for images (#847)

---
 packages/svgcanvas/event.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/svgcanvas/event.js b/packages/svgcanvas/event.js
index 5327b4db..8ea1169e 100644
--- a/packages/svgcanvas/event.js
+++ b/packages/svgcanvas/event.js
@@ -277,7 +277,9 @@ const mouseMoveEvent = (evt) => {
       }
 
       translateOrigin.setTranslate(-(left + tx), -(top + ty))
-      if (evt.shiftKey) {
+      // For images, we maintain aspect ratio by default and relax when shift pressed
+      const maintainAspectRatio = (selected.tagName !== 'image' && evt.shiftKey) || (selected.tagName === 'image' && !evt.shiftKey)
+      if (maintainAspectRatio) {
         if (sx === 1) {
           sx = sy
         } else { sy = sx }
@@ -343,12 +345,16 @@ const mouseMoveEvent = (evt) => {
     case 'square':
     case 'rect':
     case 'image': {
-      const square = (svgCanvas.getCurrentMode() === 'square') || evt.shiftKey
+      // For images, we maintain aspect ratio by default and relax when shift pressed
+      const maintainAspectRatio = (svgCanvas.getCurrentMode() === 'square') ||
+        (svgCanvas.getCurrentMode() === 'image' && !evt.shiftKey) ||
+        (svgCanvas.getCurrentMode() !== 'image' && evt.shiftKey)
+
       let
         w = Math.abs(x - svgCanvas.getStartX())
       let h = Math.abs(y - svgCanvas.getStartY())
       let newX; let newY
-      if (square) {
+      if (maintainAspectRatio) {
         w = h = Math.max(w, h)
         newX = svgCanvas.getStartX() < x ? svgCanvas.getStartX() : svgCanvas.getStartX() - w
         newY = svgCanvas.getStartY() < y ? svgCanvas.getStartY() : svgCanvas.getStartY() - h