@inweb/markup 27.1.7 → 27.1.9

package/lib/index.d.ts

@@ -1,12 +1,12 @@
 export { IMarkup, MarkupMode } from "./markup/IMarkup";
-export { IMarkupArrow, IMarkupArrowParams } from "./markup/IMarkupArrow";
-export { IMarkupCloud, IMarkupCloudParams } from "./markup/IMarkupCloud";
-export { IMarkupColorable } from "./markup/IMarkupColorable";
-export { IMarkupEllipse, IMarkupEllipseParams } from "./markup/IMarkupEllipse";
-export { IMarkupImage, IMarkupImageParams } from "./markup/IMarkupImage";
-export { IMarkupLine, IMarkupLineParams, MarkupLineType } from "./markup/IMarkupLine";
 export { IMarkupObject } from "./markup/IMarkupObject";
-export { IMarkupRectangle, IMarkupRectangleParams } from "./markup/IMarkupRectangle";
-export { IMarkupText, IMarkupTextParams } from "./markup/IMarkupText";
+export { IMarkupArrow, IMarkupArrowParams } from "./markup/primitives/IMarkupArrow";
+export { IMarkupCloud, IMarkupCloudParams } from "./markup/primitives/IMarkupCloud";
+export { IMarkupEllipse, IMarkupEllipseParams } from "./markup/primitives/IMarkupEllipse";
+export { IMarkupImage, IMarkupImageParams } from "./markup/primitives/IMarkupImage";
+export { IMarkupLine, IMarkupLineParams, MarkupLineType } from "./markup/primitives/IMarkupLine";
+export { IMarkupRectangle, IMarkupRectangleParams } from "./markup/primitives/IMarkupRectangle";
+export { IMarkupText, IMarkupTextParams } from "./markup/primitives/IMarkupText";
+export { IMarkupColorable } from "./markup/IMarkupColorable";
 export { IWorldTransform } from "./markup/IWorldTransform";
 export { KonvaMarkup as Markup } from "./markup/Konva/KonvaMarkup";

package/lib/markup/Konva/KonvaMarkup.d.ts

@@ -3,7 +3,7 @@ import { ChangeActiveDraggerEvent, IViewpoint } from "@inweb/viewer-core";
 import { IMarkup, MarkupMode } from "../IMarkup";
 import { IWorldTransform } from "../IWorldTransform";
 import { IMarkupObject } from "../IMarkupObject";
-import { MarkupLineType } from "../IMarkupLine";
+import { MarkupLineType } from "../primitives/IMarkupLine";
 /**
  * 2D markup core.
  */

package/lib/markup/Konva/{KonvaArrow.d.ts → primitives/KonvaArrow.d.ts}

