@vitrosoftware/common-ui-ts 1.1.208 → 1.1.210

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.208",
+    value: "resource/pdfViewer/js/pdf.worker.js?version=1.1.210",
     kind: OptionKind.WORKER
   }
 };
@@ -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)';
@@ -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/button-cancel/button-cancel.css

@@ -1,13 +0,0 @@
-.vitro-button-cancel {
-    cursor: pointer;
-    background: #fff !important;
-    color: #222D44 !important;
-    border: 1px solid #E4E6EC !important;
-    font-family: 'InterRegular' !important;
-}
-
-.vitro-button-cancel:hover, 
-.vitro-button-cancel:active,
-.vitro-button-cancel:focus {
-    background: #F3F8FF !important;
-}