@inweb/markup 25.7.4 → 25.7.6

package/lib/markup/IMarkup.d.ts

@@ -3,19 +3,9 @@ import { IViewpoint } from "@inweb/viewer-core";
 import { IWorldTransform } from "./IWorldTransform";
 import { IMarkupObject } from "./IMarkupObject";
 /**
- * Defines type of markup object. For `VisualizeJS` markup only the `Line` and `Text` markup
- * objects are supported.
+ * Markup edit mode. Matches the type of markup object being created or object selecting mode.
  */
-export declare enum MarkupMode {
-    SelectMarkup = "SelectMarkup",
-    Line = "Line",
-    Text = "Text",
-    Rectangle = "Rectangle",
-    Ellipse = "Ellipse",
-    Arrow = "Arrow",
-    Image = "Image",
-    Cloud = "Cloud"
-}
+export type MarkupMode = "SelectMarkup" | "Line" | "Text" | "Rectangle" | "Ellipse" | "Arrow" | "Image" | "Cloud";
 /**
  * 2D markup core interface.
  */

package/lib/markup/IMarkupArrow.d.ts

@@ -1,8 +1,9 @@
 import { IMarkupObject } from "./IMarkupObject";
+import { IMarkupColorable } from "./IMarkupColorable";
 /**
  * Arrow Markup object
  */
