plotboilerplate 1.14.0 → 1.17.0

package/src/ts/PBImage.ts

@@ -4,20 +4,20 @@
  * @modified 2019-03-23 Added JSDoc tags.
  * @modified 2020-03-25 Ported this class from vanilla-JS to Typescript.
  * @modified 2021-01-20 Added UID.
- * @version 1.1.0
+ * @modified 2022-02-02 Added the `destroy` method.
+ * @modified 2022-02-02 Cleared the `PBImage.toSVGString` function (deprecated). Use `drawutilssvg` instead.
+ * @version 1.2.0
  *
  * @file PBImage
- * @fileoverview As native Image objects have only a position and with 
+ * @fileoverview As native Image objects have only a position and with
  *               and height thei are not suitable for UI dragging interfaces.
  * @public
  **/
 
-
 import { Vertex } from "./Vertex";
 import { UIDGenerator } from "./UIDGenerator";
 import { SVGSerializable, UID } from "./interfaces";
 
-
 /**
  * @classdesc A wrapper for image objects. Has an upper left and a lower right corner point.
  *
@@ -27,76 +27,74 @@ import { SVGSerializable, UID } from "./interfaces";
  * @requires UIDGenerator
  */
 export class PBImage implements SVGSerializable {
+  /**
+   * Required to generate proper CSS classes and other class related IDs.
+   **/
+  readonly className: string = "PBImage";
 
+  /**
+   * The UID of this drawable object.
+   *
+   * @member {UID}
+   * @memberof PBImage
+   * @instance
+   * @readonly
+   */
+  readonly uid: UID;
 
-    /**
-     * Required to generate proper CSS classes and other class related IDs.
-     **/
-    readonly className : string = "PBImage";
-
+  /**
+   * @member {Vertex}
+   * @memberof PBImage
+   * @instance
+   */
+  image: HTMLImageElement;
 
-    /**
-     * The UID of this drawable object.
-     *
-     * @member {UID}
-     * @memberof PBImage
-     * @instance
-     * @readonly 
-     */
-    readonly uid : UID;
-    
+  /**
+   * @member {Vertex}
+   * @memberof PBImage
+   * @instance
+   */
+  upperLeft: Vertex;
 
-    /** 
-     * @member {Vertex} 
-     * @memberof PBImage
-     * @instance
-     */
-    image:HTMLImageElement;
+  /**
+   * @member {Vertex}
+   * @memberof PBImage
+   * @instance
+   */
+  lowerRight: Vertex;
 
-    /** 
-     * @member {Vertex} 
-     * @memberof PBImage
-     * @instance
-     */
-    upperLeft:Vertex;
+  /**
+   * @member isDestroyed
+   * @memberof PBImage
+   * @type {boolean}
+   * @instance
+   */
+  isDestroyed: boolean;
 
-    /** 
-     * @member {Vertex} 
-     * @memberof PBImage
-     * @instance
-     */
-    lowerRight:Vertex;
-    
-    
-    /**
-     * The constructor.
-     * 
-     * @constructor
-     * @name PBImage
-     * @param {Image} image - The actual image.
-     * @param {Vertex} upperLeft - The upper left corner.
-     * @param {Vertex} lowerRight - The lower right corner.
-     **/
-    constructor( image:HTMLImageElement, upperLeft:Vertex, lowerRight:Vertex ) {
-	this.uid = UIDGenerator.next();
-	this.image = image;
-	this.upperLeft = upperLeft;
-	this.lowerRight = lowerRight;
-    };
+  /**
+   * The constructor.
+   *
+   * @constructor
+   * @name PBImage
+   * @param {Image} image - The actual image.
+   * @param {Vertex} upperLeft - The upper left corner.
+   * @param {Vertex} lowerRight - The lower right corner.
+   **/
+  constructor(image: HTMLImageElement, upperLeft: Vertex, lowerRight: Vertex) {
+    this.uid = UIDGenerator.next();
+    this.image = image;
+    this.upperLeft = upperLeft;
+    this.lowerRight = lowerRight;
+  }
 
-    
-    /**
-     * Convert this vertex to SVG code.
-     *
-     * @deprecated DEPRECATION Please use the drawutilssvg library and an XMLSerializer instead.
-     * @method toSVGString
-     * @param {object=} options - An optional set of options, like 'className'.
-     * @return {string} A string representing the SVG code for this vertex.
-     * @instance
-     * @memberof PBImage
-     **/
-    toSVGString( options:{ className?:string } ) : string {
-	console.warn( "PBImage is not yet SVG serializable. Returning empty SVG string." );
-	return "";
-    };
+  /**
+   * This function should invalidate any installed listeners and invalidate this object.
+   * After calling this function the object might not hold valid data any more and
+   * should not be used.
+   */
+  destroy() {
+    this.upperLeft.destroy();
+    this.lowerRight.destroy();
+    this.isDestroyed = true;
+  }
 }

package/src/ts/PBText.ts

@@ -1,7 +1,8 @@
 /**
  * @author   Ikaros Kappler
  * @date     2021-11-16
- * @version  1.0.0
+ * @modified 2022-02-02 Added the `destroy` method.
+ * @version  1.1.0
  **/
 
 import { UIDGenerator } from "./UIDGenerator";
@@ -106,6 +107,14 @@ export class PBText implements SVGSerializable, FontOptions {
    */
   color: string | undefined;
 
+  /**
+   * @member isDestroyed
+   * @memberof PBText
+   * @type {boolean}
+   * @instance
+   */
+  isDestroyed: boolean;
+
   /**
    * Create a new circle with given center point and radius.
    *
@@ -129,19 +138,12 @@ export class PBText implements SVGSerializable, FontOptions {
   }
 
   /**
-   * Create an SVG representation of this circle.
-   *
-   * @deprecated DEPRECATION Please use the drawutilssvg library and an XMLSerializer instead.
-   * @method toSVGString
-   * @param {object=} options - An optional set of options, like 'className'.
-   * @return {string} A string representing the SVG code for this vertex.
-   * @instance
-   * @memberof Circle
+   * This function should invalidate any installed listeners and invalidate this object.
+   * After calling this function the object might not hold valid data any more and
+   * should not be used.
    */
-  toSVGString(options: { className?: string }) {
-    console.warn(
-      "[PBText.toSVGString()] This function is not implemented as it defines a deprecated method. Use the 'drawutilssvg.text()' method instead."
-    );
-    return "";
+  destroy() {
+    this.anchor.destroy();
+    this.isDestroyed = true;
   }
 } // END class

package/src/ts/PlotBoilerplate.ts

@@ -897,7 +897,7 @@ export class PlotBoilerplate {
       }
     }
     for (var i = 0; i < this.drawables.length; i++) {
-      if (this.drawables[i] === drawable) {
+      if (this.drawables[i] === drawable || this.drawables[i].uid === drawable.uid) {
         this.drawables.splice(i, 1);
 
         if (removeWithVertices) {
@@ -1006,7 +1006,9 @@ export class PlotBoilerplate {
       this.transformMousePosition(pixelPosition.x, pixelPosition.y),
       pixelTolerance / Math.min(this.config.cssScaleX, this.config.cssScaleY)
     );
-    if (p && p.typeName == "vertex") return this.vertices[p.vindex];
+    if (p && p.typeName == "vertex") {
+      return this.vertices[p.vindex];
+    }
     return undefined;
   }