@inweb/markup 27.3.1 → 27.4.0

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

@@ -1,5 +1,5 @@
 import { IEventEmitter } from "@inweb/eventemitter2";
-import { ChangeActiveDraggerEvent, IViewpoint } from "@inweb/viewer-core";
+import { ChangeActiveDraggerEvent, ChangeMarkupColorEvent, IViewpoint } from "@inweb/viewer-core";
 import { IMarkup, MarkupMode } from "../IMarkup";
 import { IWorldTransform } from "../IWorldTransform";
 import { IMarkupObject } from "../IMarkupObject";
@@ -37,7 +37,7 @@ export declare class KonvaMarkup implements IMarkup {
     pan: () => void;
     zoomAt: () => void;
     changeCameraMode: () => void;
-    redirectToViewer: (event: any) => void;
+    redirectToViewer: (event: ChangeMarkupColorEvent) => void;
     syncOverlay(): void;
     clearOverlay(): void;
     getMarkupColor(): {

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

@@ -15,7 +15,10 @@ export declare class KonvaCloud implements IMarkupCloud {
     getZIndex(): number;
     setZIndex(zIndex: number): void;
     delete(): void;
-    getPosition(): import("konva/lib/types").Vector2d;
+    getPosition(): {
+        x: number;
+        y: number;
+    };
     setPosition(x: number, y: number): void;
     getWidth(): number;
     setWidth(w: number): void;

package/lib/markup/primitives/IMarkupLine.d.ts

@@ -19,7 +19,7 @@ export interface IMarkupLine extends IMarkupObject, IMarkupColorable {
     /**
      * Sets the line width.
      */
-    setLineWidth(size: number): any;
+    setLineWidth(size: number): void;
     /**
      * Returns the line type. Can be `solid`, `dot` or `dash`.
      */
@@ -29,7 +29,7 @@ export interface IMarkupLine extends IMarkupObject, IMarkupColorable {
      *
      * @param type - Line type. Can be `solid`, `dot` or `dash`.
      */
-    setLineType(type: string): any;
+    setLineType(type: string): void;
     /**
      * Adds the specified points to the end of the line.
      *
@@ -38,7 +38,7 @@ export interface IMarkupLine extends IMarkupObject, IMarkupColorable {
     addPoints(points: [{
         x: number;
         y: number;
-    }]): any;
+    }]): void;
 }
 /**
  * Defines the parameters for creating a {@link IMarkupLine | markup line}.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/markup",
-  "version": "27.3.1",
+  "version": "27.4.0",
   "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.3.1",
-    "@inweb/viewer-core": "~27.3.1"
+    "@inweb/eventemitter2": "~27.4.0",
+    "@inweb/viewer-core": "~27.4.0"
   },
   "devDependencies": {
     "konva": "^10.2.0"

package/src/markup/Konva/KonvaMarkup.ts

@@ -25,6 +25,7 @@ import Konva from "konva";
 import { IEventEmitter } from "@inweb/eventemitter2";
 import {
   ChangeActiveDraggerEvent,
+  ChangeMarkupColorEvent,
   IArrow,
   ICloud,
   IEllipse,
@@ -214,7 +215,7 @@ export class KonvaMarkup implements IMarkup {
     this.clearOverlay();
   };
 
-  redirectToViewer = (event: any) => {
+  redirectToViewer = (event: ChangeMarkupColorEvent) => {
     if (this._viewer) this._viewer.emit(event);
   };
 
@@ -462,7 +463,7 @@ export class KonvaMarkup implements IMarkup {
     });
   }
 
-  private initializeKonva(): any {
+  private initializeKonva(): void {
     // first we need Konva core things: stage and layer
     const stage = new Konva.Stage({
       container: this._markupContainer,

package/src/markup/Konva/primitives/KonvaCloud.ts

@@ -96,13 +96,13 @@ export class KonvaCloud implements IMarkupCloud {
           drawCloud(ARC_RADIUS / 2, ARC_LENGTH / 2);
         else drawRectangle();
 
-        function calculateMidpoint(position) {
+        function calculateMidpoint(position: { x: number; y: number }): { x: number; y: number } {
           const midX = position.x + width / 2;
           const midY = position.y + height / 2;
           return { x: midX, y: midY };
         }
 
-        function drawCloud(arcRadius, arcLength) {
+        function drawCloud(arcRadius: number, arcLength: number): void {
           const midPoint = calculateMidpoint({ x: 0, y: 0 });
 
           context.beginPath();
@@ -141,7 +141,7 @@ export class KonvaCloud implements IMarkupCloud {
           context.fillStrokeShape(shape);
         }
 
-        function drawRectangle() {
+        function drawRectangle(): void {
           context.beginPath();
           context.lineTo(points[1].x, points[1].y);
           context.lineTo(points[2].x, points[2].y);
@@ -265,7 +265,7 @@ export class KonvaCloud implements IMarkupCloud {
     this._ref = null;
   }
 
-  getPosition() {
+  getPosition(): { x: number; y: number } {
     return this._ref.position();
   }
 

package/src/markup/Konva/primitives/KonvaImage.ts

@@ -198,7 +198,7 @@ export class KonvaImage implements IMarkupImage {
     return this._canvasImage.src;
   }
 
-  setSrc(src: any) {
+  setSrc(src: any): void {
     this._canvasImage.src = src;
   }
 

package/src/markup/primitives/IMarkupLine.ts

@@ -46,7 +46,7 @@ export interface IMarkupLine extends IMarkupObject, IMarkupColorable {
   /**
    * Sets the line width.
    */
-  setLineWidth(size: number);
+  setLineWidth(size: number): void;
 
   /**
    * Returns the line type. Can be `solid`, `dot` or `dash`.
@@ -58,14 +58,14 @@ export interface IMarkupLine extends IMarkupObject, IMarkupColorable {
    *
    * @param type - Line type. Can be `solid`, `dot` or `dash`.
    */
-  setLineType(type: string);
+  setLineType(type: string): void;
 
   /**
    * Adds the specified points to the end of the line.
    *
    * @param points - Array of 2D points.
    */
-  addPoints(points: [{ x: number; y: number }]);
+  addPoints(points: [{ x: number; y: number }]): void;
 }
 
 /**