Merge branch 'master' of github.com:konvajs/konva into master

konva.js

@@ -8,7 +8,11 @@
    * Konva JavaScript Framework v8.3.0
    * http://konvajs.org/
    * Licensed under the MIT
+<<<<<<< HEAD
    * Date: Thu Dec 09 2021
+=======
+   * Date: Thu Nov 25 2021
+>>>>>>> d84e5a7d8bcd7705b142654ab6b05dbae64addfe
    *
    * Original work Copyright (C) 2011 - 2013 by Eric Rowell (KineticJS)
    * Modified work Copyright (C) 2014 - present by Anton Lavrenov (Konva)
@@ -9717,6 +9721,28 @@
       setHeight(height) {
           this.outerRadius(height / 2);
       }
+      getSelfRect() {
+          const radius = this.outerRadius();
+          const DEG_TO_RAD = Math.PI / 180;
+          const angle = this.angle() * DEG_TO_RAD;
+          const inc = 1 * DEG_TO_RAD;
+          const xs = [];
+          const ys = [];
+          for (let i = 0; i < angle + inc; i += inc) {
+              xs.push(Math.cos(i));
+              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,
+              y: minY || 0,
+              width: maxX - minX,
+              height: maxY - minY
+          };
+      }
   }
   Arc.prototype._centroid = true;
   Arc.prototype.className = 'Arc';

src/Node.ts

@@ -1324,11 +1324,15 @@ export abstract class Node<Config extends NodeConfig = NodeConfig> {
       Util.warn('Node has no parent. moveToTop function is ignored.');
       return false;
     }
-    var index = this.index;
+    var index = this.index,
-    this.parent.children.splice(index, 1);
+      len = this.parent.getChildren().length;
-    this.parent.children.push(this);
+    if (index < len - 1) {
-    this.parent._setChildrenIndices();
+      this.parent.children.splice(index, 1);
-    return true;
+      this.parent.children.push(this);
+      this.parent._setChildrenIndices();
+      return true;
+    }
+    return false;
   }
   /**
    * move node up

src/index-types.d.ts

@@ -71,6 +71,7 @@ declare namespace Konva {
 
   export const Stage: typeof import('./Stage').Stage;
   export type Stage = import('./Stage').Stage;
+  export type StageConfig = import('./Stage').StageConfig;
   export const stages: typeof import('./Stage').stages;
 
   export const Layer: typeof import('./Layer').Layer;

src/shapes/Arc.ts

@@ -4,6 +4,7 @@ import { Konva } from '../Global';
 import { GetSet } from '../types';
 import { getNumberValidator, getBooleanValidator } from '../Validators';
 import { _registerNode } from '../Global';
+import { Transform, Util } from '../Util';
 
 export interface ArcConfig extends ShapeConfig {
   angle: number;
@@ -60,6 +61,39 @@ export class Arc extends Shape<ArcConfig> {
     this.outerRadius(height / 2);
   }
 
+  getSelfRect() {
+    const radius = this.outerRadius()
+    const DEG_TO_RAD = Math.PI / 180;
+    const angle = this.angle() * DEG_TO_RAD;
+    const inc = 1 * DEG_TO_RAD;
+    let start = 0
+    let end = angle + inc
+
+    if (this.clockwise()) {
+      start = end
+      end = 360
+    }
+
+    const xs = [];
+    const ys = [];
+    for (let i = 0; i < end; i += inc ) {
+      xs.push(Math.cos(i));
+      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,
+      y: minY || 0,
+      width: maxX - minX,
+      height: maxY - minY
+    }
+  }
+
   innerRadius: GetSet<number, this>;
   outerRadius: GetSet<number, this>;
   angle: GetSet<number, this>;

test/tsconfig.json

@@ -6,5 +6,5 @@
     "lib": ["ES2015", "dom"],
     "module": "CommonJS"
   },
-  "include": ["../src/*.ts"]
+  "include": ["../src/**/*.ts"]
 }

test/unit/Arc-test.ts

@@ -88,6 +88,34 @@ describe('Arc', function () {
     layer.add(arc);
     stage.add(layer);
 
+    assert.deepEqual(arc.getSelfRect(), {
+      x: 0,
+      y: 0,
+      width: 80,
+      height: 80,
+    });
+  });
+
+  it('getSelfRect on clockwise', function () {
+    var stage = addStage();
+    var layer = new Konva.Layer();
+    var arc = new Konva.Arc({
+      x: 100,
+      y: 100,
+      innerRadius: 50,
+      outerRadius: 80,
+      angle: 90,
+      fill: 'green',
+      stroke: 'black',
+      strokeWidth: 4,
+      name: 'myArc',
+      draggable: true,
+      clockwise: true,
+    });
+
+    layer.add(arc);
+    stage.add(layer);
+
     assert.deepEqual(arc.getSelfRect(), {
       x: -80,
       y: -80,

tsconfig-cmj.json

@@ -9,5 +9,5 @@
     "declaration": true,
     "removeComments": true
   },
-  "include": ["./src/*.ts"],
+  "include": ["./src/**/*.ts"],
 }

tsconfig.json

@@ -3,6 +3,7 @@
     "outDir": "lib",
     "module": "ES2015",
     "target": "ES2015",
+    "sourceMap": true,
     "noEmitOnError": true,
     "lib": ["ES2015", "dom"],
     "moduleResolution": "node",
@@ -11,5 +12,5 @@
     // "noImplicitAny": true,
     // "strict": true
   },
-  "include": ["./src/*.ts"]
+  "include": ["./src/**/*.ts"]
 }

tsconfig.testing.json

@@ -6,5 +6,5 @@
     "moduleResolution": "node",
     "lib": ["ES2015", "dom"]
   },
-  "include": ["./src/*.ts"]
+  "include": ["./src/**/*.ts"]
 }