Add getShape to draw factories

ivmartel · Nov 8, 2024 · 65710ef · 65710ef
1 parent 49d83ee
commit 65710ef
Show file tree

Hide file tree

Showing 8 changed files with 145 additions and 114 deletions.
diff --git a/src/tools/arrow.js b/src/tools/arrow.js
@@ -6,7 +6,11 @@ import {
 import {Point2D} from '../math/point';
 import {defaults} from '../app/defaults';
 import {logger} from '../utils/logger';
-import {DRAW_DEBUG, getDefaultAnchor} from './drawBounds';
+import {
+  getLineShape,
+  DRAW_DEBUG,
+  getDefaultAnchor
+} from './drawBounds';
 import {LabelFactory} from './labelFactory';
 
 // external
@@ -237,12 +241,7 @@ export class ArrowFactory {
       return;
     }
     // associated shape
-    const kline = group.getChildren(function (node) {
-      return node.name() === 'shape';
-    })[0];
-    if (!(kline instanceof Konva.Line)) {
-      return;
-    }
+    const kline = this.#getShape(group);
     // find anchors
     const begin = group.getChildren(function (node) {
       return node.id() === 'anchor0';
@@ -312,12 +311,7 @@ export class ArrowFactory {
    * @param {Konva.Group} group The shape group.
    */
   updateConnector(group) {
-    const kshape = group.getChildren(function (node) {
-      return node.name() === 'shape';
-    })[0];
-    if (!(kshape instanceof Konva.Line)) {
-      return;
-    }
+    const kshape = this.#getShape(group);
     const connectorsPos = this.#getConnectorsPositions(kshape);
     this.#labelFactory.updateConnector(group, connectorsPos);
   }
@@ -386,6 +380,16 @@ export class ArrowFactory {
     return kshape;
   }
 
+  /**
+   * Get the associated shape from a group.
+   *
+   * @param {Konva.Group} group The group to look into.
+   * @returns {Konva.Line|undefined} The shape.
+   */
+  #getShape(group) {
+    return getLineShape(group);
+  }
+
   /**
    * Creates the konva shape extras.
    *
@@ -453,12 +457,7 @@ export class ArrowFactory {
       return;
     }
     // associated shape
-    const kline = group.getChildren(function (node) {
-      return node.name() === 'shape';
-    })[0];
-    if (!(kline instanceof Konva.Line)) {
-      return;
-    }
+    const kline = this.#getShape(group);
 
     // reset position after possible shape drag
     kline.position({x: 0, y: 0});

diff --git a/src/tools/circle.js b/src/tools/circle.js
@@ -2,7 +2,11 @@ import {Circle} from '../math/circle';
 import {Point2D} from '../math/point';
 import {logger} from '../utils/logger';
 import {defaults} from '../app/defaults';
-import {DRAW_DEBUG, getDefaultAnchor} from './drawBounds';
+import {
+  isNodeNameShape,
+  DRAW_DEBUG,
+  getDefaultAnchor
+} from './drawBounds';
 import {LabelFactory} from './labelFactory';
 
 // external
@@ -316,12 +320,7 @@ export class CircleFactory {
    * @param {Konva.Group} group The shape group.
    */
   updateConnector(group) {
-    const kshape = group.getChildren(function (node) {
-      return node.name() === 'shape';
-    })[0];
-    if (!(kshape instanceof Konva.Circle)) {
-      return;
-    }
+    const kshape = this.#getShape(group);
     const connectorsPos = this.#getConnectorsPositions(kshape);
     this.#labelFactory.updateConnector(group, connectorsPos);
   }
@@ -372,6 +371,20 @@ export class CircleFactory {
     });
   }
 
+  /**
+   * Get the associated shape from a group.
+   *
+   * @param {Konva.Group} group The group to look into.
+   * @returns {Konva.Circle|undefined} The shape.
+   */
+  #getShape(group) {
+    const kshape = group.getChildren(isNodeNameShape)[0];
+    if (!(kshape instanceof Konva.Circle)) {
+      return;
+    }
+    return kshape;
+  }
+
   /**
    * Get the default annotation label position.
    *
@@ -407,12 +420,7 @@ export class CircleFactory {
       return;
     }
     // associated shape
-    const kcircle = group.getChildren(function (node) {
-      return node.name() === 'shape';
-    })[0];
-    if (!(kcircle instanceof Konva.Circle)) {
-      return;
-    }
+    const kcircle = this.#getShape(group);
     // update shape: just update the radius
     kcircle.radius(radius);
 

diff --git a/src/tools/drawBounds.js b/src/tools/drawBounds.js
@@ -38,6 +38,20 @@ export function isPositionNode(node) {
   return node.name() === 'position-group';
 }
 
+/**
+ * Get a Konva.Line shape from a group.
+ *
+ * @param {Konva.Group} group The group to look into.
+ * @returns {Konva.Line|undefined} The shape.
+ */
+export function getLineShape(group) {
+  const kshape = group.getChildren(isNodeNameShape)[0];
+  if (!(kshape instanceof Konva.Line)) {
+    return;
+  }
+  return kshape;
+}
+
 /**
  * @callback testFn
  * @param {Konva.Node} node The node.

diff --git a/src/tools/ellipse.js b/src/tools/ellipse.js
@@ -2,7 +2,11 @@ import {Ellipse} from '../math/ellipse';
 import {Point2D} from '../math/point';
 import {logger} from '../utils/logger';
 import {defaults} from '../app/defaults';
-import {DRAW_DEBUG, getDefaultAnchor} from './drawBounds';
+import {
+  isNodeNameShape,
+  DRAW_DEBUG,
+  getDefaultAnchor
+} from './drawBounds';
 import {LabelFactory} from './labelFactory';
 
 // external
@@ -336,12 +340,7 @@ export class EllipseFactory {
    * @param {Konva.Group} group The shape group.
    */
   updateConnector(group) {
-    const kshape = group.getChildren(function (node) {
-      return node.name() === 'shape';
-    })[0];
-    if (!(kshape instanceof Konva.Ellipse)) {
-      return;
-    }
+    const kshape = this.#getShape(group);
     const connectorsPos = this.#getConnectorsPositions(kshape);
     this.#labelFactory.updateConnector(group, connectorsPos);
   }
