@digabi/exam-engine-core 23.4.7 → 23.5.1

package/dist/components/shared/markText.js

@@ -1,8 +1,11 @@
 import * as _ from 'lodash-es';
 import React from 'react';
-import { AnnotationMark } from './AnnotationMark';
-function getKey(annotation) {
-    return isExistingAnnotation(annotation) ? annotation.annotationId + annotation.startIndex : annotation.startIndex;
+import AnnotationTextMark from './AnnotationTextMark';
+import HiddenAnnotationMark from './HiddenAnnotationMark';
+export function getKey(annotation) {
+    return isExistingAnnotation(annotation)
+        ? annotation.annotationId + annotation.annotationAnchor
+        : annotation.annotationAnchor;
 }
 export function isExistingAnnotation(annotation) {
     return 'annotationId' in annotation;
@@ -20,7 +23,8 @@ export function markText(text, annotations, onClickAnnotation, setNewAnnotationR
     const nodes = [];
     hiddenAnnotations.forEach(annotation => {
         const key = getKey(annotation);
-        nodes.push(React.createElement("mark", { key: key, className: "e-annotation", "data-annotation-id": isExistingAnnotation(annotation) ? annotation.annotationId : '', "data-hidden": "true" }));
+        const annotationId = isExistingAnnotation(annotation) ? annotation.annotationId : null;
+        nodes.push(React.createElement(HiddenAnnotationMark, { key: key, annotationId: annotationId }));
     });
     let lastIndex = 0;
     const onlyLeadingSpacesRemoved = text.replace(/^\s+/, ' ');
@@ -62,7 +66,8 @@ export function markText(text, annotations, onClickAnnotation, setNewAnnotationR
         }
         // Add marked text
         const key = getKey(annotation);
-        nodes.push(annotation.hidden ? (React.createElement("mark", { key: key, className: "e-annotation", "data-annotation-id": isExistingAnnotation(annotation) ? annotation.annotationId : '', "data-hidden": "true" })) : (React.createElement(AnnotationMark, { key: key, annotation: annotation, markedText: annotatedTextWithCorrectedStartIndex, onClickAnnotation: onClickAnnotation, setNewAnnotationRef: setNewAnnotationRef })));
+        const annotationId = isExistingAnnotation(annotation) ? annotation.annotationId : null;
+        nodes.push(annotation.hidden ? (React.createElement(HiddenAnnotationMark, { key: key, annotationId: annotationId })) : (React.createElement(AnnotationTextMark, { key: key, annotation: annotation, onClickAnnotation: onClickAnnotation, setNewAnnotationRef: setNewAnnotationRef }, annotatedTextWithCorrectedStartIndex)));
         lastIndex = correctStartIndex + annotation.length;
     }
     // Add remaining unmarked text

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

@@ -1 +1 @@
-{"version":3,"file":"markText.js","sourceRoot":"","sources":["../../../src/components/shared/markText.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,WAAW,CAAA;AAC9B,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,SAAS,MAAM,CAAC,UAA0D;IACxE,OAAO,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAA;AACnH,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,UAA0D;IAE1D,OAAO,cAAc,IAAI,UAAU,CAAA;AACrC,CAAC;AAED,SAAS,aAAa,CAAC,IAAY,EAAE,UAAkB,EAAE,MAAc;IACrE,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAAC,CAAA;AACxD,CAAC;AAED,MAAM,UAAU,QAAQ,CACtB,IAAY,EACZ,WAA+D,EAC/D,iBAAkG,EAClG,mBAAsD;;IAEtD,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,CAAC,IAAI,CAAC,CAAA;IACf,CAAC;IAED,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,UAAU,CAAC,CAAA;IAEvD,MAAM,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;IAEvF,MAAM,KAAK,GAAsB,EAAE,CAAA;IAEnC,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,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,iBACvE,MAAM,GAClB,CACH,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,IAAI,SAAS,GAAG,CAAC,CAAA;IAEjB,MAAM,wBAAwB,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1D,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,GAAG,wBAAwB,CAAC,MAAM,CAAA;IAErE,MAAM,yBAAyB,GAAG,kBAAkB,CAAC,MAAM,CACzD,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE;QAClB,MAAM,gCAAgC,GAAG,GAAG,CAAC,IAAI,CAC/C,CAAC,CAAC,EAAE,CACF,UAAU,CAAC,UAAU,GAAG,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,MAAM;YAC/C,CAAC,CAAC,UAAU,GAAG,UAAU,CAAC,UAAU,GAAG,UAAU,CAAC,MAAM;YACxD,CAAC,CAAC,CAAC,MAAM,CACZ,CAAA;QACD,GAAG,CAAC,IAAI,CAAC;YACP,GAAG,UAAU;YACb,MAAM,EAAE,UAAU,CAAC,MAAM,IAAI,gCAAgC;SAC9D,CAAC,CAAA;QACF,OAAO,GAAG,CAAA;IACZ,CAAC,EACD,EAAwD,CACzD,CAAA;IAED,KAAK,MAAM,UAAU,IAAI,yBAAyB,EAAE,CAAC;QACnD;;;;;;;;WAQG;QAEH,MAAM,mCAAmC,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QACzF,MAAM,uBAAuB,GAAG,aAAa,CAC3C,mCAAmC,EACnC,UAAU,CAAC,UAAU,EACrB,UAAU,CAAC,MAAM,CAClB,CAAA;QACD,MAAM,sBAAsB,GAAG,uBAAuB,KAAK,UAAU,CAAC,YAAY,CAAA;QAElF;;;aAGK;QAEL,MAAM,kCAAkC,GAAG,CAAA,MAAA,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,0CAAE,MAAM,KAAI,CAAC,CAAA;QAC3G,MAAM,oBAAoB,GAAG,kCAAkC,GAAG,eAAe,CAAA;QAEjF,MAAM,iBAAiB,GAAG,UAAU,CAAC,UAAU,GAAG,CAAC,sBAAsB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACrG,MAAM,oCAAoC,GAAG,aAAa,CAAC,IAAI,EAAE,iBAAiB,EAAE,UAAU,CAAC,MAAM,CAAC,CAAA;QAEtG,qCAAqC;QACrC,IAAI,iBAAiB,GAAG,SAAS,EAAE,CAAC;YAClC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC,CAAA;QAC1D,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,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,iBACvE,MAAM,GAClB,CACH,CAAC,CAAC,CAAC,CACF,oBAAC,cAAc,IACb,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,oCAAoC,EAChD,iBAAiB,EAAE,iBAAiB,EACpC,mBAAmB,EAAE,mBAAmB,GACxC,CACH,CACF,CAAA;QAED,SAAS,GAAG,iBAAiB,GAAG,UAAU,CAAC,MAAM,CAAA;IACnD,CAAC;IAED,8BAA8B;IAC9B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAA;IACrC,OAAO,KAAK,CAAA;AACd,CAAC"}
+{"version":3,"file":"markText.js","sourceRoot":"","sources":["../../../src/components/shared/markText.tsx"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -7,6 +7,7 @@ import parseExam from './parser/parseExam';
 export { Attachments, Exam, GradingInstructions, Results, parseExam };
 export { ExamComponentProps } from './createRenderChildNodes';
 export { GradingAnswer } from './components/grading/GradingAnswer';
+export * from './types/ExamAnnotations';
 export * from './types/ExamAnswer';
 export * from './types/ExamServerAPI';
 export * from './types/GradingStructure';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAA;AAC7B,OAAO,WAAW,MAAM,sCAAsC,CAAA;AAC9D,OAAO,IAAI,MAAM,wBAAwB,CAAA;AACzC,OAAO,mBAAmB,MAAM,uDAAuD,CAAA;AACvF,OAAO,OAAO,MAAM,8BAA8B,CAAA;AAClD,OAAO,SAAS,MAAM,oBAAoB,CAAA;AAE1C,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,SAAS,EAAE,CAAA;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAA;AAClE,cAAc,oBAAoB,CAAA;AAClC,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,eAAe,CAAA;AAE7B,MAAM,WAAW,UAAU;IACzB,WAAW,EAAE,OAAO,WAAW,CAAA;IAC/B,IAAI,EAAE,OAAO,IAAI,CAAA;IACjB,SAAS,EAAE,OAAO,SAAS,CAAA;IAC3B,OAAO,EAAE,OAAO,OAAO,CAAA;CACxB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAA;AAC7B,OAAO,WAAW,MAAM,sCAAsC,CAAA;AAC9D,OAAO,IAAI,MAAM,wBAAwB,CAAA;AACzC,OAAO,mBAAmB,MAAM,uDAAuD,CAAA;AACvF,OAAO,OAAO,MAAM,8BAA8B,CAAA;AAClD,OAAO,SAAS,MAAM,oBAAoB,CAAA;AAE1C,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,SAAS,EAAE,CAAA;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAA;AAClE,cAAc,yBAAyB,CAAA;AACvC,cAAc,oBAAoB,CAAA;AAClC,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,eAAe,CAAA;AAE7B,MAAM,WAAW,UAAU;IACzB,WAAW,EAAE,OAAO,WAAW,CAAA;IAC/B,IAAI,EAAE,OAAO,IAAI,CAAA;IACjB,SAAS,EAAE,OAAO,SAAS,CAAA;IAC3B,OAAO,EAAE,OAAO,OAAO,CAAA;CACxB"}

package/dist/index.js

@@ -6,6 +6,7 @@ import Results from './components/results/Results';
 import parseExam from './parser/parseExam';
 export { Attachments, Exam, GradingInstructions, Results, parseExam };
 export { GradingAnswer } from './components/grading/GradingAnswer';
+export * from './types/ExamAnnotations';
 export * from './types/ExamAnswer';
 export * from './types/ExamServerAPI';
 export * from './types/GradingStructure';

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAA;AAC7B,OAAO,WAAW,MAAM,sCAAsC,CAAA;AAC9D,OAAO,IAAI,MAAM,wBAAwB,CAAA;AACzC,OAAO,mBAAmB,MAAM,uDAAuD,CAAA;AACvF,OAAO,OAAO,MAAM,8BAA8B,CAAA;AAClD,OAAO,SAAS,MAAM,oBAAoB,CAAA;AAE1C,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,SAAS,EAAE,CAAA;AAErE,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAA;AAClE,cAAc,oBAAoB,CAAA;AAClC,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,eAAe,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAA;AAC7B,OAAO,WAAW,MAAM,sCAAsC,CAAA;AAC9D,OAAO,IAAI,MAAM,wBAAwB,CAAA;AACzC,OAAO,mBAAmB,MAAM,uDAAuD,CAAA;AACvF,OAAO,OAAO,MAAM,8BAA8B,CAAA;AAClD,OAAO,SAAS,MAAM,oBAAoB,CAAA;AAE1C,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,SAAS,EAAE,CAAA;AAErE,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAA;AAClE,cAAc,yBAAyB,CAAA;AACvC,cAAc,oBAAoB,CAAA;AAClC,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,eAAe,CAAA"}