@inweb/markup 26.6.0 → 26.6.2

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

@@ -4,10 +4,10 @@ export declare class KonvaImage implements IMarkupImage {
     private _ref;
     private _canvasImage;
     private _ratio;
+    private _worldTransformer;
     private readonly EPSILON;
     private readonly BASE64_HEADER_START;
     private readonly BASE64_NOT_FOUND;
-    private _worldTransformer;
     constructor(params: IMarkupImageParams, ref?: any, worldTransformer?: WorldTransform);
     getSrc(): string;
     setSrc(src: any): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/markup",
-  "version": "26.6.0",
+  "version": "26.6.2",
   "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": "~26.6.0",
-    "@inweb/viewer-core": "~26.6.0"
+    "@inweb/eventemitter2": "~26.6.2",
+    "@inweb/viewer-core": "~26.6.2"
   },
   "devDependencies": {
     "konva": "^9.3.18"

package/src/markup/Konva/KonvaArrow.ts

@@ -172,8 +172,8 @@ export class KonvaArrow implements IMarkupArrow {
   }
 
   updateScreenCoordinates(): void {
-    let screenStartPoint = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsStart"));
-    let screenEndPoint = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsEnd"));
+    const screenStartPoint = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsStart"));
+    const screenEndPoint = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsEnd"));
 
     let invert = this._ref.getAbsoluteTransform().copy();
     invert = invert.invert();

package/src/markup/Konva/KonvaCloud.ts

@@ -310,8 +310,8 @@ export class KonvaCloud implements IMarkupCloud {
   }
 
   updateScreenCoordinates(): void {
-    let screenPositionStart = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsStart"));
-    let screenPositionEnd = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsEnd"));
+    const screenPositionStart = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsStart"));
+    const screenPositionEnd = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsEnd"));
 
     let invert = this._ref.getStage().getAbsoluteTransform().copy();
     invert = invert.invert();

package/src/markup/Konva/KonvaEllipse.ts

@@ -233,9 +233,9 @@ export class KonvaEllipse implements IMarkupEllipse {
   }
 
   updateScreenCoordinates(): void {
-    let screenPosition = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsPosition"));
-    let radiusX = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsRadiusX"));
-    let radiusY = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsRadiusY"));
+    const screenPosition = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsPosition"));
+    const radiusX = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsRadiusX"));
+    const radiusY = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsRadiusY"));
 
     let invert = this._ref.getStage().getAbsoluteTransform().copy();
     invert = invert.invert();

package/src/markup/Konva/KonvaImage.ts

@@ -30,11 +30,12 @@ export class KonvaImage implements IMarkupImage {
   private _ref: Konva.Image;
   private _canvasImage: HTMLImageElement;
   private _ratio = 1;
+  private _worldTransformer: IWorldTransform;
+
   private readonly EPSILON = 10e-6;
   private readonly BASE64_HEADER_START = "data:image/";
   private readonly BASE64_NOT_FOUND =
     "data:image/jpeg;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAADsAAAA7AF5KHG9AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAmhJREFUWIXtlr9rVEEQxz+H8RQUJIdeIopYm0vkCg0GBBtbG1NF7Kxt7dR/IGIw/uhTaBNLERURg2kCEUyCYCPi70b0InjGS57FzOZN3r19d+9HJIVfWO52dma/s7Mz8xa2KAaBCWAR+AkECWOmSOIdwC1gtQOpHc+NfQ8wClQ8+1d0vcdH/lQ3bSIRGAZ2pTjAqNovANXIWlXlAXA2zvi2Ln4AjqYgtagYEutENSLvjRoOImFv5iB32Ae8UrLXwFBk3h9ndF0VJnKSO9gTu3yKu5Z1LKnS8YIcABgw5Ks692JZFXcXRJ46Aq6kikCnHNi/mQ50WwVtfaIoBzL3gRk2drSscJ2wrc4VvUoe2wn/41/iBfoVLRnBGnDSY3AAKacy8AmYR+o7K1zCl6wgrgpOAc/MuhvfgMuk+1JGHQgSBcAloKXy78AjYBppJk5/noTulseBMZ23iD/piHFkEdgTQzKk+5wHjmHC3cmBg0BD5xcSTrFXyQPgIWFtDwMvab+2N8DpbhyY1v/3E8gdDgNfVX9SCVZ0/gW4B0wB71S2BpxLcuCM/jaQSHSDEeAX4VMuAG4gTzyHbcAVXXO6GxxwIX+vvxe7JHcYQ07nHqklj96UIW/YhSWzMKcep8VVtf8B1Dw6h4DfhB+sdbgn2R+gnoEc5NR3dZ+3QJ9H74HqXLPCGlJyTfI9y3YCs0owq3OLOpKkLeBI1HhSDT/mdKIPiUCARMTlQx34TMLjtww8IczmO8AJ/N/2JNSQXAiQ671JePePge0+wzJSQq4FFzlaenIvucUAkiQLhC/mLGNZ9xgn5s63BP4CCk0QDtm4BhoAAAAASUVORK5CYII=";
-  private _worldTransformer: IWorldTransform;
 
   constructor(params: IMarkupImageParams, ref = null, worldTransformer = new WorldTransform()) {
     this._worldTransformer = worldTransformer;
@@ -271,8 +272,8 @@ export class KonvaImage implements IMarkupImage {
   }
 
   updateScreenCoordinates(): void {
-    let screenPositionStart = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsStart"));
-    let screenPositionEnd = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsEnd"));
+    const screenPositionStart = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsStart"));
+    const screenPositionEnd = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsEnd"));
 
     let invert = this._ref.getStage().getAbsoluteTransform().copy();
     invert = invert.invert();

package/src/markup/Konva/KonvaLine.ts

@@ -44,7 +44,7 @@ export class KonvaLine implements IMarkupLine {
       let wcsPoints = this._ref.getAttr("wcsPoints");
       if (!wcsPoints) {
         wcsPoints = [];
-        let points = this._ref.points();
+        const points = this._ref.points();
         let wcsPoint;
         for (let i = 0; i < points.length; i += 2) {
           wcsPoint = this._worldTransformer.screenToWorld({ x: points[i], y: points[i + 1] });
@@ -66,7 +66,7 @@ export class KonvaLine implements IMarkupLine {
     const wcsPoints = [];
     params.points.forEach((point) => {
       konvaPoints.push(point.x, point.y);
-      let wcsPoint = this._worldTransformer.screenToWorld({ x: point.x, y: point.y });
+      const wcsPoint = this._worldTransformer.screenToWorld({ x: point.x, y: point.y });
       wcsPoints.push({ x: wcsPoint.x, y: wcsPoint.y, z: wcsPoint.z });
     });
 
@@ -93,8 +93,8 @@ export class KonvaLine implements IMarkupLine {
     this._ref.on("transformend", (e) => {
       const absoluteTransform = this._ref.getAbsoluteTransform();
 
-      let wcsPoints = [];
-      let points = this._ref.points();
+      const wcsPoints = [];
+      const points = this._ref.points();
       let wcsPoint;
       for (let i = 0; i < points.length; i += 2) {
         const position = absoluteTransform.point({ x: points[i], y: points[i + 1] });
@@ -107,8 +107,8 @@ export class KonvaLine implements IMarkupLine {
     this._ref.on("dragend", (e) => {
       const absoluteTransform = this._ref.getAbsoluteTransform();
 
-      let wcsPoints = [];
-      let points = this._ref.points();
+      const wcsPoints = [];
+      const points = this._ref.points();
       let wcsPoint;
       for (let i = 0; i < points.length; i += 2) {
         const position = absoluteTransform.point({ x: points[i], y: points[i + 1] });
@@ -202,10 +202,10 @@ export class KonvaLine implements IMarkupLine {
 
   addPoints(points: [{ x: number; y: number }]) {
     let newPoints = this._ref.points();
-    let wcsPoints = this._ref.getAttr("wcsPoints");
+    const wcsPoints = this._ref.getAttr("wcsPoints");
     points.forEach((point) => {
       newPoints = newPoints.concat([point.x, point.y]);
-      let wcsPoint = this._worldTransformer.screenToWorld(point);
+      const wcsPoint = this._worldTransformer.screenToWorld(point);
       wcsPoints.push(wcsPoint);
     });
 
@@ -213,8 +213,8 @@ export class KonvaLine implements IMarkupLine {
   }
 
   updateScreenCoordinates(): void {
-    let wcsPoints = this._ref.getAttr("wcsPoints");
-    let points = [];
+    const wcsPoints = this._ref.getAttr("wcsPoints");
+    const points = [];
     let invert = this._ref.getAbsoluteTransform().copy();
     invert = invert.invert();
     wcsPoints.forEach((point) => {

package/src/markup/Konva/KonvaRectangle.ts

@@ -226,8 +226,8 @@ export class KonvaRectangle implements IMarkupRectangle {
   }
 
   updateScreenCoordinates(): void {
-    let screenPositionStart = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsStart"));
-    let screenPositionEnd = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsEnd"));
+    const screenPositionStart = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsStart"));
+    const screenPositionEnd = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsEnd"));
 
     let invert = this._ref.getStage().getAbsoluteTransform().copy();
     invert = invert.invert();

package/src/markup/Konva/KonvaText.ts

@@ -180,7 +180,7 @@ export class KonvaText implements IMarkupText {
   }
 
   updateScreenCoordinates(): void {
-    let screenPositionStart = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsStart"));
+    const screenPositionStart = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsStart"));
 
     let invert = this._ref.getStage().getAbsoluteTransform().copy();
     invert = invert.invert();