@postermywall/fabricjs-2 6.4.2-pmw-25 → 6.4.2-pmw-28

package/dist/index.js

@@ -428,7 +428,7 @@
   }
   const cache = new Cache();
 
-  var version = "6.4.2-pmw-25";
+  var version = "6.4.2-pmw-28";
 
   // use this syntax so babel plugin see this import here
   const VERSION = version;
@@ -5174,6 +5174,7 @@
     globalCompositeOperation: 'source-over',
     backgroundColor: '',
     shadow: null,
+    uniformScaling: true,
     visible: true,
     includeDefaultValues: true,
     excludeFromExport: false,
@@ -8800,7 +8801,10 @@
   function scaleIsProportional(eventData, fabricObject) {
     const canvas = fabricObject.canvas,
       uniformIsToggled = eventData[canvas.uniScaleKey];
-    return canvas.uniformScaling && !uniformIsToggled || !canvas.uniformScaling && uniformIsToggled;
+
+    // *PMW* changed uniformScaling to look at the new uniformScaling property in fabricObject rather than canvas
+    // *PMW* changed canvas.uniScaleKey behaviour to not set unform scaling false in case of true but only to true in case of false
+    return fabricObject.uniformScaling || !fabricObject.uniformScaling && uniformIsToggled;
   }
 
   /**
@@ -10916,6 +10920,7 @@
 
   const _excluded$c = ["left", "top", "width", "height", "visible"];
   const rectDefaultValues = {
+    uniformRoundness: false,
     rx: 0,
     ry: 0
   };
@@ -10935,6 +10940,7 @@
       this.setOptions(options);
       this._initRxRy();
     }
+
     /**
      * Initializes rx/ry attributes
      * @private
@@ -10962,9 +10968,14 @@
       } = this;
       const x = -w / 2;
       const y = -h / 2;
-      const rx = this.rx ? Math.min(this.rx, w / 2) : 0;
-      const ry = this.ry ? Math.min(this.ry, h / 2) : 0;
+      let rx = this.rx ? Math.min(this.rx, w / 2) : 0;
+      let ry = this.ry ? Math.min(this.ry, h / 2) : 0;
       const isRounded = rx !== 0 || ry !== 0;
+      if (this.uniformRoundness) {
+        const scaling = this.getObjectScaling();
+        rx = rx / scaling.x;
+        ry = ry / scaling.y;
+      }
       ctx.beginPath();
       ctx.moveTo(x + rx, y);
       ctx.lineTo(x + w - rx, y);