@@ -397,6 +396,20 @@ export class EllipseFactory {
     });
   }
 
+  /**
+   * Get the associated shape from a group.
+   *
+   * @param {Konva.Group} group The group to look into.
+   * @returns {Konva.Ellipse|undefined} The shape.
+   */
+  #getShape(group) {
+    const kshape = group.getChildren(isNodeNameShape)[0];
+    if (!(kshape instanceof Konva.Ellipse)) {
+      return;
+    }
+    return kshape;
+  }
+
   /**
    * Get the default annotation label position.
    *
@@ -431,12 +444,7 @@ export class EllipseFactory {
       return;
     }
     // associated shape
-    const kellipse = group.getChildren(function (node) {
-      return node.name() === 'shape';
-    })[0];
-    if (!(kellipse instanceof Konva.Ellipse)) {
-      return;
-    }
+    const kellipse = this.#getShape(group);
     // update shape: just update radius
     kellipse.radius({
       x: radiusX,

diff --git a/src/tools/protractor.js b/src/tools/protractor.js
@@ -2,7 +2,11 @@ import {Line, getAngle} from '../math/line';
 import {Protractor} from '../math/protractor';
 import {Point2D} from '../math/point';
 import {defaults} from '../app/defaults';
-import {DRAW_DEBUG, getDefaultAnchor} from './drawBounds';
+import {
+  getLineShape,
+  DRAW_DEBUG,
+  getDefaultAnchor
+} from './drawBounds';
 import {LabelFactory} from './labelFactory';
 
 // external
@@ -239,12 +243,7 @@ export class ProtractorFactory {
       return;
     }
     // associated shape
-    const kline = group.getChildren(function (node) {
-      return node.name() === 'shape';
-    })[0];
-    if (!(kline instanceof Konva.Line)) {
-      return;
-    }
+    const kline = this.#getShape(group);
     // find special points
     const begin = group.getChildren(function (node) {
       return node.id() === 'anchor0';
@@ -313,12 +312,7 @@ export class ProtractorFactory {
    * @param {Konva.Group} group The shape group.
    */
   updateConnector(group) {
-    const kshape = group.getChildren(function (node) {
-      return node.name() === 'shape';
-    })[0];
-    if (!(kshape instanceof Konva.Line)) {
-      return;
-    }
+    const kshape = this.#getShape(group);
     const connectorsPos = this.#getConnectorsPositions(kshape);
     this.#labelFactory.updateConnector(group, connectorsPos);
   }
@@ -384,6 +378,16 @@ export class ProtractorFactory {
     return kshape;
   }
 
+  /**
+   * Get the associated shape from a group.
+   *
+   * @param {Konva.Group} group The group to look into.
+   * @returns {Konva.Line|undefined} The shape.
+   */
+  #getShape(group) {
+    return getLineShape(group);
+  }
+
   /**
    * Creates the konva shape extras.
    *
@@ -467,12 +471,7 @@ export class ProtractorFactory {
       return;
     }
     // associated shape
-    const kline = group.getChildren(function (node) {
-      return node.name() === 'shape';
-    })[0];
-    if (!(kline instanceof Konva.Line)) {
-      return;
-    }
+    const kline = this.#getShape(group);
 
     // reset position after possible shape drag
     kline.position({x: 0, y: 0});

diff --git a/src/tools/rectangle.js b/src/tools/rectangle.js
@@ -2,7 +2,11 @@ import {Rectangle} from '../math/rectangle';
 import {Point2D} from '../math/point';
 import {logger} from '../utils/logger';
 import {defaults} from '../app/defaults';
-import {DRAW_DEBUG, getDefaultAnchor} from './drawBounds';
+import {
+  isNodeNameShape,
+  DRAW_DEBUG,
+  getDefaultAnchor
+} from './drawBounds';
 import {LabelFactory} from './labelFactory';
 
 // external
@@ -296,12 +300,7 @@ export class RectangleFactory {
    * @param {Konva.Group} group The shape group.
    */
   updateConnector(group) {
-    const kshape = group.getChildren(function (node) {
-      return node.name() === 'shape';
-    })[0];
-    if (!(kshape instanceof Konva.Rect)) {
-      return;
-    }
+    const kshape = this.#getShape(group);
     const connectorsPos = this.#getConnectorsPositions(kshape);
     this.#labelFactory.updateConnector(group, connectorsPos);
   }
@@ -347,6 +346,20 @@ export class RectangleFactory {
     });
   }
 
+  /**
+   * Get the associated shape from a group.
+   *
+   * @param {Konva.Group} group The group to look into.
+   * @returns {Konva.Rect|undefined} The shape.
+   */
+  #getShape(group) {
+    const kshape = group.getChildren(isNodeNameShape)[0];
+    if (!(kshape instanceof Konva.Rect)) {
+      return;
+    }
+    return kshape;
+  }
+
   /**
    * Get the default annotation label position.
    *
@@ -378,12 +391,7 @@ export class RectangleFactory {
       return;
     }
     // associated shape
-    const krect = group.getChildren(function (node) {
-      return node.name() === 'shape';
-    })[0];
-    if (!(krect instanceof Konva.Rect)) {
-      return;
-    }
+    const krect = this.#getShape(group);
     // update shape
     krect.position({
       x: begin.getX(),