@vitrosoftware/common-ui-ts 1.1.130 → 1.1.132

package/dist/src/constants/Event.d.ts

@@ -9,5 +9,6 @@ export declare enum EVENT {
     HISTORY_UPDATE = "vitro.history.update",
     HISTORY_CHANGED = "vitro.history.changed",
     DROP = "drop",
-    CONTEXTMENU = "contextmenu"
+    CONTEXTMENU = "contextmenu",
+    COMMANDMENU_TOGGLE = "vitro.commandmenu.toggle"
 }

package/dist/src/controls/CommandMenu/CommandMenuDropdownButton.d.ts

@@ -13,6 +13,7 @@ interface CommandMenuDropdownButtonProps {
     imageUrl?: string;
     imageHoverUrl?: string;
     className?: string;
+    onClick?: (e: any) => any;
 }
 export declare const CommandMenuDropdownButton: (props: CommandMenuDropdownButtonProps) => JSX.Element;
 export {};

package/dist/src/controls/IssueTile/IssueTile.d.ts

@@ -2,6 +2,7 @@
 export interface IssueTileProps {
     id: string;
     url?: string;
+    name: string;
     text: string;
     userName: string;
     userImage?: string;

package/dist/src/controls/IssueTile/IssueTileConstants.d.ts

@@ -1,3 +1,5 @@
 export declare enum LOCALE {
-    TEXTAREA_LABEL = "app.common.issueTile.textareaLabel"
+    TEXTAREA_LABEL = "app.common.issueTile.textareaLabel",
+    INPUT_NAME_LABEL = "app.common.issueTile.inputNameLabel",
+    ERROR_EMPTY = "app.common.issueTile.error.empty"
 }

package/dist/src/controls/TableView/TableViewConstants.d.ts

@@ -50,7 +50,9 @@ export declare enum EVENT {
     ON_GET_GANTT_MENU = "OnGetGanttMenu",
     ON_RENDER_CHILD_PART_FINISH = "OnRenderChildPartFinish",
     ON_RENDER_CHILD_PART_START = "OnRenderChildPartStart",
-    ON_EXPAND_ALL_FINISH = "OnExpandAllFinish"
+    ON_EXPAND_ALL_FINISH = "OnExpandAllFinish",
+    ON_GET_FORMAT = "OnGetFormat",
+    ON_GET_GANTT_SIDE_HTML = "OnGetGanttSideHtml"
 }
 export declare enum URL {
     LAYOUT = "Layout",
@@ -110,7 +112,8 @@ export declare enum ATTRIBUTE {
     VISIBLE = "Visible",
     ID = "Id",
     ADDED = "Added",
-    FORMULA = "Formula"
+    FORMULA = "Formula",
+    FORMAT = "Format"
 }
 export declare enum DRAG_ITEM_TYPE {
     CANNOT_DROP = 0,
@@ -211,3 +214,6 @@ export declare enum DEF_ROW {
     FOLDER = "Folder",
     R = "R"
 }
+export declare enum DATE_FORMAT {
+    DEFAULT = "dd.MM.yyyy"
+}

package/dist/src/controls/TableView/TableViewContext.d.ts

@@ -84,8 +84,8 @@ export interface TableViewContext {
     showPopupMenu(): any;
     closeDialog(): void;
     hideTip(): void;
-    showMenu(row: TableViewRow, col: string, menu: any, position?: any, func?: Function): void;
-    showPopup(menu: any, func?: Function): void;
+    showMenu(row: TableViewRow, col: string, menu: any, position?: any, func?: Function): any;
+    showPopup(menu: any, func?: Function): any;
     getShownRows(): TableViewRow[];
     getShownCols(section?: number): string[];
     refreshGantt(): void;

package/dist/src/controls/TableView/TreeGridTableViewContextImpl.d.ts

@@ -99,8 +99,8 @@ export declare class TreeGridTableViewContextImpl implements TableViewContext {
     showPopupMenu(): any;
     closeDialog(): void;
     hideTip(): void;
-    showMenu(row: TableViewRow, col: string, menu: any, position?: any, func?: Function): void;
-    showPopup(menu: any, func?: Function): void;
+    showMenu(row: TableViewRow, col: string, menu: any, position?: any, func?: Function): any;
+    showPopup(menu: any, func?: Function): any;
     getShownRows(): TableViewRow[];
     getShownCols(section?: number): string[];
     refreshGantt(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vitrosoftware/common-ui-ts",
-    "version": "1.1.130",
+    "version": "1.1.132",
     "description": "vitro software common ui ts",
     "author": "",
     "license": "MIT",

package/src/controls/BimViewer/js/bim-viewer.js

@@ -1,11 +1,11 @@
-import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.130';
+import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.132';
 
 import {
     Viewer, XKTLoaderPlugin, NavCubePlugin, SectionPlanesPlugin, math, BCFViewpointsPlugin, AnnotationsPlugin,
     ContextMenu, TreeViewPlugin, StoreyViewsPlugin, AngleMeasurementsPlugin, CameraMemento, DistanceMeasurementsPlugin,
     GLTFLoaderPlugin, utils, FastNavPlugin, MetaObject, parsers
 }
-    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.130';
+    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.132';
 
 
 const processByChildIdList = (treeViewNode, event) => {

package/src/controls/DxfViewer/js/dxf-viewer.js

@@ -1,17 +1,17 @@
-import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.130';
-import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.130';
-import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.130';
-import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.130';
-import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.130';
-import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.130';
-import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.130';
-import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.130';
-import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.130';
-import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.130';
-import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.130';
-import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.130';
-import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.130';
-import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.130';
+import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.132';
+import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.132';
+import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.132';
+import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.132';
+import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.132';
+import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.132';
+import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.132';
+import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.132';
+import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.132';
+import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.132';
+import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.132';
+import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.132';
+import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.132';
+import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.132';
 
 let treeViewData = [];
 let notes = [];

package/src/controls/PdfViewer/js/pdf-viewer.js

@@ -21208,7 +21208,7 @@ const defaultOptions = {
     kind: OptionKind.WORKER
   },
   workerSrc: {
-    value: "resource/pdfViewer/js/pdf.worker.js?version=1.1.130",
+    value: "resource/pdfViewer/js/pdf.worker.js?version=1.1.132",
     kind: OptionKind.WORKER
   }
 };
@@ -27043,6 +27043,7 @@ class PDFViewer {
           presetValue: newValue
         });
       }
+      showNotesLayer();
       return;
     }
     this.viewer.style.setProperty("--scale-factor", newScale * _pdfjsLib.PixelsPerInch.PDF_TO_CSS_UNITS);
@@ -33216,17 +33217,27 @@ function dragging(event, pageNr) {
     if (!drawStart) {
         return;
     }
+
+	var shapeType = getShapeType();
+	var outlineId = 'shapeOutline';
+	var settings = getShapeSettings(outlineId);
+	var shapeParams = getShapeParams(drawStart.X, drawStart.Y, (event.clientX - offset.left), (event.clientY - offset.top));
+	var pagesRotation = getPdfPagesRotation();
+	var shapeParamsByType = getShapeParamsObjByType(shapeParams, pagesRotation, shapeType);
+
     if (!outline) {
-        outline = sketchpad[pageNr].rect(0, 0, 0, 0,
-            {fill: 'none', stroke: '#c0c0c0', strokeWidth: 1, strokeDashArray: '2,2'});
+
+		var initShapeParams = getShapeParams(0, 0, 20, 20);
+		outline = getShapeNodeByType(pageNr, shapeType, initShapeParams, pagesRotation, settings);
+
         $(outline).mouseup(function(e) {
             endDrag(e, pageNr);
         });
     }
-    sketchpad[pageNr].change(outline, {x: Math.min(event.clientX - offset.left, drawStart.X),
-        y: Math.min(event.clientY - offset.top, drawStart.Y),
-        width: Math.abs(event.clientX - offset.left - drawStart.X),
-        height: Math.abs(event.clientY - offset.top - drawStart.Y)});
+
+
+	  sketchpad[pageNr].change(outline, shapeParamsByType);
+
     event.preventDefault();
 }
 
@@ -33580,53 +33591,14 @@ function setMeasure(pageNr, measureGrpId, measureGrp, posX, posY, width, height,
 }
 
 /* Draw the selected element on the canvas */
-function drawShape(x1, y1, x2, y2, pageNr, shape) {
-
-    var left = Math.min(x1, x2);
-    var top = Math.min(y1, y2);
-    var right = Math.max(x1, x2);
-    var bottom = Math.max(y1, y2);
+function drawShape(x1, y1, x2, y2, pageNr, shapeType) {
 
     var nodeId = Date.now();
+	  var shapeParams = getShapeParams(x1, y1, x2, y2);
     var settings = getShapeSettings(nodeId);
     var pagesRotation = getPdfPagesRotation();
 
-    var node = null;
-    if (shape == 'rect') {
-        node = sketchpad[pageNr].rect(left, top, right - left, bottom - top, settings);
-    }
-    else if (shape == 'circle') {
-        var r = Math.min(right - left, bottom - top) / 2;
-        node = sketchpad[pageNr].circle(left + r, top + r, r, settings);
-    }
-    else if (shape == 'ellipse') {
-        var rx = (right - left) / 2;
-        var ry = (bottom - top) / 2;
-        node = sketchpad[pageNr].ellipse(left + rx, top + ry, rx, ry, settings);
-    }
-    else if (shape == 'line') {
-        node = sketchpad[pageNr].line(x1, y1, x2, y2, settings);
-    }
-    else if (shape == 'arrow') {
-        var arrowPath = getArrowPath(x1, y1, x2, y2);
-        node = sketchpad[pageNr].path(arrowPath, settings);
-    }
-    else if (shape == 'polyline') {
-        node = sketchpad[pageNr].polyline([[(x1 + x2) / 2, y1], [x2, y2],
-            [x1, (y1 + y2) / 2], [x2, (y1 + y2) / 2], [x1, y2],
-            [(x1 + x2) / 2, y1]], $.extend(settings, {fill: 'none'}));
-    }
-    else if (shape == 'cloud') {
-        var cloudPath = getCloudPath(left, top, right, bottom);
-        node = sketchpad[pageNr].path(cloudPath, settings);
-    }
-    else if (shape == 'polygon') {
-        var polygonPos = getPolygonPosByPageRotation(x1, y1, x2, y2, pagesRotation);
-        node = sketchpad[pageNr].polygon(polygonPos, settings);
-    }
-
-    var width = right - left;
-    var height = bottom - top;
+	  var node = getShapeNodeByType(pageNr, shapeType, shapeParams, pagesRotation, settings);
 
     var direction = getDrawDirectionByPagesRotation(x1, y1, x2, y2, pagesRotation);
 
@@ -33634,16 +33606,16 @@ function drawShape(x1, y1, x2, y2, pageNr, shape) {
         var svgData = {
             pageNr: pageNr,
             position: {
-                x: left,
-                y: top
+                x: shapeParams.left,
+                y: shapeParams.top
             },
-            width: width,
-            height: height
+            width: shapeParams.width,
+            height: shapeParams.height
         };
         var nodeSvgData = getNormalizedSvgData(svgData, pagesRotation);
-        setDrawNodes(pageNr, nodeId, node, nodeSvgData.position.x, nodeSvgData.position.y, nodeSvgData.width, nodeSvgData.height, shape, direction);
+        setDrawNodes(pageNr, nodeId, node, nodeSvgData.position.x, nodeSvgData.position.y, nodeSvgData.width, nodeSvgData.height, shapeType, direction);
     } else {
-        setDrawNodes(pageNr, nodeId, node, left, top, width, height, shape, direction);
+        setDrawNodes(pageNr, nodeId, node, shapeParams.left, shapeParams.top, shapeParams.width, shapeParams.height, shapeType, direction);
     }
 
     $(node).mousedown(function(e) {
@@ -33659,6 +33631,184 @@ function drawShape(x1, y1, x2, y2, pageNr, shape) {
     initDlgForSvg(drawNodes[nodeId], false, removeSvg, false, drawNodes[nodeId].data);
 }
 
+function getShapeNodeByType(pageNr, shapeType, shapeParams, pagesRotation, settings) {
+	var node = null;
+	if (shapeType == 'rect') {
+		node = getShapeNodeRect(pageNr, shapeParams.left, shapeParams.top, shapeParams.width, shapeParams.height, settings );
+	}
+	else if (shapeType == 'circle') {
+		node = getShapeNodeCircle(pageNr, shapeParams.left, shapeParams.top, shapeParams.right, shapeParams.bottom, settings);
+	}
+	else if (shapeType == 'ellipse') {
+		node = getShapeNodeEllipse(pageNr, shapeParams.left, shapeParams.top, shapeParams.right, shapeParams.bottom, settings);
+	}
+	else if (shapeType == 'line') {
+		node= getShapeNodeLine(pageNr, shapeParams.x1, shapeParams.y1, shapeParams.x2, shapeParams.y2, settings);
+	}
+	else if (shapeType == 'arrow') {
+		node = getShapeNodeArrow(pageNr, shapeParams.x1, shapeParams.y1, shapeParams.x2, shapeParams.y2, settings);
+	}
+	else if (shapeType == 'polyline') {
+		node = getShapeNodePolyline(pageNr, shapeParams.x1, shapeParams.y1, shapeParams.x2, shapeParams.y2, settings);
+	}
+	else if (shapeType == 'cloud') {
+		node = getShapeNodeCloud(pageNr, shapeParams.left, shapeParams.top, shapeParams.right, shapeParams.bottom, settings);
+	}
+	else if (shapeType == 'polygon') {
+		node = getShapeNodePolygone(pageNr, shapeParams.x1, shapeParams.y1, shapeParams.x2, shapeParams.y2, pagesRotation, settings);
+	}
+
+	return node;
+}
+
+function getShapeParams(x1, y1, x2, y2) {
+	var left = Math.min(x1, x2);
+	var top = Math.min(y1, y2);
+	var right = Math.max(x1, x2);
+	var bottom = Math.max(y1, y2);
+	var width = right - left;
+	var height = bottom - top;
+
+	var params = {
+		x1: x1,
+		y1: y1,
+		x2: x2,
+		y2: y2,
+		left: left,
+		top: top,
+		right: right,
+		bottom: bottom,
+		width: width,
+		height: height
+	};
+
+	return params;
+}
+
+function getShapeParamsObjByType(shapeParams, pagesRotation, shapeType) {
+	var params;
+	if (shapeType == 'rect') {
+		params = {
+			x: shapeParams.left,
+			y: shapeParams.top,
+			width: shapeParams.width,
+			height: shapeParams.height
+		};
+	} else if (shapeType == 'circle') {
+		var r = getShapeCircleRadius(shapeParams.left, shapeParams.top, shapeParams.right, shapeParams.bottom);
+		params = {
+			cx: (shapeParams.left + r),
+			cy: (shapeParams.top + r),
+			r: r
+		};
+	} else if (shapeType == 'ellipse') {
+		var rx = getShapeEllipseRadiusX(shapeParams.left, shapeParams.right);
+		var ry = getShapeEllipseRadiusY(shapeParams.top, shapeParams.bottom);
+		params = {
+			cx: (shapeParams.left + rx),
+			cy: (shapeParams.top + ry),
+			rx: rx,
+			ry: ry
+		};
+	} else if (shapeType == 'line') {
+		params = {
+			x1: shapeParams.x1,
+			y1: shapeParams.y1,
+			x2: shapeParams.x2,
+			y2: shapeParams.y2
+		};
+	} else if (shapeType == 'arrow') {
+		params = {
+			d: getArrowPath(shapeParams.x1, shapeParams.y1, shapeParams.x2, shapeParams.y2).join(',')
+		};
+	} else if (shapeType == 'polyline') {
+		params = {
+			points: [
+				[(shapeParams.x1 + shapeParams.x2) / 2, shapeParams.y1],
+				[shapeParams.x2, shapeParams.y2],
+				[shapeParams.x1, (shapeParams.y1 + shapeParams.y2) / 2],
+				[shapeParams.x2, (shapeParams.y1 + shapeParams.y2) / 2],
+				[shapeParams.x1, shapeParams.y2],
+				[(shapeParams.x1 + shapeParams.x2) / 2, shapeParams.y1]
+			]
+		};
+	} else if (shapeType == 'cloud') {
+		params = {
+			d: getCloudPath(shapeParams.left, shapeParams.top, shapeParams.right, shapeParams.bottom).join(',')
+		};
+	} else if (shapeType == 'polygon') {
+		params = {
+			points: getPolygonPosByPageRotation(shapeParams.x1, shapeParams.y1, shapeParams.x2, shapeParams.y2, pagesRotation)
+		};
+	}
+
+	return params;
+}
+
+
+function getShapeNodeRect(pageNr, left, top, width, height, settings ) {
+	var node = sketchpad[pageNr].rect(left, top, width, height, settings);
+	return node;
+}
+
+function getShapeNodeCircle(pageNr, left, top, right, bottom, settings) {
+	var r = getShapeCircleRadius(left, top, right, bottom);
+	var node = sketchpad[pageNr].circle(left + r, top + r, r, settings);
+	return node;
+}
+
+function getShapeCircleRadius(left, top, right, bottom) {
+	var radius = Math.min(right - left, bottom - top) / 2;
+	return radius;
+}
+
+function getShapeNodeEllipse(pageNr, left, top, right, bottom, settings) {
+	var rx = getShapeEllipseRadiusX(left, right);
+	var ry = getShapeEllipseRadiusY(top, bottom);
+	var node = sketchpad[pageNr].ellipse(left + rx, top + ry, rx, ry, settings);
+	return node;
+}
+
+function getShapeEllipseRadiusX(left, right) {
+	var radius= (right - left) / 2;
+	return radius;
+}
+
+function getShapeEllipseRadiusY(top, bottom) {
+	var radius= (bottom - top) / 2;
+	return radius;
+}
+
+function getShapeNodeLine(pageNr, x1, y1, x2, y2, settings) {
+	var node = sketchpad[pageNr].line(x1, y1, x2, y2, settings);
+	return node;
+}
+
+function getShapeNodePolyline(pageNr, x1, y1, x2, y2, settings) {
+	var node = sketchpad[pageNr].polyline([[(x1 + x2) / 2, y1], [x2, y2],
+		[x1, (y1 + y2) / 2], [x2, (y1 + y2) / 2], [x1, y2],
+		[(x1 + x2) / 2, y1]], $.extend(settings, {fill: 'none'}));
+	return node;
+}
+
+function getShapeNodeCloud(pageNr, left, top, right, bottom, settings) {
+	var cloudPath = getCloudPath(left, top, right, bottom);
+	var node = sketchpad[pageNr].path(cloudPath, settings);
+	return node;
+}
+
+function getShapeNodePolygone(pageNr, x1, y1, x2, y2, pagesRotation, settings) {
+	var polygonPos = getPolygonPosByPageRotation(x1, y1, x2, y2, pagesRotation);
+	var node = sketchpad[pageNr].polygon(polygonPos, settings);
+	return node;
+}
+
+function getShapeNodeArrow(pageNr, x1, y1, x2, y2, settings) {
+	var arrowPath = getArrowPath(x1, y1, x2, y2);
+	var node = sketchpad[pageNr].path(arrowPath, settings);
+	return node;
+}
+
 function getArrowPath(x1, y1, x2, y2) {
     var arrowCoords = getArrowMarkerCoords(x1, y1, x2, y2);
     var mrx = Math.round(arrowCoords.markerR.x);
@@ -33745,20 +33895,31 @@ function getCloudPath(x1, y1, x2, y2) {
     var baseRx = Math.round(18*scale);
     var baseRy = Math.round(18*scale);
 
-    var width = x2-x1;
-    var height = y2-y1;
+    var width = x2 - x1;
+    var height = y2 - y1;
+
+	width = width ? width : 1;
+	height = height ? height : 1;
 
     var countY = Math.round(height/(baseRy*2));
-    if(countY < 3) {
-        countY = 3
+    if(countY < 2) {
+        countY = 2
     }
     var rY = height/(countY*2);
 
     var countX = Math.round(width/(rY*2));
-    if(countX < 3) {
-        countX = 3;
+    if(countX < 2) {
+        countX = 2;
     }
-    var rX = width/(countX*2);
+	var rX = width / (countX * 2);
+
+	if (Math.max(rX, rY) / Math.min(rX, rY) > 1.5) {
+		var countY = Math.round(height / (rX * 2));
+		if (countY < 2) {
+			countY = 2;
+		}
+		var rY = height / (countY * 2);
+	}
 
     var path = [
         'M ' + (x1 + rX*2) + ',' + (y1 + rY),
@@ -37231,7 +37392,7 @@ var label_createAnnotation = context.createLocale('app.viewer.pdf.contextMenu.ad
 var label_measures2PointHint = context.createLocale('app.viewer.pdf.measures.twoPointHint');
 
 function initContextMenuCanvas() {
-    var pages = '#viewer .page';
+    var pages = '#viewer .page:not(.has-new-svg)';
     $.contextMenu({
         selector: pages,
         trigger: 'right',
@@ -37240,15 +37401,14 @@ function initContextMenuCanvas() {
                 name: context.createLocale('app.viewer.pdf.contextMenu.addNote'),
                 icon: "add"
             },
-            /*"showTxt": {
-                name: "Show / Hide Text",
-                icon: "page-facing-up", 
-            },*/
             "sep1": "---------",
             "quit": {
                 name: context.createLocale('app.viewer.pdf.contextMenu.cancel'),
                 icon: function () {
                     return 'context-menu-icon context-menu-icon-quit';
+                },
+                callback: function (key, opt) {
+                    context.toggleIssueDetail(false);
                 }
             }
         },
@@ -37266,6 +37426,49 @@ function initContextMenuCanvas() {
     });
 }
 
+function initContextMenuNewSvg() {
+    var pages = '#viewer .page.has-new-svg';
+    $.contextMenu({
+        selector: pages,
+        trigger: 'right',
+        items: {
+            "removeNewSvg": {
+                name: context.createLocale('app.viewer.pdf.contextMenu.cancel'),
+                icon: function () {
+                    return 'context-menu-icon context-menu-icon-quit';
+                }
+            }
+        },
+        callback: function (key, options, e) {
+            e.preventDefault();
+            e.stopPropagation();
+            $(document).trigger(key, [options.$trigger]);
+        }
+    });
+}
+
+function activateNewSvgMode() {
+    $('#viewer .page').addClass('has-new-svg');
+}
+
+function deactivateNewSvgMode() {
+    $('#viewer .page').removeClass('has-new-svg');
+}
+
+function bindContextMenuRemoveNewSvgEventHandler() {
+    $(document).on('removeNewSvg', function () {
+        contextMenuRemoveNewSvgEventHandler();
+    });
+}
+
+function contextMenuRemoveNewSvgEventHandler() {
+    removeNewSvg();
+    context.toggleIssueDetail(false);
+    if ($('#btnDrawAnnotation').hasClass('toggled')) {
+        $('#btnDrawAnnotation').click();
+    }
+}
+
 function bindContextMenuNote() {
 }
 
@@ -37990,6 +38193,7 @@ function bindOnClickNote(note) {
 
 function removeNewSvg() {
     $('[id^="svg-new-"]').remove();
+    deactivateNewSvgMode();
 }
 
 function removeNewSvgByPage(page) {
@@ -38079,6 +38283,7 @@ function drawShape(x1, y1, x2, y2, pageNr, shape) {
     initDlgForSvg(drawNodes[nodeId], false, removeSvg, false, drawNodes[nodeId].data);
 
     deactivateDrawAnnotation();
+    activateNewSvgMode();
 }
 
 function saveMeasuresSettings() {
@@ -38209,6 +38414,8 @@ $(document).ready(function() {
     initContextMenu();
 
     initNotesCanvas();
+    initContextMenuNewSvg();
+    bindContextMenuRemoveNewSvgEventHandler();
     initSketchpadButtons();
 
     initNotes();