@inweb/viewer-visualize 25.4.11 → 25.5.3

package/dist/viewer-visualize.module.js

@@ -2999,6 +2999,7 @@ var MarkupType;
 var MarkupMode;
 
 (function(MarkupMode) {
+    MarkupMode["SelectMarkup"] = "SelectMarkup";
     MarkupMode["Line"] = "Line";
     MarkupMode["Text"] = "Text";
     MarkupMode["Rectangle"] = "Rectangle";
@@ -3160,16 +3161,25 @@ class KonvaText {
             draggable: true,
             rotation: (_c = params.rotation) !== null && _c !== void 0 ? _c : 0
         });
+        this._ref.width(this._ref.getTextWidth());
         this._ref.on("transform", (e => {
             const attrs = e.target.attrs;
             if (attrs.rotation !== this.getRotation()) this.setRotation(attrs.rotation);
             const newWidth = this._ref.width() * attrs.scaleX;
             const newHeight = this._ref.height() * attrs.scaleY;
+            const minWidth = 50;
+            if (newWidth < minWidth || newHeight < Math.round(this.getFontSize())) {
+                this._ref.scale({
+                    x: 1,
+                    y: 1
+                });
+                return;
+            }
             if (Math.abs(attrs.scaleX - 1) > 1e-5) {
-                this.setFontSize(Math.round(this.getFontSize() * newWidth / this._ref.width()));
+                this._ref.width(newWidth);
             }
             if (Math.abs(attrs.scaleY - 1) > 1e-5) {
-                this.setFontSize(Math.round(this.getFontSize() * newHeight / this._ref.height()));
+                this._ref.height(newHeight);
             }
             this._ref.scale({
                 x: 1,
@@ -3259,8 +3269,17 @@ class KonvaRectangle {
         this._ref.on("transform", (e => {
             const attrs = e.target.attrs;
             if (attrs.rotation !== this.getRotation()) this.setRotation(attrs.rotation);
-            const newWidth = this._ref.width() * attrs.scaleX;
-            const newHeight = this._ref.height() * attrs.scaleY;
+            let newWidth = this._ref.width() * attrs.scaleX;
+            let newHeight = this._ref.height() * attrs.scaleY;
+            const minWidth = 50;
+            const minHeight = 50;
+            if (newWidth < minWidth || newHeight < minHeight) {
+                this._ref.scale({
+                    x: 1,
+                    y: 1
+                });
+                return;
+            }
             if (Math.abs(attrs.scaleX - 1) > 1e-5) {
                 this.setWidth(newWidth);
             }
@@ -3363,6 +3382,15 @@ class KonvaEllipse {
             if (attrs.rotation !== this.getRotation()) this.setRotation(attrs.rotation);
             const newRadiusX = this._ref.radiusX() * attrs.scaleX;
             const newRadiusY = this._ref.radiusY() * attrs.scaleY;
+            const minRadiusX = 25;
+            const minRadiusY = 25;
+            if (newRadiusX < minRadiusX || newRadiusY < minRadiusY) {
+                this._ref.scale({
+                    x: 1,
+                    y: 1
+                });
+                return;
+            }
             if (Math.abs(attrs.scaleX - 1) > 1e-5) {
                 this.setRadiusX(newRadiusX);
             }
@@ -3818,7 +3846,10 @@ class KonvaCloud {
     }
 }
 
-const MarkupMode2Konva = new Map([ [ MarkupMode.Line, {
+const MarkupMode2Konva = new Map([ [ MarkupMode.SelectMarkup, {
+    name: "SelectMarkup",
+    initializer: () => {}
+} ], [ MarkupMode.Line, {
     name: "Line",
     initializer: ref => new KonvaLine(null, ref)
 } ], [ MarkupMode.Text, {
@@ -3847,6 +3878,8 @@ class KonvaMarkup {
         this._zIndex = 1;
         this._markupContainerName = "markupContainer";
         this.lineWidth = 4;
+        this.lineType = "solid";
+        this.fontSize = 34;
         this.changeActiveDragger = event => {
             const draggerName = event.data;
             this._markupContainer.className = this._canvasOriginal.className.split(" ").filter((x => !x.startsWith("oda-cursor-"))).filter((x => x)).concat(`oda-cursor-${draggerName.toLowerCase()}`).join(" ");
@@ -3934,8 +3967,9 @@ class KonvaMarkup {
         const hex = new MarkupColor(r, g, b).HexColor;
         Object.values(MarkupMode).forEach((mode => {
             this.konvaLayerFind(mode).forEach((x => {
-                const konvaObj = MarkupMode2Konva.get(mode).initializer(x);
-                if (konvaObj.setColor) konvaObj.setColor(hex);
+                var _a;
+                const konvaObj = (_a = MarkupMode2Konva.get(mode)) === null || _a === void 0 ? void 0 : _a.initializer(x);
+                if (konvaObj && konvaObj.setColor) konvaObj.setColor(hex);
             }));
         }));
         this._konvaLayer.draw();
@@ -4151,6 +4185,7 @@ class KonvaMarkup {
             const konvaShapes = this._konvaLayer.find(konvaShape.name).filter((x => x.parent instanceof Konva.Layer));
             return konvaShapes;
         }
+        return [];
     }
     initializeKonva() {
         this._konvaStage = new Konva.Stage({
@@ -4165,7 +4200,8 @@ class KonvaMarkup {
         stage.add(layer);
         this._konvaLayer = layer;
         const transformer = new Konva.Transformer({
-            shouldOverdrawWholeArea: false
+            shouldOverdrawWholeArea: false,
+            keepRatio: false
         });
         this._konvaTransformer = transformer;
         layer.add(transformer);
@@ -4304,23 +4340,27 @@ class KonvaMarkup {
                 transformer.nodes([]);
                 return;
             }
-            if (e.target.className === "Text" && transformer.nodes().length === 1 && transformer.nodes()[0] === e.target) {
-                if (this._textInputRef && this._textInputRef.value) this.addText(this._textInputRef.value, this._textInputPos, this._textInputAngle); else this.createTextInput({
-                    x: e.target.attrs.x,
-                    y: e.target.attrs.y
-                }, e.evt.pageX, e.evt.pageY, e.target.attrs.rotation, e.target.attrs.text);
-                return;
-            } else {
-                this.removeTextInput();
+            if (this._markupMode === MarkupMode.Text || this._markupMode === MarkupMode.SelectMarkup) {
+                if (e.target.className === "Text" && transformer.nodes().length === 1 && transformer.nodes()[0] === e.target) {
+                    if (this._textInputRef && this._textInputRef.value) this.addText(this._textInputRef.value, this._textInputPos, this._textInputAngle); else this.createTextInput({
+                        x: e.target.attrs.x,
+                        y: e.target.attrs.y
+                    }, e.evt.pageX, e.evt.pageY, e.target.attrs.rotation, e.target.attrs.text);
+                    return;
+                } else {
+                    this.removeTextInput();
+                }
             }
-            if (e.target.className === "Image" && transformer.nodes().length === 1 && transformer.nodes()[0] === e.target) {
-                if (this._imageInputRef && this._imageInputRef.value) this.addImage(this._imageInputPos, this._imageInputRef.value, 0, 0); else this.createImageInput({
-                    x: e.target.attrs.x,
-                    y: e.target.attrs.y
-                });
-                return;
-            } else {
-                this.removeImageInput();
+            if (this._markupMode === MarkupMode.Image || this._markupMode === MarkupMode.SelectMarkup) {
+                if (e.target.className === "Image" && transformer.nodes().length === 1 && transformer.nodes()[0] === e.target) {
+                    if (this._imageInputRef && this._imageInputRef.value) this.addImage(this._imageInputPos, this._imageInputRef.value, 0, 0); else this.createImageInput({
+                        x: e.target.attrs.x,
+                        y: e.target.attrs.y
+                    });
+                    return;
+                } else {
+                    this.removeImageInput();
+                }
             }
             if (transformer.nodes().filter((x => x.className === "Cloud")).length > 0 || e.target.className === "Cloud") {
                 transformer.rotateEnabled(false);
@@ -4383,9 +4423,9 @@ class KonvaMarkup {
             lines.push({
                 id: konvaLine.id(),
                 points: worldPoints.map((p => this.getPoint3dFromArray(p))),
-                color: konvaLine.getColor() || "ff0000",
-                type: konvaLine.getLineType() || "solid",
-                width: konvaLine.getLineWidth() || 3
+                color: konvaLine.getColor() || "#ff0000",
+                type: konvaLine.getLineType() || this.lineType,
+                width: konvaLine.getLineWidth() || this.lineWidth
             });
         }));
         return lines;
@@ -4593,7 +4633,7 @@ class KonvaMarkup {
         }
         const konvaLine = new KonvaLine({
             points: points,
-            type: type || "solid",
+            type: type || this.lineType,
             width: width || this.lineWidth,
             color: color || this._markupColor.HexColor,
             id: id
@@ -4613,7 +4653,7 @@ class KonvaMarkup {
             this._textInputRef.style.top = inputY + "px";
             this._textInputRef.style.left = inputX + "px";
             this._textInputRef.onkeydown = event => {
-                if (event.key === "Enter") {
+                if (event.key === "Enter" && !event.shiftKey) {
                     event.preventDefault();
                     this.addText(this._textInputRef.value, this._textInputPos, this._textInputAngle);
                 }
@@ -4700,7 +4740,7 @@ class KonvaMarkup {
                 },
                 text: specifiedText,
                 rotation: angle,
-                fontSize: fontSize,
+                fontSize: fontSize || this.fontSize,
                 color: color || this._markupColor.HexColor,
                 id: id
             });
@@ -4920,7 +4960,8 @@ class VisualizeMarkup {
             g: 0,
             b: 0
         };
-        this.lineWidth = 0;
+        this.lineWidth = 4;
+        this.fontSize = 34;
     }
     initialize(viewer, canvas, canvasEvents) {
         this._viewer = viewer;
@@ -5170,7 +5211,7 @@ class Viewer extends EventEmitter2 {
         return this._visualizeJsUrl;
     }
     configure(params) {
-        this._visualizeJsUrl = params.visualizeJsUrl || "https://opencloud.azureedge.net/libs/visualizejs/25.4/Visualize.js";
+        this._visualizeJsUrl = params.visualizeJsUrl || "https://opencloud.azureedge.net/libs/visualizejs/25.5/Visualize.js";
         return this;
     }
     async initialize(canvas, onProgress) {