-export interface IMarkupArrow extends IMarkupObject {
+export interface IMarkupArrow extends IMarkupObject, IMarkupColorable {
     /**
      * Get points of current Arrow
      *

package/lib/markup/IMarkupCloud.d.ts

@@ -1,8 +1,9 @@
 import { IMarkupObject } from "./IMarkupObject";
+import { IMarkupColorable } from "./IMarkupColorable";
 /**
  * Cloud Markup object
  */
-export interface IMarkupCloud extends IMarkupObject {
+export interface IMarkupCloud extends IMarkupObject, IMarkupColorable {
     /**
      * Get position of the Cloud
      */

package/lib/markup/IMarkupEllipse.d.ts

@@ -1,8 +1,9 @@
 import { IMarkupObject } from "./IMarkupObject";
+import { IMarkupColorable } from "./IMarkupColorable";
 /**
  * Ellipse Markup object
  */
-export interface IMarkupEllipse extends IMarkupObject {
+export interface IMarkupEllipse extends IMarkupObject, IMarkupColorable {
     /**
      * Get position of the Ellipse
      */

package/lib/markup/IMarkupLine.d.ts

@@ -1,4 +1,5 @@
 import { IMarkupObject } from "./IMarkupObject";
+import { IMarkupColorable } from "./IMarkupColorable";
 /**
  * Type of the markup line.
  */
@@ -6,7 +7,7 @@ export type MarkupLineType = "solid" | "dot" | "dash";
 /**
  * Line Markup object
  */
-export interface IMarkupLine extends IMarkupObject {
+export interface IMarkupLine extends IMarkupObject, IMarkupColorable {
     /**
      * Get points of the Line
      */

package/lib/markup/IMarkupRectangle.d.ts

@@ -1,8 +1,9 @@
 import { IMarkupObject } from "./IMarkupObject";
+import { IMarkupColorable } from "./IMarkupColorable";
 /**
  * Rectangle Markup object
  */
-export interface IMarkupRectangle extends IMarkupObject {
+export interface IMarkupRectangle extends IMarkupObject, IMarkupColorable {
     /**
      * Get position of the Rectangle
      */

package/lib/markup/IMarkupText.d.ts

@@ -1,8 +1,9 @@
 import { IMarkupObject } from "./IMarkupObject";
+import { IMarkupColorable } from "./IMarkupColorable";
 /**
  * Text Markup object
  */
-export interface IMarkupText extends IMarkupObject {
+export interface IMarkupText extends IMarkupObject, IMarkupColorable {
     /**
      * Get Text value
      */

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

@@ -1,6 +1,5 @@
 import { IMarkupArrow } from "../IMarkupArrow";
-import { IMarkupColorable } from "../IMarkupColorable";
-export declare class KonvaArrow implements IMarkupArrow, IMarkupColorable {
+export declare class KonvaArrow implements IMarkupArrow {
     private _ref;
     constructor(params: {
         start: {

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

@@ -1,6 +1,5 @@
-import { IMarkupColorable } from "../IMarkupColorable";
 import { IMarkupCloud } from "../IMarkupCloud";
-export declare class KonvaCloud implements IMarkupCloud, IMarkupColorable {
+export declare class KonvaCloud implements IMarkupCloud {
     private _ref;
     constructor(params: {
         position: {

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

@@ -1,6 +1,5 @@
 import { IMarkupEllipse } from "../IMarkupEllipse";
-import { IMarkupColorable } from "../IMarkupColorable";
-export declare class KonvaEllipse implements IMarkupEllipse, IMarkupColorable {
+export declare class KonvaEllipse implements IMarkupEllipse {
     private _ref;
     constructor(params: {
         position: {

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

@@ -1,6 +1,5 @@
 import { IMarkupLine, MarkupLineType } from "../IMarkupLine";
-import { IMarkupColorable } from "../IMarkupColorable";
-export declare class KonvaLine implements IMarkupLine, IMarkupColorable {
+export declare class KonvaLine implements IMarkupLine {
     private _ref;
     constructor(params: {
         points: {

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

@@ -1,6 +1,5 @@
 import { IMarkupRectangle } from "../IMarkupRectangle";
-import { IMarkupColorable } from "../IMarkupColorable";
-export declare class KonvaRectangle implements IMarkupRectangle, IMarkupColorable {
+export declare class KonvaRectangle implements IMarkupRectangle {
     private _ref;
     constructor(params: {
         position: {

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

@@ -1,6 +1,5 @@
 import { IMarkupText } from "../IMarkupText";
-import { IMarkupColorable } from "../IMarkupColorable";
-export declare class KonvaText implements IMarkupText, IMarkupColorable {
+export declare class KonvaText implements IMarkupText {
     private _ref;
     private readonly TEXT_FONT_FAMILY;
     constructor(params: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/markup",
-  "version": "25.7.4",
+  "version": "25.7.6",
   "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": "~25.7.4",
-    "@inweb/viewer-core": "~25.7.4"
+    "@inweb/eventemitter2": "~25.7.6",
+    "@inweb/viewer-core": "~25.7.6"
   },
   "devDependencies": {
     "canvas": "^2.11.2",

package/src/markup/IMarkup.ts

@@ -27,19 +27,9 @@ import { IWorldTransform } from "./IWorldTransform";
 import { IMarkupObject } from "./IMarkupObject";
 
 /**
- * Defines type of markup object. For `VisualizeJS` markup only the `Line` and `Text` markup
- * objects are supported.
+ * Markup edit mode. Matches the type of markup object being created or object selecting mode.
  */
-export enum MarkupMode {
-  SelectMarkup = "SelectMarkup",
-  Line = "Line",
-  Text = "Text",
-  Rectangle = "Rectangle",
-  Ellipse = "Ellipse",
-  Arrow = "Arrow",
-  Image = "Image",
-  Cloud = "Cloud",
-}
+export type MarkupMode = "SelectMarkup" | "Line" | "Text" | "Rectangle" | "Ellipse" | "Arrow" | "Image" | "Cloud";
 
 /**
  * 2D markup core interface.

package/src/markup/IMarkupArrow.ts

@@ -22,11 +22,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 import { IMarkupObject } from "./IMarkupObject";
+import { IMarkupColorable } from "./IMarkupColorable";
 
 /**
  * Arrow Markup object
  */
-export interface IMarkupArrow extends IMarkupObject {
+export interface IMarkupArrow extends IMarkupObject, IMarkupColorable {
   /**
    * Get points of current Arrow
    *

package/src/markup/IMarkupCloud.ts

@@ -22,11 +22,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 import { IMarkupObject } from "./IMarkupObject";
+import { IMarkupColorable } from "./IMarkupColorable";
 
 /**
  * Cloud Markup object
  */
-export interface IMarkupCloud extends IMarkupObject {
+export interface IMarkupCloud extends IMarkupObject, IMarkupColorable {
   /**
    * Get position of the Cloud
    */

package/src/markup/IMarkupEllipse.ts

@@ -22,11 +22,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 import { IMarkupObject } from "./IMarkupObject";
+import { IMarkupColorable } from "./IMarkupColorable";
 
 /**
  * Ellipse Markup object
  */
-export interface IMarkupEllipse extends IMarkupObject {
+export interface IMarkupEllipse extends IMarkupObject, IMarkupColorable {
   /**
    * Get position of the Ellipse
    */

package/src/markup/IMarkupLine.ts

@@ -22,6 +22,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 import { IMarkupObject } from "./IMarkupObject";
+import { IMarkupColorable } from "./IMarkupColorable";
 
 /**
  * Type of the markup line.
@@ -31,7 +32,7 @@ export type MarkupLineType = "solid" | "dot" | "dash";
 /**
  * Line Markup object
  */
-export interface IMarkupLine extends IMarkupObject {
+export interface IMarkupLine extends IMarkupObject, IMarkupColorable {
   /**
    * Get points of the Line
    */

package/src/markup/IMarkupRectangle.ts

@@ -22,11 +22,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 import { IMarkupObject } from "./IMarkupObject";
+import { IMarkupColorable } from "./IMarkupColorable";
 
 /**
  * Rectangle Markup object
  */
-export interface IMarkupRectangle extends IMarkupObject {
+export interface IMarkupRectangle extends IMarkupObject, IMarkupColorable {
   /**
    * Get position of the Rectangle
    */

package/src/markup/IMarkupText.ts

@@ -22,11 +22,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 import { IMarkupObject } from "./IMarkupObject";
+import { IMarkupColorable } from "./IMarkupColorable";
 
 /**
  * Text Markup object
  */
-export interface IMarkupText extends IMarkupObject {
+export interface IMarkupText extends IMarkupObject, IMarkupColorable {
   /**
    * Get Text value
    */

package/src/markup/Konva/KonvaArrow.ts

@@ -23,9 +23,8 @@
 
 import Konva from "konva";
 import { IMarkupArrow } from "../IMarkupArrow";
-import { IMarkupColorable } from "../IMarkupColorable";
 
-export class KonvaArrow implements IMarkupArrow, IMarkupColorable {
+export class KonvaArrow implements IMarkupArrow {
   private _ref: Konva.Arrow;
 
   constructor(

package/src/markup/Konva/KonvaCloud.ts

@@ -1,8 +1,7 @@
 import Konva from "konva";
-import { IMarkupColorable } from "../IMarkupColorable";
 import { IMarkupCloud } from "../IMarkupCloud";
 
-export class KonvaCloud implements IMarkupCloud, IMarkupColorable {
+export class KonvaCloud implements IMarkupCloud {
   private _ref: Konva.Shape;
 
   constructor(

package/src/markup/Konva/KonvaEllipse.ts

@@ -1,8 +1,7 @@
 import Konva from "konva";
 import { IMarkupEllipse } from "../IMarkupEllipse";
-import { IMarkupColorable } from "../IMarkupColorable";
 
-export class KonvaEllipse implements IMarkupEllipse, IMarkupColorable {
+export class KonvaEllipse implements IMarkupEllipse {
   private _ref: Konva.Ellipse;
 
   constructor(

package/src/markup/Konva/KonvaLine.ts

@@ -1,6 +1,5 @@
 import Konva from "konva";
 import { IMarkupLine, MarkupLineType } from "../IMarkupLine";
-import { IMarkupColorable } from "../IMarkupColorable";
 
 const LineTypeSpecs = new Map<string, number[]>([
   ["solid", []],
@@ -8,7 +7,7 @@ const LineTypeSpecs = new Map<string, number[]>([
   ["dash", [30, 30]],
 ]);
 
-export class KonvaLine implements IMarkupLine, IMarkupColorable {
+export class KonvaLine implements IMarkupLine {
   private _ref: Konva.Line;
 
   constructor(