add test on arc#getSelfRect

konva.js

@@ -8,7 +8,7 @@
    * Konva JavaScript Framework v8.3.1
    * http://konvajs.org/
    * Licensed under the MIT
-   * Date: Thu Dec 09 2021
+   * Date: Fri Dec 17 2021
    *
    * Original work Copyright (C) 2011 - 2013 by Eric Rowell (KineticJS)
    * Modified work Copyright (C) 2014 - present by Anton Lavrenov (Konva)
@@ -794,7 +794,12 @@
       _rgbaColorToRGBA(str) {
           if (str.indexOf('rgba(') === 0) {
               str = str.match(/rgba\(([^)]+)\)/)[1];
-              var parts = str.split(/ *, */).map(Number);
+              var parts = str.split(/ *, */).map((n, index) => {
+                  if (n.slice(-1) === '%') {
+                      return index === 3 ? parseInt(n) / 100 : (parseInt(n) / 100) * 255;
+                  }
+                  return Number(n);
+              });
               return {
                   r: parts[0],
                   g: parts[1],
@@ -9721,29 +9726,23 @@
           this.outerRadius(height / 2);
       }
       getSelfRect() {
-          const radius = this.outerRadius();
+          const innerRadius = this.innerRadius();
-          const DEG_TO_RAD = Math.PI / 180;
+          const outerRadius = this.outerRadius();
-          const angle = this.angle() * DEG_TO_RAD;
+          const clockwise = this.clockwise();
-          const inc = 1 * DEG_TO_RAD;
+          const angle = Konva$2.getAngle(clockwise ? 360 - this.angle() : this.angle());
-          let end = angle + inc;
+          const boundLeftRatio = Math.cos(Math.min(angle, Math.PI));
-          if (this.clockwise()) {
+          const boundRightRatio = 1;
-              end = 360;
+          const boundTopRatio = Math.sin(Math.min(Math.max(Math.PI, angle), 3 * Math.PI / 2));
-          }
+          const boundBottomRatio = Math.sin(Math.min(angle, Math.PI / 2));
-          const xs = [];
+          const boundLeft = boundLeftRatio * (boundLeftRatio > 0 ? innerRadius : outerRadius);
-          const ys = [];
+          const boundRight = boundRightRatio * (outerRadius );
-          for (let i = 0; i < end; i += inc) {
+          const boundTop = boundTopRatio * (boundTopRatio > 0 ? innerRadius : outerRadius);
-              xs.push(Math.cos(i));
+          const boundBottom = boundBottomRatio * (boundBottomRatio > 0 ? outerRadius : innerRadius);
-              ys.push(Math.sin(i));
-          }
-          const minX = Math.round(radius * Math.min(...xs));
-          const maxX = Math.round(radius * Math.max(...xs));
-          const minY = Math.round(radius * Math.min(...ys));
-          const maxY = Math.round(radius * Math.max(...ys));
           return {
-              x: minX || 0,
+              x: Math.round(boundLeft),
-              y: minY || 0,
+              y: Math.round(clockwise ? -1 * boundBottom : boundTop),
-              width: maxX - minX,
+              width: Math.round(boundRight - boundLeft),
-              height: maxY - minY
+              height: Math.round(boundBottom - boundTop)
           };
       }
   }
@@ -11678,6 +11677,7 @@
        * @memberof Konva.Image
        * @param {String} url image source
        * @param {Function} callback with Konva.Image instance as first argument
+       * @param {Function} onError optional error handler
        * @example
        *  Konva.Image.fromURL(imageURL, function(image){
        *    // image is Konva.Image instance
@@ -11685,7 +11685,7 @@
        *    layer.draw();
        *  });
        */
-      static fromURL(url, callback) {
+      static fromURL(url, callback, onError = null) {
           var img = Util.createImageElement();
           img.onload = function () {
               var image = new Image({
@@ -11693,6 +11693,7 @@
               });
               callback(image);
           };
+          img.onerror = onError;
           img.crossOrigin = 'Anonymous';
           img.src = url;
       }

test/unit/Arc-test.ts

@@ -124,6 +124,53 @@ describe('Arc', function () {
     });
   });
 
+  it('getSelfRect on quarter clockwise arc bounds to the visible part', function () {
+    var stage = addStage();
+    var layer = new Konva.Layer();
+    var arc = new Konva.Arc({
+      x: 100,
+      y: 100,
+      innerRadius: 50,
+      outerRadius: 80,
+      angle: 270,
+      strokeWidth: 4,
+      clockwise: true,
+    });
+
+    layer.add(arc);
+    stage.add(layer);
+
+    assert.deepEqual(arc.getSelfRect(), {
+      x: 0,
+      y: -80,
+      width: 80,
+      height: 80,
+    });
+  });
+
+  it('getSelfRect on small angle arc should bounds to inner radius', function () {
+    var stage = addStage();
+    var layer = new Konva.Layer();
+    var arc = new Konva.Arc({
+      x: 100,
+      y: 100,
+      innerRadius: 50,
+      outerRadius: 80,
+      angle: 60,
+      strokeWidth: 4,
+    });
+
+    layer.add(arc);
+    stage.add(layer);
+
+    assert.deepEqual(arc.getSelfRect(), {
+      x: 25,
+      y: 0,
+      width: 55,
+      height: 69,
+    });
+  });
+  
   it('cache', function () {
     var stage = addStage();
     var layer = new Konva.Layer();