@vitrosoftware/common-ui-ts 1.1.209 → 1.1.211

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.209';
-import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.209';
-import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.209';
-import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.209';
-import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.209';
-import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.209';
-import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.209';
-import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.209';
-import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.209';
-import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.209';
-import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.209';
-import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.209';
-import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.209';
-import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.209';
+import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.211';
+import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.211';
+import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.211';
+import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.211';
+import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.211';
+import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.211';
+import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.211';
+import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.211';
+import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.211';
+import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.211';
+import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.211';
+import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.211';
+import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.211';
+import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.211';
 
 let treeViewData = [];
 let notes = [];
@@ -2878,7 +2878,8 @@ function bindBtnToggleSidebarNotes() {
     $(document).on('click', '#btnToggleSidebarNotes', function() {
         $(this).toggleClass('toggled');
 
-        if($(this).hasClass('toggled')) {
+        if ($(this).hasClass('toggled')) {
+            collapseSidebarIssueDetail();
             if(!$('.sidebar').is(':visible')) {
                 expandSidebarNotes();
                 $('body').addClass('vitro-sidebar-notes-expanded');
@@ -2891,7 +2892,8 @@ function bindBtnToggleSidebarNotes() {
 }
 
 function expandSidebarNotes() {
-    context.initIssueList();
+    const searchCriterion = window.searchCriterionList ? window.searchCriterionList : [];
+    context.initIssueList(true, searchCriterion);
 
     if ($('#btnCreateNotes').hasClass('toggled')) {
         $('#btnCreateNotes').removeClass('toggled');
@@ -3177,6 +3179,9 @@ function initTreeViewPanelResizable() {
         minWidth: 150
     });
 }
+const EVENT_SEARCH_ISSUE_LIST = 'vitro.search.issue.list';
+const EVENT_ISSUE_LIST_REFRESH = 'vitro.issue.list.refresh';
+
 var canvas = document.getElementById('canvasContainer');
 window.dxfViewer = new Viewer(canvas, null);
 
@@ -3244,7 +3249,7 @@ function KeyDown(event) {
     const code = event.code;
     if (code == 'Delete') {
         const selectedId = window.dxfViewer.GetSelectedHandle();
-        if (selectedId) {initi
+        if (selectedId) {
             const drawable = window.dxfViewer.GetDrawable(selectedId);
             if (drawable?.drawMode === DrawMode.ANNOTATIONS) {
                 window.dxfViewer.DeleteDrawable(selectedId);
@@ -3376,16 +3381,23 @@ function bindUpdatePage() {
     }
 }
 
+function refreshIssueList() {
+    const event = new CustomEvent(EVENT_ISSUE_LIST_REFRESH, { detail: {} });
+    window.dispatchEvent(event);
+}
+
 function updatePage(e) {
     const item = e.detail.itemList[0];
     const markup = item.fieldValueMap.markup;
-    context.initIssueList(true);
+    const searchCriterion = window.searchCriterionList ? window.searchCriterionList : [];
+    context.initIssueList(true, searchCriterion);
     anno.RemoveLabels();
     removeNewAnnotations();
 
     if (e.type === context.deleteIssueEvent && markup) {
         const selectedId = item.fieldValueMap.item_id;
         deleteNote(selectedId);
+        refreshIssueList();
     }
 
     if (e.type === context.updateIssueEvent && markup) {
@@ -3439,15 +3451,20 @@ function getCurrentSpaceHandle() {
 }
 
 function onSelectAnnotation(id) {
-    if (context.selectIssue) {
-        context.selectIssue(id, true);
-    }
     zoomToAnnotation(id);
 
     if (!$('#btnToggleSidebarNotes').hasClass('toggled')) {
         $('#btnToggleSidebarNotes').addClass('toggled');
         expandSidebarNotes();
     }
+    if (context.selectIssue) {
+        const interval = setInterval(() => {
+            if ($('.sidebar').find('.vitro-viewer-issue-list').length) {
+                context.selectIssue(id, true);
+                clearInterval(interval);
+            }
+        }, 50);        
+    }
     updateCanvasContainerWidth();
 }
 
@@ -3466,6 +3483,9 @@ function switchSpace(space) {
 
     if (layout) {
         window.dxfViewer.SwitchSpace(layout);
+
+        refreshMarkupList();
+
         dxfViewer.ZoomTo(dxfViewer.GetSpace(dxfViewer.spaceName).scene);
         dxfViewer.DoFakeZoomToRedrawScene();
         anno.RemoveLabels();
@@ -3636,6 +3656,42 @@ function updateCanvasContainerWidth() {
     $('#canvasContainer').css('width', `calc(100% - ${insetStart + insetEnd}px)`);
     $('#canvasContainer').css('inset-inline-start', `${insetStart}px`);
     $('#canvasContainer').css('inset-inline-end', `${insetEnd}px`);
+}
+
+function bindUpdateDocumentMarkupList() {
+    window.removeEventListener(context.searchIssueListEvent, updateDocumentMarkupList);
+    window.addEventListener(context.searchIssueListEvent, updateDocumentMarkupList);
+}
+
+function updateDocumentMarkupList(e) {
+    removeAllMarkups();
+    context.issueList = e.detail.issueList;
+    reinitMarkupList();
+    anno.UpdateLabelPosition();
+}
+
+function removeAllMarkups() {
+    context.issueList?.forEach(item => {
+        deleteNote(item.id);
+    });
+    anno.RemoveLabels();
+}
+
+function refreshMarkupList() {
+    removeAllMarkups();
+    reinitMarkupList();
+}
+
+function reinitMarkupList() {
+    const currentSpaceHandle = getCurrentSpaceHandle();
+
+    if (context.issueList && context.issueList.length) {
+        $.each(context.issueList, function (index, note) {
+            if (note.markup) {
+                initNote(note, currentSpaceHandle);
+            }
+        });
+    }
 }
 $(document).ready(function () {
 	bindBtnToggleSidebarNotes();
@@ -3660,6 +3716,7 @@ $(document).ready(function () {
 	bindSelectList();
 	bindScaleSelectChange();
 	bindPanelResize();
+	bindUpdateDocumentMarkupList();
 });
 
 var userLocale =

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.209",
+    value: "resource/pdfViewer/js/pdf.worker.js?version=1.1.211",
     kind: OptionKind.WORKER
   }
 };
@@ -36804,7 +36804,7 @@ function btnComparePanelOnClickHandler(btn) {
     } else {
         btn.attr('title', lbl_openPanel);
     }
-    $('#сomparePanel').toggle();
+    $('#comparePanel').toggle();
 }
 
 function btnZoomOnClickHandler() {
@@ -37059,11 +37059,11 @@ function loadDocumentB() {
 }
 
 function createComparePanel(compareObjList) {
-    var wrap = $('<div id="сomparePanel" class="compare-panel"/>');
+    var wrap = $('<div id="comparePanel" class="compare-panel"/>');
     var header = $('<div class="compare-panel_header" >Compared Documents</div>');
     var btnComparePanelClose = $('<span class="close" title="'+lbl_closePanel+'"></span>');
     btnComparePanelClose.on('click', function() {
-        $('#сomparePanel').hide();
+        $('#comparePanel').hide();
         $('#comparePanelVisibility').toggleClass('active');
     });
     header.append(btnComparePanelClose);
@@ -37405,6 +37405,9 @@ var label_deleteMeasure = context.createLocale('app.viewer.pdf.contextMenu.delet
 var label_cancel = context.createLocale('app.viewer.pdf.contextMenu.cancel');
 var label_createAnnotation = context.createLocale('app.viewer.pdf.contextMenu.addNote');
 var label_measures2PointHint = context.createLocale('app.viewer.pdf.measures.twoPointHint');
+const EVENT_SEARCH_ISSUE_LIST = 'vitro.search.issue.list';
+const EVENT_ISSUE_LIST_REFRESH = 'vitro.issue.list.refresh';
+const EVENT_ISSUE_LIST_SELECT_ITEM = 'vitro.issue.list.select.item';
 
 function initContextMenuCanvas() {
     var pages = '#viewer .page:not(.has-new-svg)';
@@ -37663,11 +37666,11 @@ function createCompareViewer(compareObjList) {
 }
 
 function createComparePanel(compareObjList) {
-    var wrap = $('<div id="�omparePanel" class="compare-panel"/>');
+    var wrap = $('<div id="comparePanel" class="compare-panel"/>');
     var header = $(`<div class="compare-panel_header" >${context.createLocale('app.viewer.pdf.compare.panel.title')}</div>`);
     var btnComparePanelClose = $('<span class="close" title="' + lbl_closePanel + '"></span>');
     btnComparePanelClose.on('click', function () {
-        $('#�omparePanel').hide();
+        $('#comparePanel').hide();
         $('#comparePanelVisibility').toggleClass('active');
     });
     header.append(btnComparePanelClose);
@@ -37718,7 +37721,7 @@ function bindBtnDoCompare() {
         if ($(this).hasClass('disabled')) {
             return false;
         } else {
-            hideDlgOverlay();            
+            hideDlgOverlay();
 
             doCompare(compareObjList);
         }
@@ -37758,7 +37761,7 @@ function isComparedDocumentCurrentOpened(url) {
     let loadedVersion = context.fileVersionList.find(item => item.id == loadedVersionId);
     if (context.file.id === itemId && loadedVersion.name === version) {
         return true;
-    } 
+    }
 
     return false;
 }
@@ -37855,10 +37858,12 @@ function bindBtnToggleSidebarNotes() {
                 if ($('#btnDrawAnnotation').hasClass('toggled')) {
                     $('#btnDrawAnnotation').click();
                 }
-                context.initIssueList();
+                if (!$('.body__sidebar').find('.vitro-viewer-issue-list').length) {
+                    context.initIssueList();
+                }
                 $('#outerContainer').addClass('sidebarNotesOpen');
                 setContainerInset($('.body__sidebar').width());
-				expandSidebarNotes();
+                expandSidebarNotes();
             }
         } else {
             $('#outerContainer').removeClass('sidebarNotesOpen');
@@ -37908,7 +37913,7 @@ function showNoteDesc(note) {
                 }
             }, 100);
         }
-    } 
+    }
 }
 
 function isIssueInSidebarNoteExist(noteId) {
@@ -37946,16 +37951,57 @@ function initMarkupData(issue) {
     return null;
 }
 
+function bindUpdateDocumentMarkupList() {
+    window.addEventListener(EVENT_SEARCH_ISSUE_LIST, updateDocumentMarkupList);
+}
+
+function updateDocumentMarkupList(e) {
+    const pageCount = getPdfPageCount();
+    context.issueList = e.detail.issueList;
+    for (let i = 1; i <= pageCount; i++) {
+        if (isPageRendered(i)) {
+            removePageAllNotes(i);
+            resetPageSketchpad(i);
+            if (e.detail.issueList && e.detail.issueList.length) {
+                initMarkupList(e.detail.issueList, i);
+            }
+        }
+    }
+}
+
+function resetPageSketchpad(pageNr) {
+    const sketchpadSvgSelector = '#svgsketch-' + pageNr + ' > svg';
+    const pageSketchpad = $(sketchpadSvgSelector);
+    if (pageSketchpad.length) {
+        $(sketchpadSvgSelector + ' > ellipse').remove();
+        $(sketchpadSvgSelector + ' > path').remove();
+        $(sketchpadSvgSelector + ' > polygon').remove();
+        $(sketchpadSvgSelector + ' > cloud').remove();
+        $(sketchpadSvgSelector + ' > line').remove();
+        $(sketchpadSvgSelector + ' > arrow').remove();
+        $(sketchpadSvgSelector + ' > rect:not(#surface-' + pageNr + ')').remove();
+    }
+    drawNodes = {};
+}
+
+function isPageRendered(pageNr) {
+    return $('.page[data-page-number="' + pageNr + '"]').find('.canvasWrapper')?.length;
+}
+
 function doInitNotesByPageNr(pageNr) {
-    context.getIssueList().then(list => {
-        $.each(list, function (index, issue) {
+    initMarkupList(context.issueList, pageNr);
+}
+
+function initMarkupList(issueList, pageNr) {
+    if (issueList && issueList.length) {
+        $.each(issueList, function (index, issue) {
             let markup = initMarkupData(issue);
             if (markup && markup.pageNr == pageNr) {
                 createNote(pageNr, index, issue);
                 loadSvgShape(markup.svg);
             }
         });
-    });
+    }
 }
 
 function removePageAllNotes(pageNr) {
@@ -38023,17 +38069,14 @@ function createNote(pageNr, index, issue) {
 }
 
 function highlightSidebarNote(noteId) {
-    $('.body__sidebar-note-wrap').removeClass('active');
-    $('.body__sidebar-content').children().removeClass('vitro-active');
     var notetWrap = $('#vitro-issue-tile-' + noteId);
-    notetWrap.addClass('vitro-active');
     autosize(notetWrap.find('textarea'));
-    var sidebarContent = $('.body__sidebar-content');
-    var sidebarOffsetTop = parseInt(sidebarContent[0].offsetTop);
-    var sidebarScrollTop = parseInt(sidebarContent[0].scrollTop);
-    sidebarContent.animate({
-        scrollTop: notetWrap.position().top - sidebarOffsetTop + sidebarScrollTop
-    }, 1000);
+    selectIssueListItem(noteId);
+}
+
+function selectIssueListItem(itemId) {
+    const event = new CustomEvent(EVENT_ISSUE_LIST_SELECT_ITEM, { detail: { itemId: itemId } });
+    window.dispatchEvent(event);
 }
 
 function getNoteCreator() {
@@ -38175,15 +38218,22 @@ function bindUpdatePage() {
     }
 }
 
+function refreshIssueList() {
+    const event = new CustomEvent(EVENT_ISSUE_LIST_REFRESH, { detail: {} });
+    window.dispatchEvent(event);
+}
+
 function updatePage(e) {
     const item = e.detail.itemList[0];
     const markup = JSON.parse(item.fieldValueMap.markup);
     const page = markup ? markup.pageNr : null;
+    let updateContextIssueList = false;
 
     if (e.type === context.deleteIssueEvent && markup) {
         const markupData = { id: item.fieldValueMap.item_id, pageNr: page };
         removeSvg(markupData);
-        context.initIssueList();
+        context.issueList = context.issueList?.filter(itm => itm.id !== item.fieldValueMap.item_id);
+        refreshIssueList();
     }
 
     if (e.type === context.updateIssueEvent && markup) {
@@ -38199,14 +38249,25 @@ function updatePage(e) {
             detail: {
                 itemIdList: [itemId],
                 listId: item.listId
-            }});
+            }
+        });
         window.dispatchEvent(event);
+        refreshIssueList();
+        updateContextIssueList = true;
     }
 
     removeNewSvg();
 
     if (page) {
-        initNotesByPageNr(page);
+        if (updateContextIssueList) {
+            const searchCriterion = window.searchCriterionList ? window.searchCriterionList : [];
+            context.getIssueList(searchCriterion).then(list => {
+                context.issueList = list;
+                initNotesByPageNr(page);
+            });
+        } else {
+            initNotesByPageNr(page);
+        }
     }
 
     if ($('#btnDrawAnnotation').hasClass('toggled')) {
@@ -38230,7 +38291,7 @@ function initBtnDrawAnnotation() {
                 $('#cursorSelectTool').click();
             }
             untoggleBtnsMeasure();
-            hideMeasureToolbar();	
+            hideMeasureToolbar();
             activateDrawAnnotation();
         } else {
             if (!isHandToolActive) {
@@ -38440,7 +38501,7 @@ function endDragMeasure(event, pageNr) {
 
     drawStart = null;
     event.preventDefault();
-}	
+}
 
 function setDlgMeasureSettingsScale(scale) {
     let child = $('#measuresScaleList').children().toArray().find(child => $(child).attr('value') === scale);
@@ -38487,6 +38548,57 @@ function setContainerInset(width) {
     } else {
         $('#viewerContainer').css('inset-inline-end', 0);
     }
+}
+
+function removeSvg(svgData) {
+    if (drawNodes[svgData.id] && drawNodes[svgData.id].nodeObj) {
+        sketchpad[svgData.pageNr].remove(drawNodes[svgData.id].nodeObj);
+        delete drawNodes[svgData.id];
+    } else {
+        $('svg-' + svgData.id).remove();
+    }
+}
+
+function initNotes() {
+    const searchCriterion = window.searchCriterionList ? window.searchCriterionList : [];
+    //$(document).on('webViewerPageRendered', function (e, pageNr) {
+    //    if (context.issueList) {
+    //        initNotesByPageNr(pageNr);
+    //        if (isSketchpadActive) {
+    //            $('.svgsketch-wrap').addClass('active');
+    //        }
+    //    } else {
+    //        context.getIssueList(searchCriterion).then(list => {
+    //            context.issueList = list;
+    //            initNotesByPageNr(pageNr);
+    //            if (isSketchpadActive) {
+    //                $('.svgsketch-wrap').addClass('active');
+    //            }
+    //        });
+    //    }
+    //});
+    const renderedPageList = [];
+
+    context.getIssueList(searchCriterion).then(list => {
+        context.issueList = list;
+        $(document).on('webViewerPageRendered', function (e, pageNr) {
+            renderedPageList.push(pageNr);
+            initMarkupByPageNr(pageNr);
+        });
+        const pageLoaded = $('.page[data-loaded="true"]');
+        pageLoaded?.each((index, item) => {
+            if (!renderedPageList.includes(item.attr('data-page-number'))) {
+                initMarkupByPageNr(pageNr);
+            }
+        });
+    });
+}
+
+function initMarkupByPageNr(pageNr) {
+    initNotesByPageNr(pageNr);
+    if (isSketchpadActive) {
+        $('.svgsketch-wrap').addClass('active');
+    }
 }
 $(document).ready(function() {
     context.openFile();
@@ -38510,6 +38622,7 @@ $(document).ready(function() {
 
     bindUpdatePage();
     bindSelectList();
+    bindUpdateDocumentMarkupList();
 
     initZoomPage();
     initCompare();

package/css/std/controls/command-menu/img/collapse-up.svg

@@ -1,3 +0,0 @@
-<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.5 16.5L12 9L19.5 16.5" stroke="#4A556C" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

package/css/std/controls/command-menu/img/dropdown-menu-arrow.svg

@@ -1 +0,0 @@
-<svg viewBox='0 0 44 42' fill='none' xmlns='http://www.w3.org/2000/svg'><g filter='url(#filter0_dd_778_105705)'><path d='M20.3117 11.6584C21.0973 10.4213 22.9027 10.4213 23.6883 11.6584L29.5752 20.9278C30.4208 22.2593 29.4642 24 27.8869 24H16.1131C14.5358 24 13.5792 22.2593 14.4248 20.9278L20.3117 11.6584Z' fill='white'/></g><defs><filter id='filter0_dd_778_105705' x='0.109375' y='0.730469' width='43.7812' height='41.2695' filterUnits='userSpaceOnUse' color-interpolation-filters='sRGB'><feFlood flood-opacity='0' result='BackgroundImageFix'/><feColorMatrix in='SourceAlpha' type='matrix' values='0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0' result='hardAlpha'/><feOffset dy='4'/><feGaussianBlur stdDeviation='7'/><feComposite in2='hardAlpha' operator='out'/><feColorMatrix type='matrix' values='0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.18 0'/><feBlend mode='normal' in2='BackgroundImageFix' result='effect1_dropShadow_778_105705'/><feColorMatrix in='SourceAlpha' type='matrix' values='0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0' result='hardAlpha'/><feOffset/><feGaussianBlur stdDeviation='2'/><feComposite in2='hardAlpha' operator='out'/><feColorMatrix type='matrix' values='0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.14 0'/><feBlend mode='normal' in2='effect1_dropShadow_778_105705' result='effect2_dropShadow_778_105705'/><feBlend mode='normal' in='SourceGraphic' in2='effect2_dropShadow_778_105705' result='shape'/></filter></defs></svg>