@vitrosoftware/common-ui-ts 1.1.136 → 1.1.137

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.136';
-import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.136';
-import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.136';
-import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.136';
-import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.136';
-import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.136';
-import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.136';
-import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.136';
-import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.136';
-import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.136';
-import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.136';
-import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.136';
-import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.136';
-import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.136';
+import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.137';
+import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.137';
+import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.137';
+import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.137';
+import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.137';
+import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.137';
+import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.137';
+import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.137';
+import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.137';
+import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.137';
+import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.137';
+import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.137';
+import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.137';
+import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.137';
 
 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.136",
+    value: "resource/pdfViewer/js/pdf.worker.js?version=1.1.137",
     kind: OptionKind.WORKER
   }
 };
@@ -22455,6 +22455,10 @@ class GrabToPan {
     return node.matches("a[href], a[href] *, input, textarea, button, button *, select, option");
   }
   #onMouseDown(event) {
+    if (PDFViewerApplication.pdfCursorTools._handTool.active && $('#fileVersionSelect').find('ul').length) {
+        const evt = new CustomEvent("vitro.pdfviewer.pan.start", { detail: event.target });
+        window.dispatchEvent(evt);
+    }
     if (event.button !== 0 || this.ignoreTarget(event.target)) {
       return;
     }
@@ -27705,7 +27709,7 @@ class PDFViewer {
       do {
 		/* @TODO.SA - fix Zoom Scale factor */
 		if(isMouseEvt) {
-			newScale = Math.round((newScale+getZoomOutScaleFactor()).toFixed(2) * 100) / 100;
+            newScale = Math.round((newScale * getMouseZoomInScaleFactor()).toFixed(2) * 100) / 100;
 		} else {
 			newScale = Math.ceil((newScale * _ui_utils.DEFAULT_SCALE_DELTA).toFixed(2) * 10) / 10;
 		}
@@ -27735,7 +27739,7 @@ class PDFViewer {
       do {
 		/* @TODO.SA - fix Zoom Scale factor */
 		if(isMouseEvt) {
-			newScale = Math.round((newScale-getZoomOutScaleFactor()).toFixed(2) * 100) / 100;	
+            newScale = Math.round((newScale * getMouseZoomOutScaleFactor()).toFixed(2) * 100) / 100;	
 		} else {
 			newScale = Math.floor((newScale / _ui_utils.DEFAULT_SCALE_DELTA).toFixed(2) * 10) / 10;	
 		}
@@ -31900,6 +31904,16 @@ function getZoomInScaleFactor() {
   var scaleFactor = 1 + getZoomOutScaleFactor();
   return scaleFactor;
 }
+
+function getMouseZoomOutScaleFactor() {
+    var scaleFactor = 0.75;
+    return scaleFactor;
+}
+
+function getMouseZoomInScaleFactor() {
+    var scaleFactor = 1.25;
+    return scaleFactor;
+}
 /* *** */window.initPdfViewer = function(context) {function initContextMenu() {
     initContextMenuCanvas();
     bindContextMenuNote();
@@ -36405,6 +36419,7 @@ function bindCompareThumbCanvasLoaded() {
                 showComparisonWarning();
                 $('#btnDoCompare').addClass('disabled');
             } else {
+                hideComparisonWarning();
                 enableBtnCompare();
             }
         }
@@ -37512,16 +37527,25 @@ function initCompare() {
         }));
     });
 
-    let version = context.fileVersionList.find(item => item.id == context.currentVersionId);
-    let currentVersion = `v${version.name}`;
-    $('#docAVersion').val(currentVersion);
-    let currentVersionArray = version.name.split('.');
-    let versionMinor = currentVersionArray[1];
-    let versionMajor = currentVersionArray[0];
-    if (versionMinor > 1) {
-        $('#docBVersion').val(`v${versionMajor}.${--versionMinor}`);
+    let loadedVersionId = getLoadedVersionId();
+    let version = context.fileVersionList.find(item => item.id == loadedVersionId);
+    let loadedVersion = `v${version.name}`;
+    $('#docAVersion').val(loadedVersion);
+    let loadedVersionArray = version.name.split('.');
+    let loadedVersionMinor = loadedVersionArray[1];
+    let loadedVersionMajor = loadedVersionArray[0];
+    if (loadedVersionId != context.currentVersionId) {
+        let lastVersion = context.fileVersionList.find(item => item.id == context.currentVersionId);
+        let lastVersionLabel = `v${lastVersion.name}`;
+        $('#docBVersion').val(lastVersionLabel);
     } else {
-        $('#docBVersion').val(currentVersion);
+        if (context.fileVersionList.length > 1) {
+            let previousVersion = context.fileVersionList[1];
+            let previousVersionLabel = `v${previousVersion.name}`;
+            $('#docBVersion').val(previousVersionLabel);
+        } else {
+            $('#docBVersion').val(loadedVersion);
+        }
     }
     $('#docAPage').val(1);
     $('#docBPage').val(1);
@@ -37530,6 +37554,14 @@ function initCompare() {
     bindPageSelect();
 }
 
+function getLoadedVersionId() {
+    if (context.versionId) {
+        return context.versionId;
+    } else {
+        return context.currentVersionId;
+    }
+}
+
 function showDlgCompare() {
     $('.compare-dlg-wrap').show();
 
@@ -37720,7 +37752,9 @@ function isComparedDocumentCurrentOpened(url) {
     let urlArr = url.split('/');
     let version = urlArr[urlArr.length - 1];
     let itemId = urlArr[urlArr.length - 2];
-    if (context.file.id === itemId && context.file.fieldValueMap.version.fieldValueMap.name === version) {
+    let loadedVersionId = getLoadedVersionId();
+    let loadedVersion = context.fileVersionList.find(item => item.id == loadedVersionId);
+    if (context.file.id === itemId && loadedVersion.name === version) {
         return true;
     } 
 

package/css/std/controls/input/img/copy-to-clipboard.svg

@@ -1,4 +0,0 @@
-<svg width="20" height="21" viewBox="0 0 20 21" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.41797 5.68048V4.58919C5.41797 3.10865 5.94264 2.58398 7.42318 2.58398H15.9128C17.3933 2.58398 17.918 3.10865 17.918 4.58919V13.0788C17.918 14.5593 17.3933 15.084 15.9128 15.084H14.7998" stroke="#4A556C" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.5768 5.91602H4.08724C2.6067 5.91602 2.08203 6.44068 2.08203 7.92122V16.4108C2.08203 17.8913 2.6067 18.416 4.08724 18.416H12.5768C14.0574 18.416 14.582 17.8913 14.582 16.4108V7.92122C14.582 6.44068 14.0574 5.91602 12.5768 5.91602Z" stroke="#4A556C" stroke-linejoin="round"/>
-</svg>

package/css/std/controls/lookup-picker/img/copy-to-clipboard.svg

@@ -1,4 +0,0 @@
-<svg width="20" height="21" viewBox="0 0 20 21" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.41797 5.68048V4.58919C5.41797 3.10865 5.94264 2.58398 7.42318 2.58398H15.9128C17.3933 2.58398 17.918 3.10865 17.918 4.58919V13.0788C17.918 14.5593 17.3933 15.084 15.9128 15.084H14.7998" stroke="#4A556C" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.5768 5.91602H4.08724C2.6067 5.91602 2.08203 6.44068 2.08203 7.92122V16.4108C2.08203 17.8913 2.6067 18.416 4.08724 18.416H12.5768C14.0574 18.416 14.582 17.8913 14.582 16.4108V7.92122C14.582 6.44068 14.0574 5.91602 12.5768 5.91602Z" stroke="#4A556C" stroke-linejoin="round"/>
-</svg>