@digabi/exam-engine-core 21.0.3-alpha.0 → 21.0.4-alpha.0
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/__tests__/annotations.test.js +27 -0
- package/dist/__tests__/annotations.test.js.map +1 -1
- package/dist/__tests__/tsconfig.tsbuildinfo +1 -1
- package/dist/components/grading/examAnnotationUtils.js.map +1 -1
- package/dist/components/grading-instructions/EditableGradingInstruction.js +1 -1
- package/dist/components/grading-instructions/EditableGradingInstruction.js.map +1 -1
- package/dist/components/shared/AnnotationMark.js +3 -3
- package/dist/components/shared/AnnotationMark.js.map +1 -1
- package/dist/components/shared/markText.d.ts +1 -1
- package/dist/components/shared/markText.d.ts.map +1 -1
- package/dist/components/shared/markText.js +20 -5
- package/dist/components/shared/markText.js.map +1 -1
- package/dist/main-bundle.js +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"examAnnotationUtils.js","sourceRoot":"","sources":["../../../src/components/grading/examAnnotationUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAA;AAE3D,MAAM,UAAU,wBAAwB,CAAC,CAAmB,EAAE,eAAiC;IAC7F,SAAS,6BAA6B;;QACpC,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,6BAA6B,CAAC,CAAA;QAEpE;;;WAGG;QAEH,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,EAAE,CAAA;QACvC,MAAM,SAAS,GAAG,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,UAAU,0CAAE,aAAa,CAAA;QACtD,MAAM,OAAO,GAAG,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,SAAS,0CAAE,aAAa,CAAA;QAEnD,IAAI,SAAS,IAAI,SAAS,IAAI,OAAO,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzE,MAAM,QAAQ,GAAG,+BAA+B,CAAC,SAAS,CAAC,CAAA;YAC3D,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAA;YAC1D,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAA;YAEtD,IACE,sBAAsB,KAAK,oBAAoB;gBAC/C,aAAa,CAAC,SAAS,CAAC;gBACxB,aAAa,CAAC,OAAO,CAAC;gBACtB,CAAC,QAAQ,EACT,CAAC;gBACD,MAAM,WAAW,GAAG,+BAA+B,CAAC,SAAS,CAAC,CAAA;gBAC9D,eAAe,CAAC;oBACd,eAAe,EAAE,WAAW;oBAC5B,aAAa,EAAE,sBAAsB;oBACrC,YAAY,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;iBAC7D,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,8CAA8C;IAC9C,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnB,OAAM;IACR,CAAC;IACD,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,6BAA6B,CAAC,CAAA;AACnE,CAAC;AAED,MAAM,+BAA+B,GAAG,CAAC,SAAoB,EAAE,EAAE;IAC/D,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,UAAU,CAAC,CAAC,EAAE,aAAa,GAAG,QAAQ,CAAC,CAAA;IACnF,MAAM,oBAAoB,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,CAC9C,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,KAAK,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,aAAa,CAAC,KAAK,OAAO,CACnF,CAAA;IACD,MAAM,0BAA0B,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,2BAA2B,CAAC,CAAC,CAAA;IAChH,OAAO,oBAAoB,IAAI,0BAA0B,CAAA;AAC3D,CAAC,CAAA;AAED,MAAM,gBAAgB,GAAG,CAAC,IAAiB,EAAE,EAAE,WAC7C,OAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAC,6BAA6B,CAAC,0CAAE,YAAY,CAAC,wBAAwB,CAAC,CAAA,EAAA,CAAA;AAEtF,MAAM,aAAa,GAAG,CAAC,IAAiB,EAAE,EAAE,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,YAAY,CAAC,sBAAsB,CAAC,KAAI,IAAI,CAAC,OAAO,KAAK,MAAM,CAAA;AAElH,MAAM,+BAA+B,GAAG,CAAC,SAAoB,EAAE,EAAE;;IAC/D,MAAM,KAAK,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;IACrC,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,UAAU,CAAC,CAAC,EAAE,aAAa,GAAG,QAAQ,CAAC,CAAA;IACnF,MAAM,sBAAsB,GAAG,KAAK,CAAC,cAAc,CAAC,aAAa,CAAA;IAEjE,IAAI,CAAC,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,CAAA,EAAE,CAAC;QAC3B,0BAA0B;QAC1B,MAAM,gBAAgB,GAAG,MAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,SAAS,0CAAE,aAAa,0CAAE,YAAY,CAAC,sBAAsB,CAAC,CAAA;QAClG,MAAM,cAAc,GAAG,uBAAuB,CAAC,sBAAqC,EAAE,KAAK,CAAC,CAAA;QAC5F,OAAO;YACL;gBACE,gBAAgB;gBAChB,YAAY,EAAE,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,EAAE,KAAI,EAAE;gBACzC,UAAU,EAAE,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,UAAU,KAAI,CAAC;gBAC3C,MAAM,EAAE,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,MAAM,KAAI,CAAC;aACpC;
|
|
1
|
+
{"version":3,"file":"examAnnotationUtils.js","sourceRoot":"","sources":["../../../src/components/grading/examAnnotationUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ export function EditableGradingInstruction({ element }) {
|
|
|
13
13
|
makeRichText(answerGradingInstructionDiv.current, {
|
|
14
14
|
locale: language.startsWith('sv') ? 'SV' : 'FI',
|
|
15
15
|
screenshotSaver: saveScreenshot ? ({ type, data }) => saveScreenshot(type, data, displayNumber) : undefined,
|
|
16
|
-
forceInit: true,
|
|
16
|
+
//forceInit: true,
|
|
17
17
|
screenshotImageSelector: 'img[src^="data:image/png"], img[src^="data:image/jpeg"]',
|
|
18
18
|
fileTypes: ['image/png', 'image/jpeg']
|
|
19
19
|
}, ({ answerHTML }) => (onChange ? onChange(answerHTML, displayNumber) : () => { }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EditableGradingInstruction.js","sourceRoot":"","sources":["../../../src/components/grading-instructions/EditableGradingInstruction.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAA;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAE5D,MAAM,UAAU,0BAA0B,CAAC,EAAE,OAAO,EAAwB;IAC1E,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAA;IAClD,MAAM,EAAE,aAAa,EAAE,GAAG,UAAU,CAAC,eAAe,CAAC,CAAA;IACrD,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,UAAU,CAAC,yBAAyB,CAAC,CAAA;IAC1E,MAAM,2BAA2B,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAA;IAEhE,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,2BAA2B,CAAC,OAAO,EAAE,CAAC;YACxC,YAAY,CACV,2BAA2B,CAAC,OAAO,EACnC;gBACE,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;gBAC/C,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS;gBAC3G,
|
|
1
|
+
{"version":3,"file":"EditableGradingInstruction.js","sourceRoot":"","sources":["../../../src/components/grading-instructions/EditableGradingInstruction.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAA;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAE5D,MAAM,UAAU,0BAA0B,CAAC,EAAE,OAAO,EAAwB;IAC1E,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAA;IAClD,MAAM,EAAE,aAAa,EAAE,GAAG,UAAU,CAAC,eAAe,CAAC,CAAA;IACrD,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,UAAU,CAAC,yBAAyB,CAAC,CAAA;IAC1E,MAAM,2BAA2B,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAA;IAEhE,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,2BAA2B,CAAC,OAAO,EAAE,CAAC;YACxC,YAAY,CACV,2BAA2B,CAAC,OAAO,EACnC;gBACE,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;gBAC/C,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS;gBAC3G,kBAAkB;gBAClB,uBAAuB,EAAE,yDAAyD;gBAClF,SAAS,EAAE,CAAC,WAAW,EAAE,YAAY,CAAC;aACvC,EACD,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAChF,CAAA;YACD,2BAA2B,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;QAC9D,CAAC;IACH,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IACd,OAAO,6BAAK,GAAG,EAAE,2BAA2B,GAAI,CAAA;AAClD,CAAC"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import React, { useEffect, useRef } from 'react';
|
|
2
|
-
import {
|
|
2
|
+
import { isExistingAnnotation } from './markText';
|
|
3
3
|
export const AnnotationMark = ({ annotation, markedText, onClickAnnotation, setNewAnnotationRef }) => {
|
|
4
4
|
const markRef = useRef(null);
|
|
5
5
|
useEffect(() => {
|
|
6
|
-
if (markRef.current && !
|
|
6
|
+
if (markRef.current && !isExistingAnnotation(annotation)) {
|
|
7
7
|
setNewAnnotationRef(markRef.current);
|
|
8
8
|
}
|
|
9
9
|
}, []);
|
|
10
|
-
return (React.createElement("mark", { ref: markRef, className: "e-annotation", "data-annotation-id":
|
|
10
|
+
return (React.createElement("mark", { ref: markRef, className: "e-annotation", "data-annotation-id": isExistingAnnotation(annotation) ? annotation.annotationId : '', "data-hidden": "false", "data-annotation-path": annotation.annotationAnchor, onClick: e => (isExistingAnnotation(annotation) ? onClickAnnotation(e, annotation) : undefined) },
|
|
11
11
|
markedText,
|
|
12
12
|
(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 })));
|
|
13
13
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnnotationMark.js","sourceRoot":"","sources":["../../../src/components/shared/AnnotationMark.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAEhD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"AnnotationMark.js","sourceRoot":"","sources":["../../../src/components/shared/AnnotationMark.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAEhD,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEjD,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,EAC7B,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,oBAAoB,CAAC,UAAU,CAAC,EAAE,CAAC;YACzD,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,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,iBACvE,OAAO,0BACG,UAAU,CAAC,gBAAgB,EACjD,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE9F,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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { NewRenderableAnnotation, RenderableAnnotation } from '../../types/Score';
|
|
3
|
-
export declare function
|
|
3
|
+
export declare function isExistingAnnotation(annotation: NewRenderableAnnotation | RenderableAnnotation): annotation is RenderableAnnotation;
|
|
4
4
|
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[];
|
|
5
5
|
//# sourceMappingURL=markText.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"markText.d.ts","sourceRoot":"","sources":["../../../src/components/shared/markText.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AAOjF,wBAAgB,
|
|
1
|
+
{"version":3,"file":"markText.d.ts","sourceRoot":"","sources":["../../../src/components/shared/markText.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AAOjF,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,uBAAuB,GAAG,oBAAoB,GACzD,UAAU,IAAI,oBAAoB,CAEpC;AAMD,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,qBA4G5D"}
|
|
@@ -2,9 +2,9 @@ import * as _ from 'lodash-es';
|
|
|
2
2
|
import React from 'react';
|
|
3
3
|
import { AnnotationMark } from './AnnotationMark';
|
|
4
4
|
function getKey(annotation) {
|
|
5
|
-
return
|
|
5
|
+
return isExistingAnnotation(annotation) ? annotation.annotationId + annotation.startIndex : annotation.startIndex;
|
|
6
6
|
}
|
|
7
|
-
export function
|
|
7
|
+
export function isExistingAnnotation(annotation) {
|
|
8
8
|
return 'annotationId' in annotation;
|
|
9
9
|
}
|
|
10
10
|
function getMarkedText(text, startIndex, length) {
|
|
@@ -20,15 +20,30 @@ export function markText(text, annotations, onClickAnnotation, setNewAnnotationR
|
|
|
20
20
|
const nodes = [];
|
|
21
21
|
hiddenAnnotations.forEach(annotation => {
|
|
22
22
|
const key = getKey(annotation);
|
|
23
|
-
nodes.push(React.createElement("mark", { key: key, className: "e-annotation", "data-annotation-id":
|
|
23
|
+
nodes.push(React.createElement("mark", { key: key, className: "e-annotation", "data-annotation-id": isExistingAnnotation(annotation) ? annotation.annotationId : '', "data-hidden": "true" }));
|
|
24
24
|
});
|
|
25
25
|
let lastIndex = 0;
|
|
26
26
|
const onlyLeadingSpacesRemoved = text.replace(/^\s+/, ' ');
|
|
27
27
|
const indentationSize = text.length - onlyLeadingSpacesRemoved.length;
|
|
28
|
-
|
|
28
|
+
const notOverlappingAnnotations = visibleAnnotations.reduce((acc, annotation) => {
|
|
29
|
+
const overlapsWithAnyVisibleAnnotation = acc.some(a => annotation.startIndex < a.startIndex + a.length &&
|
|
30
|
+
a.startIndex < annotation.startIndex + annotation.length &&
|
|
31
|
+
!a.hidden);
|
|
32
|
+
acc.push({
|
|
33
|
+
...annotation,
|
|
34
|
+
hidden: annotation.hidden || overlapsWithAnyVisibleAnnotation
|
|
35
|
+
});
|
|
36
|
+
return acc;
|
|
37
|
+
}, []);
|
|
38
|
+
for (const annotation of notOverlappingAnnotations) {
|
|
29
39
|
/* "August 2024 annotation" refers to annotations made on or after 7.8.2024, and on or before x.8.2024.
|
|
30
40
|
* They use trimmed exam content (textWithoutLineBreaksAndExtraSpaces) for calculating startIndex.
|
|
31
41
|
* Support for "August 2024 annotations" can be removed at least when S25 exams are held.
|
|
42
|
+
*
|
|
43
|
+
* TODO:
|
|
44
|
+
* When support for Aug 2024 annotations can be removed, just do:
|
|
45
|
+
* const correctStartIndex = annotation.startIndex
|
|
46
|
+
* and remove any unused code left behind
|
|
32
47
|
*/
|
|
33
48
|
const textWithoutLineBreaksAndExtraSpaces = text.replace(/\n/g, ' ').replace(/\s+/g, ' ');
|
|
34
49
|
const annotatedTextAugust2024 = getMarkedText(textWithoutLineBreaksAndExtraSpaces, annotation.startIndex, annotation.length);
|
|
@@ -47,7 +62,7 @@ export function markText(text, annotations, onClickAnnotation, setNewAnnotationR
|
|
|
47
62
|
}
|
|
48
63
|
// Add marked text
|
|
49
64
|
const key = getKey(annotation);
|
|
50
|
-
nodes.push(annotation.hidden ? (React.createElement("mark", { key: key, className: "e-annotation", "data-annotation-id":
|
|
65
|
+
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 })));
|
|
51
66
|
lastIndex = correctStartIndex + annotation.length;
|
|
52
67
|
}
|
|
53
68
|
// Add remaining unmarked text
|
|
@@ -1 +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,
|
|
1
|
+
{"version":3,"file":"markText.js","sourceRoot":"","sources":["../../../src/components/shared/markText.tsx"],"names":[],"mappings":"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"}
|