@@ -1,5 +1,5 @@
-import { IMarkupArrow, IMarkupArrowParams } from "../IMarkupArrow";
-import { WorldTransform } from "../WorldTransform";
+import { IMarkupArrow, IMarkupArrowParams } from "../../primitives/IMarkupArrow";
+import { WorldTransform } from "../../WorldTransform";
 export declare class KonvaArrow implements IMarkupArrow {
     private _ref;
     private _worldTransformer;

package/lib/markup/Konva/{KonvaCloud.d.ts → primitives/KonvaCloud.d.ts}

@@ -1,5 +1,5 @@
-import { IMarkupCloud, IMarkupCloudParams } from "../IMarkupCloud";
-import { WorldTransform } from "../WorldTransform";
+import { IMarkupCloud, IMarkupCloudParams } from "../../primitives/IMarkupCloud";
+import { WorldTransform } from "../../WorldTransform";
 export declare class KonvaCloud implements IMarkupCloud {
     private _ref;
     private _worldTransformer;

package/lib/markup/Konva/{KonvaEllipse.d.ts → primitives/KonvaEllipse.d.ts}

@@ -1,5 +1,5 @@
-import { IMarkupEllipse, IMarkupEllipseParams } from "../IMarkupEllipse";
-import { WorldTransform } from "../WorldTransform";
+import { IMarkupEllipse, IMarkupEllipseParams } from "../../primitives/IMarkupEllipse";
+import { WorldTransform } from "../../WorldTransform";
 export declare class KonvaEllipse implements IMarkupEllipse {
     private _ref;
     private _worldTransformer;

package/lib/markup/Konva/{KonvaImage.d.ts → primitives/KonvaImage.d.ts}

@@ -1,5 +1,5 @@
-import { IMarkupImage, IMarkupImageParams } from "../IMarkupImage";
-import { WorldTransform } from "../WorldTransform";
+import { IMarkupImage, IMarkupImageParams } from "../../primitives/IMarkupImage";
+import { WorldTransform } from "../../WorldTransform";
 export declare class KonvaImage implements IMarkupImage {
     private _ref;
     private _canvasImage;

package/lib/markup/Konva/{KonvaLine.d.ts → primitives/KonvaLine.d.ts}

@@ -1,5 +1,5 @@
-import { IMarkupLine, IMarkupLineParams } from "../IMarkupLine";
-import { WorldTransform } from "../WorldTransform";
+import { IMarkupLine, IMarkupLineParams } from "../../primitives/IMarkupLine";
+import { WorldTransform } from "../../WorldTransform";
 export declare class KonvaLine implements IMarkupLine {
     private _ref;
     private _worldTransformer;

package/lib/markup/Konva/{KonvaRectangle.d.ts → primitives/KonvaRectangle.d.ts}

@@ -1,5 +1,5 @@
-import { IMarkupRectangle, IMarkupRectangleParams } from "../IMarkupRectangle";
-import { WorldTransform } from "../WorldTransform";
+import { IMarkupRectangle, IMarkupRectangleParams } from "../../primitives/IMarkupRectangle";
+import { WorldTransform } from "../../WorldTransform";
 export declare class KonvaRectangle implements IMarkupRectangle {
     private _ref;
     private _worldTransformer;

package/lib/markup/Konva/{KonvaText.d.ts → primitives/KonvaText.d.ts}

@@ -1,5 +1,5 @@
-import { IMarkupText, IMarkupTextParams } from "../IMarkupText";
-import { WorldTransform } from "../WorldTransform";
+import { IMarkupText, IMarkupTextParams } from "../../primitives/IMarkupText";
+import { WorldTransform } from "../../WorldTransform";
 export declare class KonvaText implements IMarkupText {
     private _ref;
     private _worldTransformer;

package/lib/markup/{IMarkupArrow.d.ts → primitives/IMarkupArrow.d.ts}

@@ -1,5 +1,5 @@
-import { IMarkupObject } from "./IMarkupObject";
-import { IMarkupColorable } from "./IMarkupColorable";
+import { IMarkupObject } from "../IMarkupObject";
+import { IMarkupColorable } from "../IMarkupColorable";
 /**
  * 2D markup Arrow object interface.
  */

package/lib/markup/{IMarkupCloud.d.ts → primitives/IMarkupCloud.d.ts}

@@ -1,5 +1,5 @@
-import { IMarkupObject } from "./IMarkupObject";
-import { IMarkupColorable } from "./IMarkupColorable";
+import { IMarkupObject } from "../IMarkupObject";
+import { IMarkupColorable } from "../IMarkupColorable";
 /**
  * 2D markup Cloud object interface.
  */

package/lib/markup/{IMarkupEllipse.d.ts → primitives/IMarkupEllipse.d.ts}

@@ -1,5 +1,5 @@
-import { IMarkupObject } from "./IMarkupObject";
-import { IMarkupColorable } from "./IMarkupColorable";
+import { IMarkupObject } from "../IMarkupObject";
+import { IMarkupColorable } from "../IMarkupColorable";
 /**
  * 2D markup Ellipse object interface.
  */

package/lib/markup/{IMarkupImage.d.ts → primitives/IMarkupImage.d.ts}

@@ -1,4 +1,4 @@
-import { IMarkupObject } from "./IMarkupObject";
+import { IMarkupObject } from "../IMarkupObject";
 /**
  * 2D markup Image object interface.
  */
@@ -70,15 +70,15 @@ export interface IMarkupImageParams {
      */
     src?: string;
     /**
-     * Deprecated. Width of the image. The original image is scaled to this width. Specify 0 to set width
-     * of the source image. Ignored if {@link position2} is defined.
+     * Width of the image. The original image is scaled to this width. Specify 0 to set width of the source
+     * image. Ignored if {@link position2} is defined.
      *
      * @default 0
      */
     width?: number;
     /**
-     * Deprecated. Height of the image. The original image is scaled to this height. Specify 0 to set
-     * height of the source image. Ignored if {@link position2} is defined.
+     * Height of the image. The original image is scaled to this height. Specify 0 to set height of the
+     * source image. Ignored if {@link position2} is defined.
      *
      * @default 0
      */

package/lib/markup/{IMarkupLine.d.ts → primitives/IMarkupLine.d.ts}

@@ -1,5 +1,5 @@
-import { IMarkupObject } from "./IMarkupObject";
-import { IMarkupColorable } from "./IMarkupColorable";
+import { IMarkupObject } from "../IMarkupObject";
+import { IMarkupColorable } from "../IMarkupColorable";
 /**
  * Defines the type of the markup line.
  */

package/lib/markup/{IMarkupRectangle.d.ts → primitives/IMarkupRectangle.d.ts}

@@ -1,5 +1,5 @@
-import { IMarkupObject } from "./IMarkupObject";
-import { IMarkupColorable } from "./IMarkupColorable";
+import { IMarkupObject } from "../IMarkupObject";
+import { IMarkupColorable } from "../IMarkupColorable";
 /**
  * 2D markup Rectangle object interface.
  */

package/lib/markup/{IMarkupText.d.ts → primitives/IMarkupText.d.ts}

@@ -1,5 +1,5 @@
-import { IMarkupObject } from "./IMarkupObject";
-import { IMarkupColorable } from "./IMarkupColorable";
+import { IMarkupObject } from "../IMarkupObject";
+import { IMarkupColorable } from "../IMarkupColorable";
 /**
  * 2D markup Text object interface.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/markup",
-  "version": "27.1.7",
+  "version": "27.1.9",
   "description": "JavaScript 2D markups",
   "homepage": "https://cloud.opendesign.com/docs/index.html",
   "license": "SEE LICENSE IN LICENSE",
@@ -26,8 +26,8 @@
     "docs": "typedoc"
   },
   "dependencies": {
-    "@inweb/eventemitter2": "~27.1.7",
-    "@inweb/viewer-core": "~27.1.7"
+    "@inweb/eventemitter2": "~27.1.9",
+    "@inweb/viewer-core": "~27.1.9"
   },
   "devDependencies": {
     "konva": "^10.2.0"

package/src/index.ts

@@ -22,14 +22,14 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 export { IMarkup, MarkupMode } from "./markup/IMarkup";
-export { IMarkupArrow, IMarkupArrowParams } from "./markup/IMarkupArrow";
-export { IMarkupCloud, IMarkupCloudParams } from "./markup/IMarkupCloud";
-export { IMarkupColorable } from "./markup/IMarkupColorable";
-export { IMarkupEllipse, IMarkupEllipseParams } from "./markup/IMarkupEllipse";
-export { IMarkupImage, IMarkupImageParams } from "./markup/IMarkupImage";
-export { IMarkupLine, IMarkupLineParams, MarkupLineType } from "./markup/IMarkupLine";
 export { IMarkupObject } from "./markup/IMarkupObject";
-export { IMarkupRectangle, IMarkupRectangleParams } from "./markup/IMarkupRectangle";
-export { IMarkupText, IMarkupTextParams } from "./markup/IMarkupText";
+export { IMarkupArrow, IMarkupArrowParams } from "./markup/primitives/IMarkupArrow";
+export { IMarkupCloud, IMarkupCloudParams } from "./markup/primitives/IMarkupCloud";
+export { IMarkupEllipse, IMarkupEllipseParams } from "./markup/primitives/IMarkupEllipse";
+export { IMarkupImage, IMarkupImageParams } from "./markup/primitives/IMarkupImage";
+export { IMarkupLine, IMarkupLineParams, MarkupLineType } from "./markup/primitives/IMarkupLine";
+export { IMarkupRectangle, IMarkupRectangleParams } from "./markup/primitives/IMarkupRectangle";
+export { IMarkupText, IMarkupTextParams } from "./markup/primitives/IMarkupText";
+export { IMarkupColorable } from "./markup/IMarkupColorable";
 export { IWorldTransform } from "./markup/IWorldTransform";
 export { KonvaMarkup as Markup } from "./markup/Konva/KonvaMarkup";

package/src/markup/Konva/KonvaMarkup.ts

@@ -39,15 +39,15 @@ import { IMarkup, MarkupMode } from "../IMarkup";
 import { IWorldTransform } from "../IWorldTransform";
 import { WorldTransform } from "../WorldTransform";
 import { IMarkupObject } from "../IMarkupObject";
-import { MarkupLineType } from "../IMarkupLine";
+import { MarkupLineType } from "../primitives/IMarkupLine";
 import { MarkupColor } from "./MarkupColor";
-import { KonvaLine } from "./KonvaLine";
-import { KonvaText } from "./KonvaText";
-import { KonvaRectangle } from "./KonvaRectangle";
-import { KonvaEllipse } from "./KonvaEllipse";
-import { KonvaArrow } from "./KonvaArrow";
-import { KonvaImage } from "./KonvaImage";
-import { KonvaCloud } from "./KonvaCloud";
+import { KonvaLine } from "./primitives/KonvaLine";
+import { KonvaText } from "./primitives/KonvaText";
+import { KonvaRectangle } from "./primitives/KonvaRectangle";
+import { KonvaEllipse } from "./primitives/KonvaEllipse";
+import { KonvaArrow } from "./primitives/KonvaArrow";
+import { KonvaImage } from "./primitives/KonvaImage";
+import { KonvaCloud } from "./primitives/KonvaCloud";
 
 const MarkupMode2Konva = {
   SelectMarkup: {
@@ -384,8 +384,21 @@ export class KonvaMarkup implements IMarkup {
   getSelectedObjects(): IMarkupObject[] {
     if (!this._konvaTransformer) return [];
 
-    return this._konvaTransformer
-      .nodes()
+    // Clean up transformer nodes - remove any destroyed nodes
+    const validNodes = this._konvaTransformer.nodes().filter((ref) => {
+      try {
+        return ref.getLayer() !== null && ref.getParent() !== null;
+      } catch {
+        return false;
+      }
+    });
+
+    // Update transformer if any nodes were removed
+    if (validNodes.length !== this._konvaTransformer.nodes().length) {
+      this._konvaTransformer.nodes(validNodes);
+    }
+
+    return validNodes
       .map((ref) => {
         const name = ref.className;
         const konvaShape = Object.values(MarkupMode2Konva).find((shape) => shape.name === name);

package/src/markup/Konva/{KonvaArrow.ts → primitives/KonvaArrow.ts}

@@ -22,9 +22,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 import Konva from "konva";
-import { IMarkupArrow, IMarkupArrowParams } from "../IMarkupArrow";
-import { IWorldTransform } from "../IWorldTransform";
-import { WorldTransform } from "../WorldTransform";
+import { IMarkupArrow, IMarkupArrowParams } from "../../primitives/IMarkupArrow";
+import { IWorldTransform } from "../../IWorldTransform";
+import { WorldTransform } from "../../WorldTransform";
 
 export class KonvaArrow implements IMarkupArrow {
   private _ref: Konva.Arrow;

package/src/markup/Konva/{KonvaCloud.ts → primitives/KonvaCloud.ts}

@@ -22,9 +22,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 import Konva from "konva";
-import { IMarkupCloud, IMarkupCloudParams } from "../IMarkupCloud";
-import { IWorldTransform } from "../IWorldTransform";
-import { WorldTransform } from "../WorldTransform";
+import { IMarkupCloud, IMarkupCloudParams } from "../../primitives/IMarkupCloud";
+import { IWorldTransform } from "../../IWorldTransform";
+import { WorldTransform } from "../../WorldTransform";
 
 export class KonvaCloud implements IMarkupCloud {
   private _ref: Konva.Shape;

package/src/markup/Konva/{KonvaEllipse.ts → primitives/KonvaEllipse.ts}

@@ -22,10 +22,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 import Konva from "konva";
-import { IMarkupEllipse, IMarkupEllipseParams } from "../IMarkupEllipse";
-import { IWorldTransform } from "../IWorldTransform";
-import { WorldTransform } from "../WorldTransform";
-import * as utils from "../Utils";
+import { IMarkupEllipse, IMarkupEllipseParams } from "../../primitives/IMarkupEllipse";
+import { IWorldTransform } from "../../IWorldTransform";
+import { WorldTransform } from "../../WorldTransform";
+import * as utils from "../../Utils";
 
 export class KonvaEllipse implements IMarkupEllipse {
   private _ref: Konva.Ellipse;

package/src/markup/Konva/{KonvaImage.ts → primitives/KonvaImage.ts}

@@ -22,9 +22,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 import Konva from "konva";
-import { IMarkupImage, IMarkupImageParams } from "../IMarkupImage";
-import { IWorldTransform } from "../IWorldTransform";
-import { WorldTransform } from "../WorldTransform";
+import { IMarkupImage, IMarkupImageParams } from "../../primitives/IMarkupImage";
+import { IWorldTransform } from "../../IWorldTransform";
+import { WorldTransform } from "../../WorldTransform";
 
 export class KonvaImage implements IMarkupImage {
   private _ref: Konva.Image;

package/src/markup/Konva/{KonvaLine.ts → primitives/KonvaLine.ts}

@@ -22,9 +22,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 import Konva from "konva";
-import { IMarkupLine, IMarkupLineParams, MarkupLineType } from "../IMarkupLine";
-import { IWorldTransform } from "../IWorldTransform";
-import { WorldTransform } from "../WorldTransform";
+import { IMarkupLine, IMarkupLineParams, MarkupLineType } from "../../primitives/IMarkupLine";
+import { IWorldTransform } from "../../IWorldTransform";
+import { WorldTransform } from "../../WorldTransform";
 
 const LineTypeSpecs = new Map<string, number[]>([
   ["solid", []],

package/src/markup/Konva/{KonvaRectangle.ts → primitives/KonvaRectangle.ts}

@@ -22,9 +22,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 import Konva from "konva";
-import { IMarkupRectangle, IMarkupRectangleParams } from "../IMarkupRectangle";
-import { IWorldTransform } from "../IWorldTransform";
-import { WorldTransform } from "../WorldTransform";
+import { IMarkupRectangle, IMarkupRectangleParams } from "../../primitives/IMarkupRectangle";
+import { IWorldTransform } from "../../IWorldTransform";
+import { WorldTransform } from "../../WorldTransform";
 
 export class KonvaRectangle implements IMarkupRectangle {
   private _ref: Konva.Rect;

package/src/markup/Konva/{KonvaText.ts → primitives/KonvaText.ts}

@@ -22,9 +22,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 import Konva from "konva";
-import { IMarkupText, IMarkupTextParams } from "../IMarkupText";
-import { IWorldTransform } from "../IWorldTransform";
-import { WorldTransform } from "../WorldTransform";
+import { IMarkupText, IMarkupTextParams } from "../../primitives/IMarkupText";
+import { IWorldTransform } from "../../IWorldTransform";
+import { WorldTransform } from "../../WorldTransform";
 
 export class KonvaText implements IMarkupText {
   private _ref: Konva.Text;

package/src/markup/{IMarkupArrow.ts → primitives/IMarkupArrow.ts}

@@ -21,8 +21,8 @@
 // acknowledge and accept the above terms.
 ///////////////////////////////////////////////////////////////////////////////
 
-import { IMarkupObject } from "./IMarkupObject";
-import { IMarkupColorable } from "./IMarkupColorable";
+import { IMarkupObject } from "../IMarkupObject";
+import { IMarkupColorable } from "../IMarkupColorable";
 
 /**
  * 2D markup Arrow object interface.

package/src/markup/{IMarkupCloud.ts → primitives/IMarkupCloud.ts}

@@ -21,8 +21,8 @@
 // acknowledge and accept the above terms.
 ///////////////////////////////////////////////////////////////////////////////
 
-import { IMarkupObject } from "./IMarkupObject";
-import { IMarkupColorable } from "./IMarkupColorable";
+import { IMarkupObject } from "../IMarkupObject";
+import { IMarkupColorable } from "../IMarkupColorable";
 
 /**
  * 2D markup Cloud object interface.

package/src/markup/{IMarkupEllipse.ts → primitives/IMarkupEllipse.ts}

@@ -21,8 +21,8 @@
 // acknowledge and accept the above terms.
 ///////////////////////////////////////////////////////////////////////////////
 
-import { IMarkupObject } from "./IMarkupObject";
-import { IMarkupColorable } from "./IMarkupColorable";
+import { IMarkupObject } from "../IMarkupObject";
+import { IMarkupColorable } from "../IMarkupColorable";
 
 /**
  * 2D markup Ellipse object interface.

package/src/markup/{IMarkupImage.ts → primitives/IMarkupImage.ts}

@@ -21,7 +21,7 @@
 // acknowledge and accept the above terms.
 ///////////////////////////////////////////////////////////////////////////////
 
-import { IMarkupObject } from "./IMarkupObject";
+import { IMarkupObject } from "../IMarkupObject";
 
 /**
  * 2D markup Image object interface.
@@ -96,16 +96,16 @@ export interface IMarkupImageParams {
   src?: string;
 
   /**
-   * Deprecated. Width of the image. The original image is scaled to this width. Specify 0 to set width
-   * of the source image. Ignored if {@link position2} is defined.
+   * Width of the image. The original image is scaled to this width. Specify 0 to set width of the source
+   * image. Ignored if {@link position2} is defined.
    *
    * @default 0
    */
   width?: number;
 
   /**
-   * Deprecated. Height of the image. The original image is scaled to this height. Specify 0 to set
-   * height of the source image. Ignored if {@link position2} is defined.
+   * Height of the image. The original image is scaled to this height. Specify 0 to set height of the
+   * source image. Ignored if {@link position2} is defined.
    *
    * @default 0
    */

package/src/markup/{IMarkupLine.ts → primitives/IMarkupLine.ts}

@@ -21,8 +21,8 @@
 // acknowledge and accept the above terms.
 ///////////////////////////////////////////////////////////////////////////////
 
-import { IMarkupObject } from "./IMarkupObject";
-import { IMarkupColorable } from "./IMarkupColorable";
+import { IMarkupObject } from "../IMarkupObject";
+import { IMarkupColorable } from "../IMarkupColorable";
 
 /**
  * Defines the type of the markup line.

package/src/markup/{IMarkupRectangle.ts → primitives/IMarkupRectangle.ts}

@@ -21,8 +21,8 @@
 // acknowledge and accept the above terms.
 ///////////////////////////////////////////////////////////////////////////////
 
-import { IMarkupObject } from "./IMarkupObject";
-import { IMarkupColorable } from "./IMarkupColorable";
+import { IMarkupObject } from "../IMarkupObject";
+import { IMarkupColorable } from "../IMarkupColorable";
 
 /**
  * 2D markup Rectangle object interface.

package/src/markup/{IMarkupText.ts → primitives/IMarkupText.ts}

@@ -21,8 +21,8 @@
 // acknowledge and accept the above terms.
 ///////////////////////////////////////////////////////////////////////////////
 
-import { IMarkupObject } from "./IMarkupObject";
-import { IMarkupColorable } from "./IMarkupColorable";
+import { IMarkupObject } from "../IMarkupObject";
+import { IMarkupColorable } from "../IMarkupColorable";
 
 /**
  * 2D markup Text object interface.