@digabi/exam-engine-core 20.4.2 → 21.0.0-alpha.0

package/dist/components/grading/examAnnotationUtils.js

@@ -1,18 +1,30 @@
 import { textAnnotationFromRange } from './editAnnotations';
 export function onMouseDownForAnnotation(e, mouseUpCallback) {
-    function onMouseUpAfterAnswerMouseDown(e) {
-        const target = e.target;
+    function onMouseUpAfterAnswerMouseDown() {
+        var _a, _b;
         window.removeEventListener('mouseup', onMouseUpAfterAnswerMouseDown);
-        // Text annotation
+        /**
+         * selection.anchorNode = where mouse is pressed down (chronologically first)
+         * selection.getRangeAt(0).startContainer = where selection starts (first in DOM)
+         */
         const selection = window.getSelection();
-        if (selection && hasTextSelectedInAnswerText()) {
-            const range = selection.getRangeAt(0);
-            const position = textAnnotationFromRange(target, range);
-            if (!position) {
-                return;
+        const startNode = (_a = selection === null || selection === void 0 ? void 0 : selection.anchorNode) === null || _a === void 0 ? void 0 : _a.parentElement;
+        const endNode = (_b = selection === null || selection === void 0 ? void 0 : selection.focusNode) === null || _b === void 0 ? void 0 : _b.parentElement;
+        if (selection && startNode && endNode && selection.toString().length > 0) {
+            const hasMarks = selectionContainsNonhiddenMarks(selection);
+            const startNodedisplayNumber = getDisplayNumber(startNode);
+            const endNodeDisplayNumber = getDisplayNumber(endNode);
+            if (startNodedisplayNumber === endNodeDisplayNumber &&
+                isAnnotatable(startNode) &&
+                isAnnotatable(endNode) &&
+                !hasMarks) {
+                const annotations = extractAnnotationsFromSelection(selection);
+                mouseUpCallback({
+                    annotationParts: annotations,
+                    displayNumber: startNodedisplayNumber,
+                    selectedText: annotations.map(a => a.selectedText).join(' ')
+                });
             }
-            const selectedText = selection.toString();
-            mouseUpCallback({ ...position, selectedText });
         }
     }
     // Do annotations only with left mouse buttons
@@ -21,31 +33,72 @@ export function onMouseDownForAnnotation(e, mouseUpCallback) {
     }
     window.addEventListener('mouseup', onMouseUpAfterAnswerMouseDown);
 }
-export function hasTextSelectedInAnswerText() {
-    const selection = window.getSelection();
-    return (selection !== null &&
-        selectionInAnswerText(selection) &&
-        (isRangeSelection(selection) || textSelectedInRange(selection)));
-    function selectionInAnswerText(sel) {
-        if (sel.type === 'None' || sel.type === 'Caret' || sel.rangeCount === 0) {
-            return false;
-        }
-        const startContainer = sel.getRangeAt(0).startContainer;
-        const endContainer = sel.getRangeAt(0).endContainer;
-        const startParent = startContainer.parentElement;
-        const endParent = endContainer.parentElement;
-        const visibleMarkTagExistsInSelection = Array.from(sel.getRangeAt(0).cloneContents().children).some(child => child.tagName === 'MARK' && child.getAttribute('data-hidden') === 'false');
-        return (sel.rangeCount > 0 &&
-            startParent === endParent &&
-            (startParent === null || startParent === void 0 ? void 0 : startParent.tagName) !== 'MARK' &&
-            !visibleMarkTagExistsInSelection);
-    }
-    function isRangeSelection(sel) {
-        return (sel === null || sel === void 0 ? void 0 : sel.type) === 'Range';
+const selectionContainsNonhiddenMarks = (selection) => {
+    const rangeChildren = Array.from(selection === null || selection === void 0 ? void 0 : selection.getRangeAt(0).cloneContents().children);
+    const childIsNonHiddenMark = rangeChildren === null || rangeChildren === void 0 ? void 0 : rangeChildren.some(child => child.tagName === 'MARK' && child.getAttribute('data-hidden') === 'false');
+    const childContainsNonHiddenMark = rangeChildren.some(child => child.querySelector('mark[data-hidden="false"]'));
+    return childIsNonHiddenMark || childContainsNonHiddenMark;
+};
+const getDisplayNumber = (node) => { var _a; return (_a = node === null || node === void 0 ? void 0 : node.closest('div[data-annotation-anchor]')) === null || _a === void 0 ? void 0 : _a.getAttribute('data-annotation-anchor'); };
+const isAnnotatable = (node) => (node === null || node === void 0 ? void 0 : node.getAttribute('data-annotation-path')) && node.tagName !== 'MARK';
+const extractAnnotationsFromSelection = (selection) => {
+    var _a, _b;
+    const range = selection.getRangeAt(0);
+    const rangeChildren = Array.from(selection === null || selection === void 0 ? void 0 : selection.getRangeAt(0).cloneContents().children);
+    const firstSelectedNodeInDOM = range.startContainer.parentElement;
+    if (!(rangeChildren === null || rangeChildren === void 0 ? void 0 : rangeChildren.length)) {
+        // selection is plain text
+        const annotationAnchor = (_b = (_a = selection === null || selection === void 0 ? void 0 : selection.focusNode) === null || _a === void 0 ? void 0 : _a.parentElement) === null || _b === void 0 ? void 0 : _b.getAttribute('data-annotation-path');
+        const startAndLength = textAnnotationFromRange(firstSelectedNodeInDOM, range);
+        return [
+            {
+                annotationAnchor,
+                selectedText: (selection === null || selection === void 0 ? void 0 : selection.toString()) || '',
+                startIndex: (startAndLength === null || startAndLength === void 0 ? void 0 : startAndLength.startIndex) || 0,
+                length: (startAndLength === null || startAndLength === void 0 ? void 0 : startAndLength.length) || 0
+            }
+        ];
     }
-    function textSelectedInRange(sel) {
-        const range = sel === null || sel === void 0 ? void 0 : sel.getRangeAt(0);
-        return !!sel.rangeCount && range.toString().length > 0;
+    else {
+        // selection is in multiple elements
+        const annotations = rangeChildren === null || rangeChildren === void 0 ? void 0 : rangeChildren.reduce((acc, child, index, arr) => {
+            var _a;
+            const childsAnnotationPath = child.getAttribute('data-annotation-path');
+            const isLastRangeChild = index === arr.length - 1;
+            if (childsAnnotationPath) {
+                // child is a text node, like <span> text </span>
+                const newElement = {
+                    annotationAnchor: childsAnnotationPath,
+                    selectedText: child.textContent || '',
+                    startIndex: index === 0 ? range.startOffset : 0,
+                    length: isLastRangeChild ? range.endOffset : ((_a = child.textContent) === null || _a === void 0 ? void 0 : _a.length) || 0
+                };
+                return [...acc, newElement];
+            }
+            else {
+                // child is a node with children, like <b> <span> text </span> </b>
+                const allChildrenWithAnnotationPath = child.querySelectorAll('[data-annotation-path]');
+                allChildrenWithAnnotationPath === null || allChildrenWithAnnotationPath === void 0 ? void 0 : allChildrenWithAnnotationPath.forEach((grandChild, kidIndex) => {
+                    var _a;
+                    const dataAnnotationPath = grandChild.getAttribute('data-annotation-path');
+                    if (dataAnnotationPath) {
+                        const isFirstOfAll = index === 0 && kidIndex === 0;
+                        const isLastGrandChild = kidIndex === allChildrenWithAnnotationPath.length - 1;
+                        const isLastOfAll = isLastRangeChild && isLastGrandChild;
+                        const startAndLength = textAnnotationFromRange(firstSelectedNodeInDOM, range);
+                        const newElement = {
+                            annotationAnchor: dataAnnotationPath,
+                            selectedText: grandChild.textContent || '',
+                            startIndex: isFirstOfAll ? (startAndLength === null || startAndLength === void 0 ? void 0 : startAndLength.startIndex) || 0 : 0,
+                            length: isLastOfAll ? range.endOffset : ((_a = grandChild.textContent) === null || _a === void 0 ? void 0 : _a.length) || 0
+                        };
+                        acc.push(newElement);
+                    }
+                });
+                return acc;
+            }
+        }, []);
+        return annotations;
     }
-}
+};
 //# sourceMappingURL=examAnnotationUtils.js.map

package/dist/components/grading/examAnnotationUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"examAnnotationUtils.js","sourceRoot":"","sources":["../../../src/components/grading/examAnnotationUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"examAnnotationUtils.js","sourceRoot":"","sources":["../../../src/components/grading/examAnnotationUtils.ts"],"names":[],"mappings":"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"}

package/dist/components/grading-instructions/GradingInstructions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GradingInstructions.d.ts","sourceRoot":"","sources":["../../../src/components/grading-instructions/GradingInstructions.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgC,MAAM,OAAO,CAAA;AACpD,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AA6I/D,eAAO,MAAM,4BAA4B,EAAE,KAAK,CAAC,iBAGhD,CAAA;;AAED,wBAAqE"}
+{"version":3,"file":"GradingInstructions.d.ts","sourceRoot":"","sources":["../../../src/components/grading-instructions/GradingInstructions.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgC,MAAM,OAAO,CAAA;AAcpD,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AA8H/D,eAAO,MAAM,4BAA4B,EAAE,KAAK,CAAC,iBAGhD,CAAA;;AAED,wBAAqE"}

package/dist/components/grading-instructions/GradingInstructions.js

@@ -1,36 +1,35 @@
 import React, { useContext, useEffect } from 'react';
-import { CommonExamContext, withCommonExamContext } from '../context/CommonExamContext';
-import { useCached } from '../../useCached';
-import { changeLanguage, initI18n, useExamTranslation } from '../../i18n';
-import { scrollToHash } from '../../scrollToHash';
 import { I18nextProvider } from 'react-i18next';
-import Section from './Section';
-import SectionTitle from './SectionTitle';
-import Question from './Question';
-import File from '../shared/File';
-import ExamGradingInstruction from './ExamGradingInstruction';
-import AutogradedAnswer from './AutogradedAnswer';
-import Image from '../shared/Image';
-import Formula from '../shared/Formula';
-import AutogradedAnswerOption from './AutogradedAnswerOption';
-import QuestionTitle from './QuestionTitle';
 import { createRenderChildNodes } from '../../createRenderChildNodes';
+import { findChildElement, queryAncestors } from '../../dom-utils';
+import { changeLanguage, initI18n, useExamTranslation } from '../../i18n';
 import { examTitleId } from '../../ids';
+import { scrollToHash } from '../../scrollToHash';
+import { useCached } from '../../useCached';
 import DocumentTitle from '../DocumentTitle';
-import SectionElement from '../SectionElement';
-import { findChildElement, queryAncestors } from '../../dom-utils';
-import { renderIf } from '../RenderIf';
 import RenderExamElements from '../RenderExamElements';
-import { mkTableOfContents } from '../shared/TableOfContents';
-import AnswerGradingInstruction from './AnswerGradingInstruction';
+import { renderIf } from '../RenderIf';
+import SectionElement from '../SectionElement';
+import { AnnotationProvider } from '../context/AnnotationProvider';
+import { CommonExamContext, withCommonExamContext } from '../context/CommonExamContext';
+import QuestionInstruction from '../exam/QuestionInstruction';
 import mkAttachmentLink from '../shared/AttachmentLink';
 import mkAttachmentLinks from '../shared/AttachmentLinks';
-import Recording from './Recording';
-import QuestionInstruction from '../exam/QuestionInstruction';
-import { QuestionNumber } from '../shared/QuestionNumber';
 import ExamTranslation from '../shared/ExamTranslation';
-import { AnnotationProvider } from '../context/AnnotationProvider';
-import { AnnotationPopup } from '../shared/AnnotationPopup';
+import File from '../shared/File';
+import Formula from '../shared/Formula';
+import Image from '../shared/Image';
+import { QuestionNumber } from '../shared/QuestionNumber';
+import { mkTableOfContents } from '../shared/TableOfContents';
+import AnswerGradingInstruction from './AnswerGradingInstruction';
+import AutogradedAnswer from './AutogradedAnswer';
+import AutogradedAnswerOption from './AutogradedAnswerOption';
+import ExamGradingInstruction from './ExamGradingInstruction';
+import Question from './Question';
+import QuestionTitle from './QuestionTitle';
+import Recording from './Recording';
+import Section from './Section';
+import SectionTitle from './SectionTitle';
 const renderIfWithinGradingInstructionContent = renderIf(({ element }) => queryAncestors(element, [
     // Keep in sync with lists in mastering/index.ts
     'answer-grading-instruction',
@@ -88,7 +87,6 @@ const GradingInstructions = ({ doc, annotations, onClickAnnotation, onSaveAnnota
     return (React.createElement(AnnotationProvider, { annotations: annotations, onClickAnnotation: onClickAnnotation, onSaveAnnotation: onSaveAnnotation },
         React.createElement(I18nextProvider, { i18n: i18n },
             React.createElement("main", { className: "e-exam e-grading-instructions", lang: subjectLanguage },
-                React.createElement(AnnotationPopup, null),
                 React.createElement(React.StrictMode, null),
                 React.createElement(SectionElement, { "aria-labelledby": examTitleId },
                     React.createElement(DocumentTitle, { id: examTitleId },

package/dist/components/grading-instructions/GradingInstructions.js.map

@@ -1 +1 @@
-{"version":3,"file":"GradingInstructions.js","sourceRoot":"","sources":["../../../src/components/grading-instructions/GradingInstructions.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"GradingInstructions.js","sourceRoot":"","sources":["../../../src/components/grading-instructions/GradingInstructions.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAClE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,aAAa,MAAM,kBAAkB,CAAA;AAC5C,OAAO,kBAAkB,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,cAAc,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AAClE,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AAEvF,OAAO,mBAAmB,MAAM,6BAA6B,CAAA;AAC7D,OAAO,gBAAgB,MAAM,0BAA0B,CAAA;AACvD,OAAO,iBAAiB,MAAM,2BAA2B,CAAA;AACzD,OAAO,eAAe,MAAM,2BAA2B,CAAA;AACvD,OAAO,IAAI,MAAM,gBAAgB,CAAA;AACjC,OAAO,OAAO,MAAM,mBAAmB,CAAA;AACvC,OAAO,KAAK,MAAM,iBAAiB,CAAA;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,wBAAwB,MAAM,4BAA4B,CAAA;AACjE,OAAO,gBAAgB,MAAM,oBAAoB,CAAA;AACjD,OAAO,sBAAsB,MAAM,0BAA0B,CAAA;AAC7D,OAAO,sBAAsB,MAAM,0BAA0B,CAAA;AAC7D,OAAO,QAAQ,MAAM,YAAY,CAAA;AACjC,OAAO,aAAa,MAAM,iBAAiB,CAAA;AAC3C,OAAO,SAAS,MAAM,aAAa,CAAA;AACnC,OAAO,OAAO,MAAM,WAAW,CAAA;AAC/B,OAAO,YAAY,MAAM,gBAAgB,CAAA;AAEzC,MAAM,uCAAuC,GAAG,QAAQ,CACtD,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CACd,cAAc,CAAC,OAAO,EAAE;IACtB,gDAAgD;IAChD,4BAA4B;IAC5B,sBAAsB;IACtB,wBAAwB;IACxB,0BAA0B;IAC1B,8BAA8B;IAC9B,MAAM;IACN,gBAAgB;IAChB,sBAAsB;CACvB,CAAC,IAAI,IAAI,CACb,CAAA;AAED,MAAM,iCAAiC,GAAG,QAAQ,CAChD,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,mBAAmB,CAAC,CAAC,IAAI,IAAI,CACxE,CAAA;AAED,MAAM,gBAAgB,GAAG,sBAAsB,CAAC;IAC9C,iBAAiB,EAAE,sBAAsB;IACzC,UAAU,EAAE,kBAAkB;IAC9B,iBAAiB,EAAE,iCAAiC,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAC/E,kBAAkB,EAAE,iCAAiC,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACjF,KAAK,EAAE,SAAS;IAChB,aAAa,EAAE,kBAAkB;IACjC,eAAe,EAAE,gBAAgB;IACjC,sBAAsB,EAAE,sBAAsB;IAC9C,iBAAiB,EAAE,gBAAgB;IACnC,wBAAwB,EAAE,sBAAsB;IAChD,mBAAmB,EAAE,kBAAkB;IACvC,IAAI,EAAE,uCAAuC,CAAC,IAAI,CAAC;IACnD,OAAO,EAAE,uCAAuC,CAAC,OAAO,CAAC;IACzD,KAAK,EAAE,kBAAkB;IACzB,KAAK,EAAE,uCAAuC,CAAC,KAAK,CAAC;IACrD,QAAQ,EAAE,QAAQ;IAClB,gBAAgB,EAAE,aAAa;IAC/B,sBAAsB,EAAE,mBAAmB;IAC3C,8BAA8B,EAAE,wBAAwB;IACxD,iBAAiB,EAAE,cAAc;IACjC,WAAW,EAAE,eAAe;IAC5B,oBAAoB,EAAE,gBAAgB;IACtC,aAAa,EAAE,gBAAgB;IAC/B,OAAO,EAAE,OAAO;IAChB,eAAe,EAAE,YAAY;IAC7B,KAAK,EAAE,SAAS;CACjB,CAAC,CAAA;AAEF,MAAM,mBAAmB,GAA+D,CAAC,EACvF,GAAG,EACH,WAAW,EACX,iBAAiB,EACjB,gBAAgB,EACjB,EAAE,EAAE;IACH,MAAM,IAAI,GAAG,GAAG,CAAC,eAAe,CAAA;IAChC,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAA;IAE/G,MAAM,SAAS,GAAG,gBAAgB,CAAC,IAAI,EAAE,YAAY,CAAC,CAAA;IACtD,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,IAAI,EAAE,0BAA0B,CAAC,CAAA;IACjF,MAAM,eAAe,GAAG,gBAAgB,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAA;IACnE,MAAM,eAAe,GAAG,iBAAiB,CAAC;QACxC,yBAAyB,EAAE,KAAK;QAChC,mBAAmB,EAAE,KAAK;QAC1B,WAAW,EAAE,KAAK;KACnB,CAAC,CAAA;IAEF,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAA;IACnE,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAA;IAEzC,SAAS,CAAC,YAAY,EAAE,EAAE,CAAC,CAAA;IAE3B,OAAO,CACL,oBAAC,kBAAkB,IACjB,WAAW,EAAE,WAAW,EACxB,iBAAiB,EAAE,iBAAiB,EACpC,gBAAgB,EAAE,gBAAgB;QAElC,oBAAC,eAAe,IAAC,IAAI,EAAE,IAAI;YACzB,8BAAM,SAAS,EAAC,+BAA+B,EAAC,IAAI,EAAE,eAAe;gBACnE,oBAAC,KAAK,CAAC,UAAU,OAAG;gBACpB,oBAAC,cAAc,uBAAkB,WAAW;oBAC1C,oBAAC,aAAa,IAAC,EAAE,EAAE,WAAW;wBAC5B,oBAAC,4BAA4B,OAAG;;wBAAE,SAAS,IAAI,gBAAgB,CAAC,SAAS,CAAC,CAC5D;oBACf,IAAI,IAAI,CACP;wBACE,oCAAS,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAU,CAC/C,CACL;oBACA,sBAAsB,IAAI,CACzB,oBAAC,sBAAsB,IAAO,OAAO,EAAE,sBAAsB,EAAE,gBAAgB,GAAM,CACtF;oBACA,eAAe,IAAI,CAClB,6BAAK,SAAS,EAAC,oBAAoB;wBACjC,oBAAC,eAAe,IAAO,OAAO,EAAE,eAAe,EAAE,gBAAgB,GAAM,CACnE,CACP,CACc;gBAChB,gBAAgB,CAAC,IAAI,CAAC,CAClB,CACS,CACC,CACtB,CAAA;AACH,CAAC,CAAA;AAED,4FAA4F;AAC5F,MAAM,CAAC,MAAM,4BAA4B,GAA4B,GAAG,EAAE;IACxE,MAAM,EAAE,CAAC,EAAE,GAAG,kBAAkB,EAAE,CAAA;IAClC,OAAO,0CAAG,CAAC,CAAC,iCAAiC,CAAC,CAAI,CAAA;AACpD,CAAC,CAAA;AAED,eAAe,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,mBAAmB,CAAC,CAAC,CAAA"}

package/dist/components/shared/AnnotatableText.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
-import { AnnotationContextType } from '../context/AnnotationProvider';
-export declare const AnnotatableText: ({ node, annotationContextData }: {
+import { NewRenderableAnnotation, RenderableAnnotation } from '../../types/Score';
+export declare const AnnotatableText: ({ node }: {
     node: Node;
-    annotationContextData: AnnotationContextType;
-}) => React.JSX.Element;
+}) => string | React.JSX.Element;
+export declare function markText(text: string, annotations: (RenderableAnnotation | NewRenderableAnnotation)[], onClickAnnotation: (e: React.MouseEvent<HTMLElement, MouseEvent>, a: RenderableAnnotation) => void, setNewAnnotationRef: (ref: HTMLElement | undefined) => void): React.ReactNode[];
 //# sourceMappingURL=AnnotatableText.d.ts.map

package/dist/components/shared/AnnotatableText.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AnnotatableText.d.ts","sourceRoot":"","sources":["../../../src/components/shared/AnnotatableText.tsx"],"names":[],"mappings":"AACA,OAAO,KAA4B,MAAM,OAAO,CAAA;AAGhD,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAA;AAMrE,eAAO,MAAM,eAAe,oCAGzB;IACD,IAAI,EAAE,IAAI,CAAA;IACV,qBAAqB,EAAE,qBAAqB,CAAA;CAC7C,sBAqGA,CAAA"}
+{"version":3,"file":"AnnotatableText.d.ts","sourceRoot":"","sources":["../../../src/components/shared/AnnotatableText.tsx"],"names":[],"mappings":"AACA,OAAO,KAAwC,MAAM,OAAO,CAAA;AAE5D,OAAO,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AAQjF,eAAO,MAAM,eAAe,aAAc;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,+BAkCvD,CAAA;AAED,wBAAgB,QAAQ,CACtB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,CAAC,oBAAoB,GAAG,uBAAuB,CAAC,EAAE,EAC/D,iBAAiB,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,CAAC,EAAE,oBAAoB,KAAK,IAAI,EAClG,mBAAmB,EAAE,CAAC,GAAG,EAAE,WAAW,GAAG,SAAS,KAAK,IAAI,qBAyF5D"}

package/dist/components/shared/AnnotatableText.js

@@ -1,64 +1,68 @@
 import { partition } from 'lodash-es';
-import React, { useEffect, useRef } from 'react';
-import { getElementPath, queryAncestors } from '../../dom-utils';
-import { onMouseDownForAnnotation } from '../grading/examAnnotationUtils';
+import React, { useContext, useEffect, useRef } from 'react';
+import { getElementPath } from '../../dom-utils';
+import { AnnotationContext } from '../context/AnnotationProvider';
+import { IsInSidebarContext } from '../context/IsInSidebarContext';
 const isExamAnnotation = (annotation) => 'annotationId' in annotation;
-export const AnnotatableText = ({ node, annotationContextData }) => {
-    const { annotations, onClickAnnotation, setNewAnnotation, setNewAnnotationRef, newAnnotation } = annotationContextData;
+export const AnnotatableText = ({ node }) => {
+    var _a, _b;
+    const annotationContextData = useContext(AnnotationContext);
+    const { isInSidebar } = useContext(IsInSidebarContext);
+    const { annotations, onClickAnnotation, setNewAnnotationRef, newAnnotation } = annotationContextData;
+    const canNotBeAnnotated = (annotationContextData === null || annotationContextData === void 0 ? void 0 : annotationContextData.annotations) === undefined ||
+        ((_a = node.textContent) === null || _a === void 0 ? void 0 : _a.trim().length) === 0 ||
+        isInSidebar !== undefined;
+    if (canNotBeAnnotated) {
+        return node.textContent;
+    }
     const path = getElementPath(node);
-    const newAnnotationForThisNode = (newAnnotation === null || newAnnotation === void 0 ? void 0 : newAnnotation.annotationAnchor) === path ? newAnnotation : null;
-    const thisNodeAnnotations = [
-        ...((annotations === null || annotations === void 0 ? void 0 : annotations[path]) || []),
-        ...(newAnnotationForThisNode ? [newAnnotationForThisNode] : [])
-    ];
-    const mouseUpCallback = (annotation) => {
-        var _a;
-        const displayNumber = ((_a = queryAncestors(node.parentElement, 'question')) === null || _a === void 0 ? void 0 : _a.getAttribute('display-number')) || '';
-        setNewAnnotation({ ...annotation, annotationAnchor: path, displayNumber });
-    };
-    function onMouseDown(e) {
-        const target = e.target;
-        const clickIsInPopup = target.closest('.annotation-popup');
-        if (!clickIsInPopup) {
-            setNewAnnotation(null);
-        }
-        onMouseDownForAnnotation(e, mouseUpCallback);
+    const newAnnotationPartsForThisNode = ((_b = newAnnotation === null || newAnnotation === void 0 ? void 0 : newAnnotation.annotationParts) === null || _b === void 0 ? void 0 : _b.filter(p => p.annotationAnchor === path)) || [];
+    const savedAnnotationsForThisNode = (annotations === null || annotations === void 0 ? void 0 : annotations[path]) || [];
+    const allAnnotationsForThisNode = [...savedAnnotationsForThisNode, ...newAnnotationPartsForThisNode];
+    const textWithoutLineBreaksAndExtraSpaces = node.textContent.replace(/\n/g, ' ').replace(/\s+/g, ' ');
+    return (React.createElement("span", { className: "e-annotatable", key: path, "data-annotation-path": path, "data-testid": path }, allAnnotationsForThisNode.length > 0 && onClickAnnotation
+        ? markText(textWithoutLineBreaksAndExtraSpaces, allAnnotationsForThisNode, onClickAnnotation, setNewAnnotationRef)
+        : textWithoutLineBreaksAndExtraSpaces));
+};
+export function markText(text, annotations, onClickAnnotation, setNewAnnotationRef) {
+    if (annotations.length === 0) {
+        return [text];
     }
-    return (React.createElement("span", { onMouseDown: onMouseDown, className: "e-annotatable", key: path }, (thisNodeAnnotations === null || thisNodeAnnotations === void 0 ? void 0 : thisNodeAnnotations.length) > 0 ? markText(node.textContent, thisNodeAnnotations) : node.textContent));
-    function markText(text, annotations) {
-        if (annotations.length === 0) {
-            return [text];
-        }
-        function getMarkedText(annotation) {
-            return text.substring(annotation.startIndex, annotation.startIndex + annotation.length);
-        }
-        const nodes = [];
-        let lastIndex = 0;
-        annotations.sort((a, b) => a.startIndex - b.startIndex);
-        const [validAnnotations, invalidAnnotations] = partition(annotations, annotation => annotation.startIndex >= 0 && annotation.length > 0 && annotation.selectedText === getMarkedText(annotation));
-        if (invalidAnnotations.length > 0) {
-            console.error('Invalid annotations:', invalidAnnotations, invalidAnnotations.map(a => `selectedText (${a.selectedText}) does not match text picked by startIndex and length (${getMarkedText(a)})`));
+    function getMarkedText(annotation) {
+        return text.substring(annotation.startIndex, annotation.startIndex + annotation.length);
+    }
+    const nodes = [];
+    annotations.sort((a, b) => a.startIndex - b.startIndex);
+    const [validAnnotations, invalidAnnotations] = partition(annotations, annotation => annotation.startIndex >= 0 && annotation.length > 0 && annotation.selectedText === getMarkedText(annotation));
+    if ((invalidAnnotations === null || invalidAnnotations === void 0 ? void 0 : invalidAnnotations.length) > 0) {
+        console.error('Invalid annotations:', invalidAnnotations, invalidAnnotations.map(a => `selectedText (${a.selectedText}) does not match text picked by startIndex and length (${getMarkedText(a)})`));
+    }
+    let lastIndex = 0;
+    const [hiddenAnnotations, visibleAnnotations] = partition(validAnnotations, a => a.hidden);
+    const getKey = (annotation) => isExamAnnotation(annotation) ? annotation.annotationId + annotation.startIndex : annotation.startIndex;
+    hiddenAnnotations.forEach(annotation => {
+        const key = getKey(annotation);
+        nodes.push(React.createElement("mark", { key: key, className: "e-annotation", "data-annotation-id": isExamAnnotation(annotation) ? annotation.annotationId : '', "data-hidden": "true" }));
+    });
+    for (const annotation of visibleAnnotations) {
+        const markedText = getMarkedText(annotation);
+        // Add unmarked text before this mark
+        if (annotation.startIndex > lastIndex) {
+            nodes.push(text.substring(lastIndex, annotation.startIndex));
         }
-        for (const annotation of validAnnotations) {
-            const markedText = getMarkedText(annotation);
-            // Add unmarked text before this mark
-            if (annotation.startIndex > lastIndex) {
-                nodes.push(text.substring(lastIndex, annotation.startIndex));
-            }
-            // Add marked text
-            const key = isExamAnnotation(annotation) ? annotation.annotationId : annotation.startIndex;
-            nodes.push(annotation.hidden ? (React.createElement("mark", { key: key, className: "e-annotation", "data-annotation-id": isExamAnnotation(annotation) ? annotation.annotationId : '', "data-hidden": "true" })) : (React.createElement(Mark, { key: key, annotation: annotation, markedText: markedText, onClickAnnotation: onClickAnnotation, setNewAnnotationRef: setNewAnnotationRef })));
-            // if annotation is hidden and it starts inside another annotation, we must not increment lastIndex (actually it would be decremented)
-            const hiddenAnnotationInsideCurrentAnnotation = annotation.startIndex < lastIndex && annotation.hidden;
-            if (!hiddenAnnotationInsideCurrentAnnotation) {
-                lastIndex = annotation.startIndex + (annotation.hidden ? 0 : annotation.length);
-            }
+        // Add marked text
+        const key = getKey(annotation);
+        nodes.push(annotation.hidden ? (React.createElement("mark", { key: key, className: "e-annotation", "data-annotation-id": isExamAnnotation(annotation) ? annotation.annotationId : '', "data-hidden": "true" })) : (React.createElement(Mark, { key: key, annotation: annotation, markedText: markedText, onClickAnnotation: onClickAnnotation, setNewAnnotationRef: setNewAnnotationRef })));
+        // if annotation is hidden and it starts inside another annotation, we must not increment lastIndex (actually it would be decremented)
+        const hiddenAnnotationInsideCurrentAnnotation = annotation.startIndex < lastIndex && annotation.hidden;
+        if (!hiddenAnnotationInsideCurrentAnnotation) {
+            lastIndex = annotation.startIndex + (annotation.hidden ? 0 : annotation.length);
         }
-        // Add remaining unmarked text
-        nodes.push(text.substring(lastIndex));
-        return nodes;
     }
-};
+    // Add remaining unmarked text
+    nodes.push(text.substring(lastIndex));
+    return nodes;
+}
 const Mark = ({ annotation, markedText, onClickAnnotation, setNewAnnotationRef }) => {
     const markRef = useRef(null);
     useEffect(() => {
@@ -66,7 +70,7 @@ const Mark = ({ annotation, markedText, onClickAnnotation, setNewAnnotationRef }
             setNewAnnotationRef(markRef.current);
         }
     }, []);
-    return (React.createElement("mark", { ref: markRef, className: "e-annotation", "data-annotation-id": isExamAnnotation(annotation) ? annotation.annotationId : '', "data-hidden": "false", onClick: e => (isExamAnnotation(annotation) ? onClickAnnotation(e, annotation) : undefined) },
+    return (React.createElement("mark", { ref: markRef, className: "e-annotation", "data-annotation-id": isExamAnnotation(annotation) ? annotation.annotationId : '', "data-hidden": "false", "data-annotation-path": annotation.annotationAnchor, onClick: e => (isExamAnnotation(annotation) ? onClickAnnotation(e, annotation) : undefined) },
         markedText,
         (annotation === null || annotation === void 0 ? void 0 : annotation.markNumber) && React.createElement("sup", { className: "e-annotation", "data-content": annotation === null || annotation === void 0 ? void 0 : annotation.markNumber })));
 };

package/dist/components/shared/AnnotatableText.js.map

@@ -1 +1 @@
-{"version":3,"file":"AnnotatableText.js","sourceRoot":"","sources":["../../../src/components/shared/AnnotatableText.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"AnnotatableText.js","sourceRoot":"","sources":["../../../src/components/shared/AnnotatableText.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AACrC,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAEhD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AAElE,MAAM,gBAAgB,GAAG,CACvB,UAA0D,EACtB,EAAE,CAAC,cAAc,IAAI,UAAU,CAAA;AAErE,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAAE,IAAI,EAAkB,EAAE,EAAE;;IAC1D,MAAM,qBAAqB,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAA;IAC3D,MAAM,EAAE,WAAW,EAAE,GAAG,UAAU,CAAC,kBAAkB,CAAC,CAAA;IACtD,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,aAAa,EAAE,GAAG,qBAAqB,CAAA;IAEpG,MAAM,iBAAiB,GACrB,CAAA,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,WAAW,MAAK,SAAS;QAChD,CAAA,MAAA,IAAI,CAAC,WAAW,0CAAE,IAAI,GAAG,MAAM,MAAK,CAAC;QACrC,WAAW,KAAK,SAAS,CAAA;IAE3B,IAAI,iBAAiB,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC,WAAY,CAAA;IAC1B,CAAC;IAED,MAAM,IAAI,GAAG,cAAc,CAAC,IAAe,CAAC,CAAA;IAE5C,MAAM,6BAA6B,GAAG,CAAA,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,eAAe,0CAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,KAAK,IAAI,CAAC,KAAI,EAAE,CAAA;IACpH,MAAM,2BAA2B,GAAG,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAG,IAAI,CAAC,KAAI,EAAE,CAAA;IAC7D,MAAM,yBAAyB,GAAG,CAAC,GAAG,2BAA2B,EAAE,GAAG,6BAA6B,CAAC,CAAA;IAEpG,MAAM,mCAAmC,GAAG,IAAI,CAAC,WAAY,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAEtG,OAAO,CACL,8BAAM,SAAS,EAAC,eAAe,EAAC,GAAG,EAAE,IAAI,0BAAwB,IAAI,iBAAe,IAAI,IACrF,yBAAyB,CAAC,MAAM,GAAG,CAAC,IAAI,iBAAiB;QACxD,CAAC,CAAC,QAAQ,CACN,mCAAmC,EACnC,yBAAyB,EACzB,iBAAiB,EACjB,mBAAmB,CACpB;QACH,CAAC,CAAC,mCAAmC,CAClC,CACR,CAAA;AACH,CAAC,CAAA;AAED,MAAM,UAAU,QAAQ,CACtB,IAAY,EACZ,WAA+D,EAC/D,iBAAkG,EAClG,mBAA2D;IAE3D,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,CAAC,IAAI,CAAC,CAAA;IACf,CAAC;IAED,SAAS,aAAa,CAAC,UAA0D;QAC/E,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,UAAU,EAAE,UAAU,CAAC,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAA;IACzF,CAAC;IAED,MAAM,KAAK,GAAsB,EAAE,CAAA;IACnC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,UAAU,CAAC,CAAA;IAEvD,MAAM,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,GAAG,SAAS,CACtD,WAAW,EACX,UAAU,CAAC,EAAE,CACX,UAAU,CAAC,UAAU,IAAI,CAAC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,YAAY,KAAK,aAAa,CAAC,UAAU,CAAC,CAC/G,CAAA;IAED,IAAI,CAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,MAAM,IAAG,CAAC,EAAE,CAAC;QACnC,OAAO,CAAC,KAAK,CACX,sBAAsB,EACtB,kBAAkB,EAClB,kBAAkB,CAAC,GAAG,CACpB,CAAC,CAAC,EAAE,CACF,iBAAiB,CAAC,CAAC,YAAY,0DAA0D,aAAa,CAAC,CAAC,CAAC,GAAG,CAC/G,CACF,CAAA;IACH,CAAC;IAED,IAAI,SAAS,GAAG,CAAC,CAAA;IAEjB,MAAM,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,GAAG,SAAS,CAAC,gBAAgB,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;IAE1F,MAAM,MAAM,GAAG,CAAC,UAA0D,EAAE,EAAE,CAC5E,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAA;IAExG,iBAAiB,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QACrC,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,CAAA;QAC9B,KAAK,CAAC,IAAI,CACR,8BACE,GAAG,EAAE,GAAG,EACR,SAAS,EAAC,cAAc,wBACJ,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,iBACnE,MAAM,GAClB,CACH,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,KAAK,MAAM,UAAU,IAAI,kBAAkB,EAAE,CAAC;QAC5C,MAAM,UAAU,GAAG,aAAa,CAAC,UAAU,CAAC,CAAA;QAE5C,qCAAqC;QACrC,IAAI,UAAU,CAAC,UAAU,GAAG,SAAS,EAAE,CAAC;YACtC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC,CAAA;QAC9D,CAAC;QAED,kBAAkB;QAClB,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,CAAA;QAC9B,KAAK,CAAC,IAAI,CACR,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAClB,8BACE,GAAG,EAAE,GAAG,EACR,SAAS,EAAC,cAAc,wBACJ,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,iBACnE,MAAM,GAClB,CACH,CAAC,CAAC,CAAC,CACF,oBAAC,IAAI,IACH,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU,EACtB,iBAAiB,EAAE,iBAAiB,EACpC,mBAAmB,EAAE,mBAAmB,GACxC,CACH,CACF,CAAA;QAED,sIAAsI;QACtI,MAAM,uCAAuC,GAAG,UAAU,CAAC,UAAU,GAAG,SAAS,IAAI,UAAU,CAAC,MAAM,CAAA;QAEtG,IAAI,CAAC,uCAAuC,EAAE,CAAC;YAC7C,SAAS,GAAG,UAAU,CAAC,UAAU,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QACjF,CAAC;IACH,CAAC;IAED,8BAA8B;IAC9B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAA;IACrC,OAAO,KAAK,CAAA;AACd,CAAC;AAED,MAAM,IAAI,GAAG,CAAC,EACZ,UAAU,EACV,UAAU,EACV,iBAAiB,EACjB,mBAAmB,EAMpB,EAAE,EAAE;IACH,MAAM,OAAO,GAAG,MAAM,CAAc,IAAI,CAAC,CAAA;IAEzC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,CAAC,OAAO,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAAE,CAAC;YACrD,mBAAmB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACtC,CAAC;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO,CACL,8BACE,GAAG,EAAE,OAAO,EACZ,SAAS,EAAC,cAAc,wBACJ,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,iBACnE,OAAO,0BACG,UAAU,CAAC,gBAAgB,EACjD,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE1F,UAAU;QACV,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,KAAI,6BAAK,SAAS,EAAC,cAAc,kBAAe,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,GAAI,CAC5F,CACR,CAAA;AACH,CAAC,CAAA"}

package/dist/components/shared/AnnotationPopup.js

@@ -31,8 +31,8 @@ export function AnnotationPopup() {
         setNewAnnotation(null);
         closeMathEditor(textAreaRef.current);
     };
-    function updateComment(annotation, comment) {
-        onSaveAnnotation({ ...annotation, message: comment });
+    function createNewAnnotation(annotation, comment) {
+        onSaveAnnotation(annotation, comment);
         closeEditor();
     }
     return (React.createElement("div", { className: "annotation-popup", style: { position: 'absolute', opacity: 0 }, ref: popupRef, "data-testid": "annotation-popup" },
@@ -42,8 +42,8 @@ export function AnnotationPopup() {
                 React.createElement("button", { className: "button", onClick: e => {
                         e.stopPropagation();
                         closeMathEditor(textAreaRef.current);
-                        updateComment(newAnnotation, comment);
-                    }, "data-testid": "save-comment", disabled: !saveEnabled }, "Vastaa"),
+                        createNewAnnotation(newAnnotation, comment);
+                    }, "data-testid": "save-comment", disabled: !saveEnabled }, "Tallenna"),
                 React.createElement("button", { className: "button text-button", onClick: closeEditor }, "Peru")))));
 }
 function showAndPositionElement(mark, popupRef) {

package/dist/components/shared/AnnotationPopup.js.map

@@ -1 +1 @@
-{"version":3,"file":"AnnotationPopup.js","sourceRoot":"","sources":["../../../src/components/shared/AnnotationPopup.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAE/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AAEjE,MAAM,UAAU,eAAe;IAC7B,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,EAAkB,CAAA;IAClD,MAAM,WAAW,GAAG,KAAK,CAAC,SAAS,EAAkB,CAAA;IACrD,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAA;IAC7G,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAS,EAAE,CAAC,CAAA;IAClD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAU,KAAK,CAAC,CAAA;IAE9D,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,gBAAgB,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YAC5C,sBAAsB,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAA;YAClD,WAAW,CAAC,OAAO,CAAC,SAAS,GAAG,OAAO,CAAA;YACvC,YAAY,CACV,WAAW,CAAC,OAAO,EACnB;gBACE,MAAM,EAAE,IAAI;gBACZ,eAAe,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;aAC3C,EACD,KAAK,CAAC,EAAE;gBACN,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;gBAC5B,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;YACpD,CAAC,CACF,CAAA;YACD,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;QAC7B,CAAC;IACH,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAA;IAEtB,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,IAAI,OAAO,EAAE,CAAC;YACZ,UAAU,CAAC,EAAE,CAAC,CAAA;QAChB,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,WAAW,GAAG,GAAG,EAAE;QACvB,gBAAgB,CAAC,IAAI,CAAC,CAAA;QACtB,eAAe,CAAC,WAAW,CAAC,OAAQ,CAAC,CAAA;IACvC,CAAC,CAAA;IAED,SAAS,aAAa,CAAC,UAA6B,EAAE,OAAe;QACnE,gBAAiB,CAAC,EAAE,GAAG,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAA;QACtD,WAAW,EAAE,CAAA;IACf,CAAC;IAED,OAAO,CACL,6BACE,SAAS,EAAC,kBAAkB,EAC5B,KAAK,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,EAAE,EAC3C,GAAG,EAAE,QAAQ,iBACD,kBAAkB;QAE9B,6BACE,SAAS,EAAC,iBAAiB,iBACf,cAAc,EAC1B,IAAI,EAAC,SAAS,oBACC,MAAM,EACrB,GAAG,EAAE,WAAW,GAChB;QACF,8BAAM,SAAS,EAAC,qBAAqB;YACnC;gBACE,gCACE,SAAS,EAAC,QAAQ,EAClB,OAAO,EAAE,CAAC,CAAC,EAAE;wBACX,CAAC,CAAC,eAAe,EAAE,CAAA;wBACnB,eAAe,CAAC,WAAW,CAAC,OAAQ,CAAC,CAAA;wBACrC,aAAa,CAAC,aAAa,EAAE,OAAO,CAAC,CAAA;oBACvC,CAAC,iBACW,cAAc,EAC1B,QAAQ,EAAE,CAAC,WAAW,aAGf;gBACT,gCAAQ,SAAS,EAAC,oBAAoB,EAAC,OAAO,EAAE,WAAW,WAElD,CACJ,CACF,CACH,CACP,CAAA;AACH,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAwB,EAAE,QAAsC;IAC9F,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAA;IAC9B,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;QAClB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAA;QACzB,MAAM,QAAQ,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,qBAAqB,EAAE,CAAA;QAC9C,MAAM,SAAS,GAAG,KAAK,CAAC,qBAAqB,EAAE,CAAA;QAC/C,MAAM,GAAG,GAAG,QAAQ,CAAC,MAAM,GAAG,QAAQ,CAAC,GAAG,GAAG,MAAM,CAAC,OAAO,CAAA;QAC3D,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAA;QACrC,KAAK,CAAC,GAAG,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAA;QAC9B,KAAK,CAAC,OAAO,GAAG,GAAG,CAAA;QACnB,MAAM,oBAAoB,GAAG,QAAQ,CAAC,IAAI,GAAG,SAAS,CAAC,KAAK,GAAG,WAAW,CAAA;QAE1E,IAAI,oBAAoB,EAAE,CAAC;YACzB,KAAK,CAAC,IAAI,GAAG,GAAG,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,IAAI,CAAA;QACtD,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,IAAI,GAAG,GAAG,QAAQ,CAAC,IAAI,IAAI,CAAA;QACnC,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,OAAuB;IAC9C,4GAA4G;IAC5G,oFAAoF;IACpF,OAAO,CAAC,aAAa,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IAC9E,OAAO,CAAC,aAAa,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;AAC/E,CAAC"}
+{"version":3,"file":"AnnotationPopup.js","sourceRoot":"","sources":["../../../src/components/shared/AnnotationPopup.tsx"],"names":[],"mappings":"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"}

package/dist/components/shared/AnswerIndicator.d.ts

@@ -5,7 +5,7 @@ type Props = {
     type: string;
     answer: ExamAnswer;
     error: boolean;
-    displayNumber: number;
+    displayNumber: string;
 };
 export declare const Indicator: React.MemoExoticComponent<(props: Props) => React.JSX.Element>;
 export {};

package/dist/components/shared/AnswerIndicator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AnswerIndicator.d.ts","sourceRoot":"","sources":["../../../src/components/shared/AnswerIndicator.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAe,MAAM,OAAO,CAAA;AAEnC,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAInD,KAAK,KAAK,GAAG;IACX,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,UAAU,CAAA;IAClB,KAAK,EAAE,OAAO,CAAA;IACd,aAAa,EAAE,MAAM,CAAA;CACtB,CAAA;AA0CD,eAAO,MAAM,SAAS,oCAxCU,KAAK,uBAwCS,CAAA"}
+{"version":3,"file":"AnswerIndicator.d.ts","sourceRoot":"","sources":["../../../src/components/shared/AnswerIndicator.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAe,MAAM,OAAO,CAAA;AAEnC,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAInD,KAAK,KAAK,GAAG;IACX,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,UAAU,CAAA;IAClB,KAAK,EAAE,OAAO,CAAA;IACd,aAAa,EAAE,MAAM,CAAA;CACtB,CAAA;AAyCD,eAAO,MAAM,SAAS,oCAvCU,KAAK,uBAuCS,CAAA"}

package/dist/components/shared/AnswerIndicator.js

@@ -12,15 +12,16 @@ const AnswerIndicator = (props) => {
         e.stopPropagation();
         window.location.href = `#question-nr-${displayNumber}`;
     };
-    return (React.createElement("div", { key: id, className: classNames('answer-indicator', {
-            ok: value,
-            error,
-            big: type === 'rich-text'
-        }), "data-indicator-id": id, onClick: onClick }, (answer === null || answer === void 0 ? void 0 : answer.type) === 'richText' && (React.createElement(React.Fragment, null,
-        (answerIsLongText && (answer === null || answer === void 0 ? void 0 : answer.characterCount) && React.createElement("span", null, answer.characterCount)) || '',
-        answerIsFormula && React.createElement("span", { className: "formula" }, "\u2211"),
-        answerIsImage && (React.createElement("span", { className: "img" },
-            React.createElement(FontAwesomeIcon, { icon: faImage, size: "lg" })))))));
+    return (React.createElement("div", { className: "answer-indicator-container", onClick: onClick, key: id },
+        React.createElement("div", { className: classNames('answer-indicator', {
+                ok: value,
+                error,
+                big: type === 'rich-text'
+            }), "data-indicator-id": id }, (answer === null || answer === void 0 ? void 0 : answer.type) === 'richText' && (React.createElement(React.Fragment, null,
+            (answerIsLongText && (answer === null || answer === void 0 ? void 0 : answer.characterCount) && React.createElement("span", null, answer.characterCount)) || '',
+            answerIsFormula && React.createElement("span", { className: "formula" }, "\u2211"),
+            answerIsImage && (React.createElement("span", { className: "img" },
+                React.createElement(FontAwesomeIcon, { icon: faImage, size: "lg" }))))))));
 };
 export const Indicator = memo(AnswerIndicator);
 //# sourceMappingURL=AnswerIndicator.js.map

package/dist/components/shared/AnswerIndicator.js.map

@@ -1 +1 @@
-{"version":3,"file":"AnswerIndicator.js","sourceRoot":"","sources":["../../../src/components/shared/AnswerIndicator.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AACnC,OAAO,UAAU,MAAM,YAAY,CAAA;AAEnC,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAA;AAU3D,MAAM,eAAe,GAAG,CAAC,KAAY,EAAE,EAAE;IACvC,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,KAAK,CAAA;IAExD,MAAM,KAAK,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAA;IAC3B,MAAM,gBAAgB,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,MAAK,UAAU,CAAA;IACpD,MAAM,eAAe,GAAG,gBAAgB,KAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,CAAC,uBAAuB,CAAC,CAAA,CAAA;IACpF,MAAM,aAAa,GACjB,gBAAgB,IAAI,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,CAAC,wBAAwB,CAAC,MAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,CAAC,2BAA2B,CAAC,CAAA,CAAC,CAAA;IAEjH,MAAM,OAAO,GAAG,CAAC,CAA+C,EAAE,EAAE;QAClE,CAAC,CAAC,eAAe,EAAE,CAAA;QACnB,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,gBAAgB,aAAa,EAAE,CAAA;IACxD,CAAC,CAAA;IAED,OAAO,CACL,6BACE,GAAG,EAAE,EAAE,EACP,SAAS,EAAE,UAAU,CAAC,kBAAkB,EAAE;YACxC,EAAE,EAAE,KAAK;YACT,KAAK;YACL,GAAG,EAAE,IAAI,KAAK,WAAW;SAC1B,CAAC,uBACiB,EAAE,EACrB,OAAO,EAAE,OAAO,IAEf,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,MAAK,UAAU,IAAI,CAC9B;QACG,CAAC,gBAAgB,KAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,cAAc,CAAA,IAAI,kCAAO,MAAM,CAAC,cAAc,CAAQ,CAAC,IAAI,EAAE;QAC1F,eAAe,IAAI,8BAAM,SAAS,EAAC,SAAS,aAAS;QACrD,aAAa,IAAI,CAChB,8BAAM,SAAS,EAAC,KAAK;YACnB,oBAAC,eAAe,IAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAC,IAAI,GAAG,CACvC,CACR,CACA,CACJ,CACG,CACP,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,CAAA"}
+{"version":3,"file":"AnswerIndicator.js","sourceRoot":"","sources":["../../../src/components/shared/AnswerIndicator.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AACnC,OAAO,UAAU,MAAM,YAAY,CAAA;AAEnC,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAA;AAU3D,MAAM,eAAe,GAAG,CAAC,KAAY,EAAE,EAAE;IACvC,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,KAAK,CAAA;IAExD,MAAM,KAAK,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAA;IAC3B,MAAM,gBAAgB,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,MAAK,UAAU,CAAA;IACpD,MAAM,eAAe,GAAG,gBAAgB,KAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,CAAC,uBAAuB,CAAC,CAAA,CAAA;IACpF,MAAM,aAAa,GACjB,gBAAgB,IAAI,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,CAAC,wBAAwB,CAAC,MAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,CAAC,2BAA2B,CAAC,CAAA,CAAC,CAAA;IAEjH,MAAM,OAAO,GAAG,CAAC,CAA+C,EAAE,EAAE;QAClE,CAAC,CAAC,eAAe,EAAE,CAAA;QACnB,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,gBAAgB,aAAa,EAAE,CAAA;IACxD,CAAC,CAAA;IACD,OAAO,CACL,6BAAK,SAAS,EAAC,4BAA4B,EAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE;QACnE,6BACE,SAAS,EAAE,UAAU,CAAC,kBAAkB,EAAE;gBACxC,EAAE,EAAE,KAAK;gBACT,KAAK;gBACL,GAAG,EAAE,IAAI,KAAK,WAAW;aAC1B,CAAC,uBACiB,EAAE,IAEpB,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,MAAK,UAAU,IAAI,CAC9B;YACG,CAAC,gBAAgB,KAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,cAAc,CAAA,IAAI,kCAAO,MAAM,CAAC,cAAc,CAAQ,CAAC,IAAI,EAAE;YAC1F,eAAe,IAAI,8BAAM,SAAS,EAAC,SAAS,aAAS;YACrD,aAAa,IAAI,CAChB,8BAAM,SAAS,EAAC,KAAK;gBACnB,oBAAC,eAAe,IAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAC,IAAI,GAAG,CACvC,CACR,CACA,CACJ,CACG,CACF,CACP,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,CAAA"}

package/dist/components/shared/AnswerLengthInfo.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 declare const _default: React.NamedExoticComponent<{
     maxLength: number;
-    id?: string | undefined;
+    id?: string;
 }>;
 export default _default;
 //# sourceMappingURL=AnswerLengthInfo.d.ts.map

package/dist/components/shared/AnswerLengthInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AnswerLengthInfo.d.ts","sourceRoot":"","sources":["../../../src/components/shared/AnswerLengthInfo.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;;;;;AAezB,wBAA2C"}
+{"version":3,"file":"AnswerLengthInfo.d.ts","sourceRoot":"","sources":["../../../src/components/shared/AnswerLengthInfo.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;;eAIoC,MAAM;SAAO,MAAM;;AAWhF,wBAA2C"}

package/dist/components/shared/AttachmentLink.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 import { ExamComponentProps } from '../../createRenderChildNodes';
-declare const mkAttachmentLink: (type: 'link' | 'plain') => React.FunctionComponent<ExamComponentProps>;
+declare const mkAttachmentLink: (type: "link" | "plain") => React.FunctionComponent<ExamComponentProps>;
 export default mkAttachmentLink;
 //# sourceMappingURL=AttachmentLink.d.ts.map

package/dist/components/shared/AttachmentLink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AttachmentLink.d.ts","sourceRoot":"","sources":["../../../src/components/shared/AttachmentLink.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAA;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAOjE,QAAA,MAAM,gBAAgB,SAAU,MAAM,GAAG,OAAO,KAAG,MAAM,iBAAiB,CAAC,kBAAkB,CAyB5F,CAAA;AAED,eAAe,gBAAgB,CAAA"}
+{"version":3,"file":"AttachmentLink.d.ts","sourceRoot":"","sources":["../../../src/components/shared/AttachmentLink.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAA;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAOjE,QAAA,MAAM,gBAAgB,SAAU,MAAM,GAAG,OAAO,KAAG,KAAK,CAAC,iBAAiB,CAAC,kBAAkB,CAyB5F,CAAA;AAED,eAAe,gBAAgB,CAAA"}