@digabi/exam-engine-core 23.5.0 → 23.5.2

package/dist/assets/closeButton.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="30" height="30" viewBox="0 0 30 30"><defs><clipPath id="clip-path"><path d="M141.57-89.324v-2.34H143.2v2.34A2.3,2.3,0,0,1,140.9-87.03H130.1a2.3,2.3,0,0,1-2.292-2.294v-17.029a2.294,2.294,0,0,1,2.292-2.292h10.8a2.3,2.3,0,0,1,2.295,2.292v2.342H141.57v-2.342a.669.669,0,0,0-.67-.667H130.1a.667.667,0,0,0-.667.667v17.029a.668.668,0,0,0,.667.669h10.8A.67.67,0,0,0,141.57-89.324Zm3.271-13.579a1.069,1.069,0,0,1,1.825-.755l5.065,5.065a1.065,1.065,0,0,1,0,1.511l-5.065,5.067a1.07,1.07,0,0,1-1.825-.757v-2.412h-6.633a2.3,2.3,0,0,1-2.3-2.3v-.7a2.3,2.3,0,0,1,2.3-2.3h6.633V-102.9" fill="none" clip-rule="evenodd"/></clipPath><clipPath id="clip-path-2"><ellipse cx="10" cy="-29.606" rx="15" ry="14.933" fill="none"/></clipPath></defs><title>closeButton</title><rect width="30" height="30" fill="#fff" opacity="0"/><line x1="25" y1="5" x2="5" y2="25" fill="none" stroke="#6d6d6d" stroke-miterlimit="10" stroke-width="3"/><line x1="5" y1="5" x2="25" y2="25" fill="none" stroke="#6d6d6d" stroke-miterlimit="10" stroke-width="3"/></svg>

package/dist/assets/collapse.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="19px" height="12px" viewBox="0 0 19 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
+    <title>Page 1</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Kuuntelu-kokelas-painaa-nappia-Copy-18" transform="translate(-1068.000000, -19.000000)" stroke-width="3" stroke="#359BB7">
+            <polyline id="Page-1" transform="translate(1077.999981, 26.000000) rotate(180.000000) translate(-1077.999981, -26.000000) " points="1085.99996 22 1077.99996 30 1070 22"></polyline>
+        </g>
+    </g>
+</svg>

package/dist/assets/expand.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="18px" height="12px" viewBox="0 0 18 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
+    <title>Page 1</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Kuuntelu-kokelas-painaa-nappia-Copy-18" transform="translate(-1069.000000, -21.000000)" stroke-width="3" stroke="#359BB7">
+            <polyline id="Page-1" points="1085.99996 22 1077.99996 30 1070 22"></polyline>
+        </g>
+    </g>
+</svg>

package/dist/assets/helpButton.svg

@@ -0,0 +1,9 @@
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="20px" height="20px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">
+<path fill="#359BB7" d="M10,20C4.48,20,0,15.52,0,10C0,4.48,4.48,0,10,0s10,4.48,10,10C20,15.52,15.52,20,10,20z M5.57,5.88
+	c-0.14,0.21-0.09,0.5,0.11,0.66l1.4,1.06c0.21,0.16,0.51,0.12,0.67-0.09c0.72-0.91,1.21-1.44,2.31-1.44c0.82,0,1.84,0.53,1.84,1.33
+	c0,0.6-0.5,0.91-1.31,1.37c-0.95,0.53-2.2,1.19-2.2,2.85v0.16c0,0.27,0.22,0.48,0.48,0.48h2.26c0.27,0,0.48-0.22,0.48-0.48v-0.05
+	c0-1.15,3.35-1.2,3.35-4.3c0-2.34-2.43-4.11-4.7-4.11C8.07,3.31,6.67,4.23,5.57,5.88z M8.15,15.16c0,1.02,0.83,1.85,1.85,1.85
+	s1.85-0.83,1.85-1.85s-0.83-1.85-1.85-1.85S8.15,14.14,8.15,15.16z"/>
+</svg>

package/dist/assets/redoButton.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="20px" height="20px" viewBox="0 0 20 20" version="1.1">
+<g id="surface1">
+<path fill="#359BB7" d="M 18.316406 1.253906 C 18.859375 1.253906 19.378906 1.675781 19.378906 2.3125 L 19.378906 8.007812 C 19.378906 8.421875 19.042969 8.757812 18.628906 8.757812 L 12.9375 8.757812 C 12.300781 8.757812 11.882812 8.238281 11.882812 7.695312 C 11.882812 7.4375 11.976562 7.171875 12.191406 6.957031 L 13.953125 5.195312 C 12.851562 4.289062 11.460938 3.761719 9.996094 3.761719 C 6.554688 3.761719 3.753906 6.5625 3.753906 10.003906 C 3.753906 13.449219 6.554688 16.246094 9.996094 16.246094 C 12.851562 16.246094 13.488281 14.75 14.492188 14.75 C 15.214844 14.75 15.742188 15.335938 15.742188 15.996094 C 15.742188 17.367188 12.554688 18.75 10 18.75 C 5.179688 18.75 1.253906 14.824219 1.253906 10.003906 C 1.253906 5.183594 5.179688 1.265625 10 1.265625 C 12.132812 1.265625 14.148438 2.0625 15.71875 3.425781 L 17.578125 1.566406 C 17.792969 1.351562 18.058594 1.253906 18.316406 1.253906 Z M 18.316406 1.253906 "/>
+</g>
+</svg>

package/dist/assets/undoButton.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="20px" height="20px" viewBox="0 0 20 20" version="1.1">
+<g id="surface1">
+<path fill="#359BB7" d="M 18.75 10 C 18.75 14.820312 14.824219 18.746094 10.003906 18.746094 C 8.097656 18.746094 6.285156 18.136719 4.761719 16.992188 C 4.210938 16.578125 4.097656 15.796875 4.511719 15.242188 C 4.925781 14.691406 5.707031 14.582031 6.261719 14.996094 C 7.351562 15.8125 8.644531 16.242188 10.007812 16.242188 C 13.449219 16.242188 16.25 13.441406 16.25 10 C 16.25 6.558594 13.449219 3.757812 10.007812 3.757812 C 8.542969 3.757812 7.152344 4.285156 6.050781 5.1875 L 7.8125 6.953125 C 8.476562 7.617188 8.007812 8.753906 7.066406 8.753906 L 1.375 8.753906 C 0.960938 8.753906 0.625 8.417969 0.625 8.003906 L 0.625 2.304688 C 0.625 1.367188 1.761719 0.898438 2.425781 1.5625 L 4.285156 3.421875 C 5.855469 2.058594 7.871094 1.253906 10.003906 1.253906 C 14.824219 1.253906 18.75 5.179688 18.75 10 Z M 18.75 10 "/>
+</g>
+</svg>

package/dist/components/context/AnnotationProvider.d.ts

@@ -1,9 +1,6 @@
 import React from 'react';
 import { AnnotationPart, ExamImageAnnotation, NewExamAnnotation, WithAnnotationId } from '../../types/ExamAnnotations';
 import { AnnotationProps } from '../exam/Exam';
-interface Props {
-    children: React.ReactNode;
-}
 export type AnnotationContextType = {
     annotationsEnabled: true;
     newAnnotation: NewExamAnnotation | null;
@@ -18,6 +15,5 @@ export type AnnotationContextType = {
 export declare const AnnotationContext: React.Context<AnnotationContextType | {
     annotationsEnabled: false;
 }>;
-export declare const AnnotationProvider: ({ children, annotations, onClickAnnotation, onSaveAnnotation }: Props & AnnotationProps) => string | number | boolean | React.JSX.Element | Iterable<React.ReactNode> | null | undefined;
-export {};
+export declare const AnnotationProvider: ({ children, annotations, onClickAnnotation, onSaveAnnotation }: React.PropsWithChildren<AnnotationProps>) => string | number | boolean | React.JSX.Element | Iterable<React.ReactNode> | null | undefined;
 //# sourceMappingURL=AnnotationProvider.d.ts.map

package/dist/components/context/AnnotationProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AnnotationProvider.d.ts","sourceRoot":"","sources":["../../../src/components/context/AnnotationProvider.tsx"],"names":[],"mappings":"AACA,OAAO,KAAkB,MAAM,OAAO,CAAA;AACtC,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AACtH,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAI9C,UAAU,KAAK;IACb,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,kBAAkB,EAAE,IAAI,CAAA;IACxB,aAAa,EAAE,iBAAiB,GAAG,IAAI,CAAA;IACvC,gBAAgB,EAAE,CAAC,CAAC,EAAE,iBAAiB,GAAG,IAAI,KAAK,IAAI,CAAA;IACvD,gBAAgB,EAAE,WAAW,GAAG,IAAI,CAAA;IACpC,mBAAmB,EAAE,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,KAAK,IAAI,CAAA;IACtD,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,cAAc,CAAC,EAAE,CAAC,CAAA;IACnE,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,EAAE,CAAC,CAAA;IACvD,iBAAiB,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAA;IAC/F,gBAAgB,EAAE,CAAC,UAAU,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;CAClG,CAAA;AAED,eAAO,MAAM,iBAAiB;wBAAqE,KAAK;EAEtG,CAAA;AAEF,eAAO,MAAM,kBAAkB,mEAK5B,KAAK,GAAG,eAAe,iGAiFzB,CAAA"}
+{"version":3,"file":"AnnotationProvider.d.ts","sourceRoot":"","sources":["../../../src/components/context/AnnotationProvider.tsx"],"names":[],"mappings":"AACA,OAAO,KAA+B,MAAM,OAAO,CAAA;AACnD,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AACtH,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAI9C,MAAM,MAAM,qBAAqB,GAAG;IAClC,kBAAkB,EAAE,IAAI,CAAA;IACxB,aAAa,EAAE,iBAAiB,GAAG,IAAI,CAAA;IACvC,gBAAgB,EAAE,CAAC,CAAC,EAAE,iBAAiB,GAAG,IAAI,KAAK,IAAI,CAAA;IACvD,gBAAgB,EAAE,WAAW,GAAG,IAAI,CAAA;IACpC,mBAAmB,EAAE,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,KAAK,IAAI,CAAA;IACtD,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,cAAc,CAAC,EAAE,CAAC,CAAA;IACnE,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,EAAE,CAAC,CAAA;IACvD,iBAAiB,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAA;IAC/F,gBAAgB,EAAE,CAAC,UAAU,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;CAClG,CAAA;AAED,eAAO,MAAM,iBAAiB;wBAAqE,KAAK;EAEtG,CAAA;AAEF,eAAO,MAAM,kBAAkB,mEAK5B,KAAK,CAAC,iBAAiB,CAAC,eAAe,CAAC,iGAgB1C,CAAA"}

package/dist/components/context/AnnotationProvider.js

@@ -1,29 +1,29 @@
 import * as _ from 'lodash-es';
-import React, { useMemo } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { onMouseDownForAnnotation } from '../grading/examAnnotationUtils';
 import { AnnotationPopup } from '../shared/AnnotationPopup';
 export const AnnotationContext = React.createContext({
     annotationsEnabled: false
 });
 export const AnnotationProvider = ({ children, annotations, onClickAnnotation, onSaveAnnotation }) => {
+    const annotationsEnabled = !!annotations && !!onClickAnnotation && !!onSaveAnnotation;
+    if (!annotationsEnabled) {
+        return children;
+    }
+    return (React.createElement(AnnotationContextProvider, { annotations: annotations, onClickAnnotation: onClickAnnotation, onSaveAnnotation: onSaveAnnotation }, children));
+};
+function AnnotationContextProvider({ children, annotations, onClickAnnotation, onSaveAnnotation }) {
     const [newAnnotation, setNewAnnotation] = React.useState(null);
     const [newAnnotationRef, setNewAnnotationRef] = React.useState(null);
-    const mouseUpCallback = (annotation) => {
-        setNewAnnotation(annotation);
-    };
-    function onMouseDown(e) {
+    const onMouseDown = useCallback((e) => {
         const target = e.target;
         const clickIsInPopup = !!target.closest('.e-popup');
         if (!clickIsInPopup) {
             setNewAnnotation(null);
             setNewAnnotationRef(null);
         }
-        onMouseDownForAnnotation(e, mouseUpCallback);
-    }
-    const annotationsEnabled = !!annotations && !!onClickAnnotation && !!onSaveAnnotation;
-    if (!annotationsEnabled) {
-        return children;
-    }
+        onMouseDownForAnnotation(e, setNewAnnotation);
+    }, [setNewAnnotation, setNewAnnotationRef, onMouseDownForAnnotation]);
     const textAnnotations = useMemo(() => _.groupBy(annotations.flatMap(a => {
         if (a.annotationType === 'text') {
             return a.annotationParts.map((p, index, arr) => {
@@ -59,5 +59,5 @@ export const AnnotationProvider = ({ children, annotations, onClickAnnotation, o
         React.createElement("span", { onMouseDown: onMouseDown },
             React.createElement(AnnotationPopup, null),
             children)));
-};
+}
 //# sourceMappingURL=AnnotationProvider.js.map

package/dist/components/context/AnnotationProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"AnnotationProvider.js","sourceRoot":"","sources":["../../../src/components/context/AnnotationProvider.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"AnnotationProvider.js","sourceRoot":"","sources":["../../../src/components/context/AnnotationProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,WAAW,CAAA;AAC9B,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAGnD,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAA;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAc3D,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,CAAC,aAAa,CAAwD;IAC1G,kBAAkB,EAAE,KAAK;CAC1B,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,EACjC,QAAQ,EACR,WAAW,EACX,iBAAiB,EACjB,gBAAgB,EACyB,EAAE,EAAE;IAC7C,MAAM,kBAAkB,GAAG,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,iBAAiB,IAAI,CAAC,CAAC,gBAAgB,CAAA;IAErF,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,OAAO,CACL,oBAAC,yBAAyB,IACxB,WAAW,EAAE,WAAW,EACxB,iBAAiB,EAAE,iBAAiB,EACpC,gBAAgB,EAAE,gBAAgB,IAEjC,QAAQ,CACiB,CAC7B,CAAA;AACH,CAAC,CAAA;AAQD,SAAS,yBAAyB,CAAC,EACjC,QAAQ,EACR,WAAW,EACX,iBAAiB,EACjB,gBAAgB,EACoC;IACpD,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAA2B,IAAI,CAAC,CAAA;IACxF,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAqB,IAAI,CAAC,CAAA;IAExF,MAAM,WAAW,GAAG,WAAW,CAC7B,CAAC,CAAmB,EAAE,EAAE;QACtB,MAAM,MAAM,GAAG,CAAC,CAAC,MAAiB,CAAA;QAClC,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;QACnD,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,gBAAgB,CAAC,IAAI,CAAC,CAAA;YACtB,mBAAmB,CAAC,IAAI,CAAC,CAAA;QAC3B,CAAC;QACD,wBAAwB,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAA;IAC/C,CAAC,EACD,CAAC,gBAAgB,EAAE,mBAAmB,EAAE,wBAAwB,CAAC,CAClE,CAAA;IAED,MAAM,eAAe,GAA6C,OAAO,CACvE,GAAG,EAAE,CACH,CAAC,CAAC,OAAO,CACP,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACtB,IAAI,CAAC,CAAC,cAAc,KAAK,MAAM,EAAE,CAAC;YAChC,OAAO,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;gBAC7C,MAAM,WAAW,GAAG,KAAK,KAAK,GAAG,CAAC,MAAM,GAAG,CAAC,CAAA;gBAC5C,OAAO;oBACL,GAAG,CAAC;oBACJ,YAAY,EAAE,CAAC,CAAC,YAAY;oBAC5B,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;oBAClD,MAAM,EAAE,CAAC,CAAC,MAAM;oBAChB,QAAQ,EAAE,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,QAAQ;iBACtB,CAAA;YACH,CAAC,CAAC,CAAA;QACJ,CAAC;QACD,OAAO,EAAE,CAAA;IACX,CAAC,CAAC,EACF,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,CACxB,EACH,CAAC,WAAW,CAAC,CACd,CAAA;IAED,MAAM,gBAAgB,GAA8C,OAAO,CACzE,GAAG,EAAE,CACH,CAAC,CAAC,OAAO,CACP,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACtB,IAAI,CAAC,CAAC,cAAc,KAAK,OAAO,EAAE,CAAC;YACjC,OAAO,CAAC,CAAA;QACV,CAAC;QACD,OAAO,EAAE,CAAA;IACX,CAAC,CAAC,EACF,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,CACxB,EACH,CAAC,WAAW,CAAC,CACd,CAAA;IAED,OAAO,CACL,oBAAC,iBAAiB,CAAC,QAAQ,IACzB,KAAK,EAAE;YACL,kBAAkB,EAAE,IAAI;YACxB,eAAe,EAAE,eAAe;YAChC,gBAAgB,EAAE,gBAAgB;YAClC,iBAAiB;YACjB,gBAAgB;YAChB,aAAa;YACb,gBAAgB;YAChB,gBAAgB;YAChB,mBAAmB;SACpB;QAED,8BAAM,WAAW,EAAE,WAAW;YAC5B,oBAAC,eAAe,OAAG;YAClB,QAAQ,CACJ,CACoB,CAC9B,CAAA;AACH,CAAC"}

package/dist/components/grading/examAnnotationUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"examAnnotationUtils.d.ts","sourceRoot":"","sources":["../../../src/components/grading/examAnnotationUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAkB,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AAG/E,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,EAAE,eAAe,EAAE,CAAC,CAAC,EAAE,iBAAiB,KAAK,IAAI,QA0C5G"}
+{"version":3,"file":"examAnnotationUtils.d.ts","sourceRoot":"","sources":["../../../src/components/grading/examAnnotationUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAkB,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AAG/E,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,EAAE,eAAe,EAAE,CAAC,CAAC,EAAE,iBAAiB,KAAK,IAAI,QA8C5G"}

package/dist/components/grading/examAnnotationUtils.js

@@ -1,17 +1,19 @@
 import { textAnnotationFromRange } from './editAnnotations';
 export function onMouseDownForAnnotation(e, mouseUpCallback) {
     function onMouseUpAfterAnswerMouseDown() {
+        var _a, _b;
         window.removeEventListener('mouseup', onMouseUpAfterAnswerMouseDown);
         /**
          * 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 === null)
-            return;
-        const startNode = selection.getRangeAt(0).startContainer.parentElement;
-        const endNode = selection.getRangeAt(selection.rangeCount - 1).endContainer.parentElement;
-        if (startNode && endNode && selection.toString().length > 0) {
+        const initialStartNode = (_a = selection === null || selection === void 0 ? void 0 : selection.anchorNode) === null || _a === void 0 ? void 0 : _a.parentElement;
+        const initialEndNode = (_b = selection === null || selection === void 0 ? void 0 : selection.focusNode) === null || _b === void 0 ? void 0 : _b.parentElement;
+        if (selection && initialStartNode && initialEndNode && selection.toString().length > 0) {
+            const isReversed = initialStartNode.compareDocumentPosition(initialEndNode) & Node.DOCUMENT_POSITION_PRECEDING;
+            const startNode = findAnnotatableNode(initialStartNode, isReversed ? 'previousElementSibling' : 'nextElementSibling');
+            const endNode = findAnnotatableNode(initialEndNode, isReversed ? 'nextElementSibling' : 'previousElementSibling');
             const hasMarks = selectionContainsNonhiddenMarks(selection);
             const startNodedisplayNumber = getDisplayNumber(startNode);
             const endNodeDisplayNumber = getDisplayNumber(endNode);
@@ -35,6 +37,19 @@ export function onMouseDownForAnnotation(e, mouseUpCallback) {
     }
     window.addEventListener('mouseup', onMouseUpAfterAnswerMouseDown);
 }
+const findAnnotatableNode = (node, siblingDirection) => {
+    if (node.matches('.e-annotatable')) {
+        return node;
+    }
+    const sibling = node[siblingDirection];
+    if (sibling instanceof HTMLElement) {
+        if (sibling.matches('.e-annotatable')) {
+            return sibling;
+        }
+        return sibling.querySelector('.e-annotatable') || findAnnotatableNode(sibling, siblingDirection);
+    }
+    return node;
+};
 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');
@@ -44,67 +59,65 @@ const selectionContainsNonhiddenMarks = (selection) => {
 const getDisplayNumber = (node) => { var _a; return (_a = node === null || node === void 0 ? void 0 : node.closest('[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) => {
-    const ranges = [];
-    for (let i = 0; i < selection.rangeCount; i++) {
-        const range = selection.getRangeAt(i);
-        ranges.push(range);
-    }
-    const annotations = ranges.reduce((annotations, range, rangeIndex) => {
-        var _a, _b, _c;
-        const firstNode = range.startContainer.parentElement;
-        const rangeElements = Array.from(range.cloneContents().children);
-        if (!firstNode)
-            return annotations;
-        if (rangeElements.length === 0) {
-            const annotationAnchor = firstNode.getAttribute('data-annotation-path');
-            if (!annotationAnchor)
-                return annotations;
-            const startAndLength = textAnnotationFromRange(firstNode, range);
-            annotations.push({
+    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: (_a = selection === null || selection === void 0 ? void 0 : selection.toString()) !== null && _a !== void 0 ? _a : '',
-                startIndex: (_b = startAndLength === null || startAndLength === void 0 ? void 0 : startAndLength.startIndex) !== null && _b !== void 0 ? _b : 0,
-                length: (_c = startAndLength === null || startAndLength === void 0 ? void 0 : startAndLength.length) !== null && _c !== void 0 ? _c : 0
-            });
-        }
-        rangeElements.forEach((element, elementIndex) => {
-            var _a, _b;
-            const childsAnnotationPath = element.getAttribute('data-annotation-path');
-            const isFirstRangeChild = rangeIndex === 0 && elementIndex === 0;
-            const isLastRangeChild = rangeIndex === ranges.length - 1 && elementIndex === rangeElements.length - 1;
+                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
+            }
+        ];
+    }
+    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 an annotable node, like <span> text </span> or <e:formula>...</e:formula>
-                const textContent = (_b = (_a = element.getAttribute('data-annotation-content')) !== null && _a !== void 0 ? _a : element.textContent) !== null && _b !== void 0 ? _b : '';
-                const annotationPart = {
+                // child is an annotable node, like <span> text </span>
+                const textContent = (_a = child.textContent) !== null && _a !== void 0 ? _a : '';
+                const newElement = {
                     annotationAnchor: childsAnnotationPath,
                     selectedText: textContent,
-                    startIndex: isFirstRangeChild ? range.startOffset : 0,
+                    startIndex: index === 0 ? range.startOffset : 0,
                     length: isLastRangeChild ? range.endOffset : textContent.length
                 };
-                annotations.push(annotationPart);
+                return [...acc, newElement];
             }
             else {
                 // child is a node with children, like <b> <span> text </span> </b>
-                const allChildrenWithAnnotationPath = element.querySelectorAll('[data-annotation-path]');
-                allChildrenWithAnnotationPath.forEach(child => {
-                    var _a, _b, _c;
-                    const dataAnnotationPath = child.getAttribute('data-annotation-path');
-                    const textContent = (_b = (_a = child.getAttribute('data-annotation-content')) !== null && _a !== void 0 ? _a : child.textContent) !== null && _b !== void 0 ? _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');
+                    const textContent = (_a = grandChild.textContent) !== null && _a !== void 0 ? _a : '';
                     if (dataAnnotationPath) {
-                        const startAndLength = textAnnotationFromRange(firstNode, range);
-                        const annotationPart = {
+                        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: textContent,
-                            startIndex: isFirstRangeChild ? ((_c = startAndLength === null || startAndLength === void 0 ? void 0 : startAndLength.startIndex) !== null && _c !== void 0 ? _c : 0) : 0,
-                            length: isLastRangeChild ? range.endOffset : textContent.length
+                            startIndex: isFirstOfAll ? (startAndLength === null || startAndLength === void 0 ? void 0 : startAndLength.startIndex) || 0 : 0,
+                            length: isLastOfAll ? range.endOffset : textContent.length
                         };
-                        annotations.push(annotationPart);
+                        acc.push(newElement);
                     }
                 });
+                return acc;
             }
-        });
+        }, []);
         return annotations;
-    }, []);
-    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":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAA;AAE3D,MAAM,UAAU,wBAAwB,CAAC,CAAmB,EAAE,eAA+C;IAC3G,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,gBAAgB,GAAG,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,UAAU,0CAAE,aAAa,CAAA;QAC7D,MAAM,cAAc,GAAG,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,SAAS,0CAAE,aAAa,CAAA;QAE1D,IAAI,SAAS,IAAI,gBAAgB,IAAI,cAAc,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvF,MAAM,UAAU,GAAG,gBAAgB,CAAC,uBAAuB,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,2BAA2B,CAAA;YAC9G,MAAM,SAAS,GAAG,mBAAmB,CACnC,gBAAgB,EAChB,UAAU,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,oBAAoB,CAC7D,CAAA;YACD,MAAM,OAAO,GAAG,mBAAmB,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAA;YACjH,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,cAAc,EAAE,MAAM;oBACtB,eAAe,EAAE,WAAW;oBAC5B,aAAa,EAAE,sBAAsB,aAAtB,sBAAsB,cAAtB,sBAAsB,GAAI,EAAE;oBAC3C,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,mBAAmB,GAAG,CAC1B,IAAiB,EACjB,gBAAiE,EACpD,EAAE;IACf,IAAI,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACnC,OAAO,IAAI,CAAA;IACb,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAuB,CAAA;IAC5D,IAAI,OAAO,YAAY,WAAW,EAAE,CAAC;QACnC,IAAI,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACtC,OAAO,OAAO,CAAA;QAChB,CAAC;QACD,OAAQ,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAiB,IAAI,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAA;IACnH,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;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,0BAA0B,CAAC,0CAAE,YAAY,CAAC,wBAAwB,CAAC,CAAA,EAAA,CAAA;AAEnF,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;SACkB,CAAA;IACvB,CAAC;SAAM,CAAC;QACN,oCAAoC;QACpC,MAAM,WAAW,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;;YACnE,MAAM,oBAAoB,GAAG,KAAK,CAAC,YAAY,CAAC,sBAAsB,CAAC,CAAA;YACvE,MAAM,gBAAgB,GAAG,KAAK,KAAK,GAAG,CAAC,MAAM,GAAG,CAAC,CAAA;YACjD,IAAI,oBAAoB,EAAE,CAAC;gBACzB,uDAAuD;gBACvD,MAAM,WAAW,GAAG,MAAA,KAAK,CAAC,WAAW,mCAAI,EAAE,CAAA;gBAC3C,MAAM,UAAU,GAAG;oBACjB,gBAAgB,EAAE,oBAAoB;oBACtC,YAAY,EAAE,WAAW;oBACzB,UAAU,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;oBAC/C,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM;iBAChE,CAAA;gBACD,OAAO,CAAC,GAAG,GAAG,EAAE,UAAU,CAAC,CAAA;YAC7B,CAAC;iBAAM,CAAC;gBACN,mEAAmE;gBACnE,MAAM,6BAA6B,GAAG,KAAK,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,CAAA;gBACtF,6BAA6B,aAA7B,6BAA6B,uBAA7B,6BAA6B,CAAE,OAAO,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE;;oBAC9D,MAAM,kBAAkB,GAAG,UAAU,CAAC,YAAY,CAAC,sBAAsB,CAAC,CAAA;oBAC1E,MAAM,WAAW,GAAG,MAAA,UAAU,CAAC,WAAW,mCAAI,EAAE,CAAA;oBAChD,IAAI,kBAAkB,EAAE,CAAC;wBACvB,MAAM,YAAY,GAAG,KAAK,KAAK,CAAC,IAAI,QAAQ,KAAK,CAAC,CAAA;wBAClD,MAAM,gBAAgB,GAAG,QAAQ,KAAK,6BAA6B,CAAC,MAAM,GAAG,CAAC,CAAA;wBAC9E,MAAM,WAAW,GAAG,gBAAgB,IAAI,gBAAgB,CAAA;wBACxD,MAAM,cAAc,GAAG,uBAAuB,CAAC,sBAAqC,EAAE,KAAK,CAAC,CAAA;wBAC5F,MAAM,UAAU,GAAG;4BACjB,gBAAgB,EAAE,kBAAkB;4BACpC,YAAY,EAAE,WAAW;4BACzB,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,UAAU,KAAI,CAAC,CAAC,CAAC,CAAC,CAAC;4BAC9D,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM;yBAC3D,CAAA;wBACD,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;oBACtB,CAAC;gBACH,CAAC,CAAC,CAAA;gBACF,OAAO,GAAG,CAAA;YACZ,CAAC;QACH,CAAC,EAAE,EAAsB,CAAC,CAAA;QAE1B,OAAO,WAAW,CAAA;IACpB,CAAC;AACH,CAAC,CAAA"}

package/dist/components/results/DNDAnswerContainer.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import { ExamComponentProps } from '../..';
+export declare const DNDAnswerContainer: ({ element, renderChildNodes }: ExamComponentProps) => React.JSX.Element;
+//# sourceMappingURL=DNDAnswerContainer.d.ts.map

package/dist/components/results/DNDAnswerContainer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DNDAnswerContainer.d.ts","sourceRoot":"","sources":["../../../src/components/results/DNDAnswerContainer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAA;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAA;AAO1C,eAAO,MAAM,kBAAkB,kCAAmC,kBAAkB,sBAuCnF,CAAA"}

package/dist/components/results/DNDAnswerContainer.js

@@ -0,0 +1,22 @@
+import React, { useContext } from 'react';
+import { query, queryAll } from '../../dom-utils';
+import { ResultsContext } from '../context/ResultsContext';
+import { getAnswerOptionIdsByQuestionId, getAnswerOptionsByOptionId } from '../exam/DNDAnswerContainer';
+import { DNDTitleAndDroppable } from '../shared/DNDTitleAndDroppable';
+import { CorrectDNDAnswers } from './CorrectDNDAnswers';
+export const DNDAnswerContainer = ({ element, renderChildNodes }) => {
+    const { answersByQuestionId, gradingStructure } = useContext(ResultsContext);
+    const answerOptionIdsByQuestionId = getAnswerOptionIdsByQuestionId(element, answersByQuestionId);
+    const answerOptionsByOptionId = getAnswerOptionsByOptionId(element);
+    const dndAnswersWithQuestion = queryAll(element, 'dnd-answer').filter(e => !!query(e, 'dnd-answer-title'));
+    return (React.createElement("div", { className: "e-dnd-answer-container" }, dndAnswersWithQuestion.map(element => {
+        var _a;
+        const questionId = element.getAttribute('question-id');
+        const itemIds = answerOptionIdsByQuestionId[questionId] || [];
+        const answerOptionElements = (_a = (answerOptionIdsByQuestionId[questionId] || [])) === null || _a === void 0 ? void 0 : _a.map(id => (answerOptionsByOptionId === null || answerOptionsByOptionId === void 0 ? void 0 : answerOptionsByOptionId[id]) || null).filter(Boolean);
+        return (React.createElement(React.Fragment, { key: questionId },
+            React.createElement(DNDTitleAndDroppable, { key: questionId, element: element, answerOptionElements: answerOptionElements, renderChildNodes: renderChildNodes, itemIds: itemIds, page: "results" }),
+            gradingStructure && (React.createElement(CorrectDNDAnswers, { key: `${questionId}-correct`, element: element, renderChildNodes: renderChildNodes, answerOptionsById: answerOptionsByOptionId }))));
+    })));
+};
+//# sourceMappingURL=DNDAnswerContainer.js.map

package/dist/components/results/DNDAnswerContainer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DNDAnswerContainer.js","sourceRoot":"","sources":["../../../src/components/results/DNDAnswerContainer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAEzC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EAAE,8BAA8B,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAA;AACvG,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAsB,EAAE,EAAE;IACtF,MAAM,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,GAAG,UAAU,CAAC,cAAc,CAAC,CAAA;IAC5E,MAAM,2BAA2B,GAAG,8BAA8B,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAA;IAChG,MAAM,uBAAuB,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAA;IACnE,MAAM,sBAAsB,GAAG,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAA;IAE1G,OAAO,CACL,6BAAK,SAAS,EAAC,wBAAwB,IACpC,sBAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;;QACpC,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,aAAa,CAAE,CAAA;QACvD,MAAM,OAAO,GAAG,2BAA2B,CAAC,UAAU,CAAC,IAAI,EAAE,CAAA;QAC7D,MAAM,oBAAoB,GAAG,MAAA,CAAC,2BAA2B,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,0CACxE,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA,uBAAuB,aAAvB,uBAAuB,uBAAvB,uBAAuB,CAAG,EAAE,CAAC,KAAI,IAAI,EAChD,MAAM,CAAC,OAAO,CAAC,CAAA;QAElB,OAAO,CACL,oBAAC,KAAK,CAAC,QAAQ,IAAC,GAAG,EAAE,UAAU;YAC7B,oBAAC,oBAAoB,IACnB,GAAG,EAAE,UAAU,EACf,OAAO,EAAE,OAAO,EAChB,oBAAoB,EAAE,oBAAoB,EAC1C,gBAAgB,EAAE,gBAAgB,EAClC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAC,SAAS,GACd;YAED,gBAAgB,IAAI,CACnB,oBAAC,iBAAiB,IAChB,GAAG,EAAE,GAAG,UAAU,UAAU,EAC5B,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,gBAAgB,EAClC,iBAAiB,EAAE,uBAAuB,GAC1C,CACH,CACc,CAClB,CAAA;IACH,CAAC,CAAC,CACE,CACP,CAAA;AACH,CAAC,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"Formula.d.ts","sourceRoot":"","sources":["../../../src/components/shared/Formula.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAqB,MAAM,OAAO,CAAA;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AASjE,KAAK,KAAK,GAAG,IAAI,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAA;;AAGzD,wBASE"}
+{"version":3,"file":"Formula.d.ts","sourceRoot":"","sources":["../../../src/components/shared/Formula.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAqB,MAAM,OAAO,CAAA;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAOjE,KAAK,KAAK,GAAG,IAAI,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAA;;AAGzD,wBASE"}

package/dist/components/shared/Formula.js

@@ -3,8 +3,6 @@ import React, { useContext } from 'react';
 import { getAttribute, getElementPath } from '../../dom-utils';
 import { AnnotationContext } from '../context/AnnotationProvider';
 import { IsInSidebarContext } from '../context/IsInSidebarContext';
-import { isExistingAnnotation } from './markText';
-import AnnotationMark from './AnnotationTextMark';
 import HiddenAnnotationMark from './HiddenAnnotationMark';
 import { AnnotationImageMark, useImageAnnotation } from './AnnotationImageMark';
 // eslint-disable-next-line prefer-arrow-callback
@@ -18,9 +16,9 @@ export default React.memo(function Formula({ element, className }) {
 });
 // eslint-disable-next-line prefer-arrow-callback
 const PlainFormula = React.memo(function PlainFormula(props) {
-    const { svg, assistiveTitle, className } = useElementAttributes(props);
+    const { svg, assistiveTitle, isDisplayFormula } = useElementAttributes(props);
     return (React.createElement(React.Fragment, null,
-        React.createElement("span", { className: className, dangerouslySetInnerHTML: { __html: svg }, "aria-hidden": "true" }),
+        React.createElement("span", { className: classNames('e-formula', { 'e-block e-text-center': isDisplayFormula }, props.className), dangerouslySetInnerHTML: { __html: svg }, "aria-hidden": "true" }),
         React.createElement(AssistiveTitle, { assistiveTitle: assistiveTitle })));
 });
 // eslint-disable-next-line prefer-arrow-callback
@@ -29,26 +27,12 @@ const AssistiveTitle = React.memo(function AssistiveTitle({ assistiveTitle }) {
 });
 // eslint-disable-next-line prefer-arrow-callback
 const AnnotatableFormula = React.memo(function AnnotatableFormula(props) {
-    var _a, _b, _c, _d;
-    const { textAnnotations, imageAnnotations, onClickAnnotation, setNewAnnotationRef, newAnnotation, setNewAnnotation } = props.annotationContext;
-    const { svg, assistiveTitle, textContent, className } = useElementAttributes(props);
+    var _a;
+    const { imageAnnotations, onClickAnnotation, setNewAnnotationRef, newAnnotation, setNewAnnotation } = props.annotationContext;
+    const { svg, assistiveTitle, isDisplayFormula, textContent } = useElementAttributes(props);
     const path = getElementPath(props.element);
     const { elementRef, annotationRect, onMouseDown } = useImageAnnotation(path, `kaava ${textContent}`, setNewAnnotation);
-    const textElementAnnotations = [
-        ...((_a = textAnnotations[path]) !== null && _a !== void 0 ? _a : []),
-        ...((newAnnotation === null || newAnnotation === void 0 ? void 0 : newAnnotation.annotationType) === 'text'
-            ? ((_c = (_b = newAnnotation === null || newAnnotation === void 0 ? void 0 : newAnnotation.annotationParts) === null || _b === void 0 ? void 0 : _b.filter(p => p.annotationAnchor === path)) !== null && _c !== void 0 ? _c : [])
-            : [])
-    ];
-    const textMarks = textElementAnnotations.map(annotation => {
-        const annotationId = isExistingAnnotation(annotation) ? annotation.annotationId : null;
-        const key = `${annotationId !== null && annotationId !== void 0 ? annotationId : 0}_${annotation.startIndex}`;
-        if (annotation.hidden) {
-            return React.createElement(HiddenAnnotationMark, { key: key, annotationId: annotationId });
-        }
-        return (React.createElement(AnnotationMark, { key: key, annotation: annotation, onClickAnnotation: onClickAnnotation, setNewAnnotationRef: setNewAnnotationRef, __html: svg }));
-    });
-    const imageMarks = ((_d = imageAnnotations[path]) !== null && _d !== void 0 ? _d : [])
+    const imageMarks = ((_a = imageAnnotations[path]) !== null && _a !== void 0 ? _a : [])
         .map(({ annotationId, markNumber, resolved, hidden, rect }) => {
         const key = `${annotationId}_${markNumber}`;
         if (hidden) {
@@ -56,20 +40,11 @@ const AnnotatableFormula = React.memo(function AnnotatableFormula(props) {
         }
         return (React.createElement(AnnotationImageMark, { key: key, rect: rect, onClickAnnotation: onClickAnnotation, setNewAnnotationRef: setNewAnnotationRef, annotationId: annotationId, markNumber: markNumber, resolved: resolved }));
     })
-        .concat((newAnnotation === null || newAnnotation === void 0 ? void 0 : newAnnotation.annotationType) === 'image' && newAnnotation.annotationAnchor === path
-        ? [
-            React.createElement(AnnotationImageMark, { key: "new-annotation-mark", rect: newAnnotation.rect, onClickAnnotation: onClickAnnotation, setNewAnnotationRef: setNewAnnotationRef })
-        ]
-        : [])
-        .concat(annotationRect
-        ? [
-            React.createElement(AnnotationImageMark, { key: "annotation-rect", rect: annotationRect, onClickAnnotation: onClickAnnotation, setNewAnnotationRef: setNewAnnotationRef })
-        ]
-        : []);
+        .concat((newAnnotation === null || newAnnotation === void 0 ? void 0 : newAnnotation.annotationType) === 'image' && newAnnotation.annotationAnchor === path ? (React.createElement(AnnotationImageMark, { key: "new-annotation-mark", rect: newAnnotation.rect, onClickAnnotation: onClickAnnotation, setNewAnnotationRef: setNewAnnotationRef })) : ([]))
+        .concat(annotationRect ? (React.createElement(AnnotationImageMark, { key: "annotation-rect", rect: annotationRect, onClickAnnotation: onClickAnnotation, setNewAnnotationRef: setNewAnnotationRef })) : ([]));
     return (React.createElement(React.Fragment, null,
-        React.createElement("span", { ref: elementRef, className: className, "aria-hidden": "true", "data-annotation-path": path, "data-annotation-content": textContent, "data-testid": path, onMouseDown: onMouseDown },
-            textMarks.length > 0 ? null : React.createElement("span", { dangerouslySetInnerHTML: { __html: svg } }),
-            textMarks,
+        React.createElement("span", { ref: elementRef, className: classNames('e-formula e-annotatable', { 'e-block e-text-center': isDisplayFormula }, props.className), "aria-hidden": "true", "data-testid": path, onMouseDown: onMouseDown },
+            React.createElement("span", { dangerouslySetInnerHTML: { __html: svg } }),
             imageMarks),
         React.createElement(AssistiveTitle, { assistiveTitle: assistiveTitle })));
 });
@@ -79,7 +54,6 @@ function useElementAttributes(props) {
     const textContent = (_a = props.element.textContent) === null || _a === void 0 ? void 0 : _a.trim();
     const assistiveTitle = (_b = (getAttribute(props.element, 'assistive-title') || textContent)) !== null && _b !== void 0 ? _b : '';
     const isDisplayFormula = getAttribute(props.element, 'mode') === 'display';
-    const className = classNames('e-formula e-annotatable', { 'e-block e-text-center': isDisplayFormula }, props.className);
-    return { svg, assistiveTitle, textContent, className };
+    return { svg, assistiveTitle, isDisplayFormula, textContent };
 }
 //# sourceMappingURL=Formula.js.map

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"Reference.d.ts","sourceRoot":"","sources":["../../../src/components/shared/Reference.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAA;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAOjE,iBAAS,SAAS,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,EAAE,kBAAkB,qBAqDnE;;AAgCD,wBAAoC"}
+{"version":3,"file":"Reference.d.ts","sourceRoot":"","sources":["../../../src/components/shared/Reference.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAA;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAOjE,iBAAS,SAAS,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,EAAE,kBAAkB,qBAsDnE;;AAgCD,wBAAoC"}

package/dist/components/shared/Reference.js

@@ -20,13 +20,16 @@ function Reference({ element, renderChildNodes }) {
     function renderWithPrefix(localName, translationKey, Component) {
         const childElement = findChildElement(element, localName);
         return (childElement && (React.createElement(React.Fragment, { key: childElement.localName },
-            t(translationKey),
-            ' ',
+            React.createElement("span", null,
+                t(translationKey),
+                " "),
             React.createElement(Component, { element: childElement, renderChildNodes, key: childElement.localName }))));
     }
     return (React.createElement("span", { className: classNames('e-break-word', { 'e-line-through': getBooleanAttribute(element, 'hidden') }) },
-        t('references.source'),
-        NBSP,
+        React.createElement("span", null,
+            t('references.source'),
+            " ",
+            NBSP),
         intersperse('. ', [
             renderWith('author', RenderChildNodes),
             renderWith('title', Italic),
@@ -50,20 +53,20 @@ function Link({ element, renderChildNodes }) {
 function AsDate({ element }) {
     const textContent = element.textContent;
     if (/^[0-9]{4}$/.test(textContent)) {
-        return React.createElement(React.Fragment, null, textContent);
+        return React.createElement("span", null, textContent);
     }
     else {
         // The XML tag might contain leading or trailing whitespace, which breaks Date parsing.
         const date = new Date(textContent.trim());
         const { dateTimeFormatter } = useContext(CommonExamContext);
-        return React.createElement(React.Fragment, null, dateTimeFormatter.format(date));
+        return React.createElement("span", null, dateTimeFormatter.format(date));
     }
 }
 function intersperse(separator, contents) {
     return contents.filter(Boolean).reduce((acc, curr, i) => {
         acc.push(curr);
         if (i !== contents.length - 1) {
-            acc.push(separator);
+            acc.push(React.createElement("span", { key: i }, separator));
         }
         return acc;
     }, []);

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

@@ -1 +1 @@
-{"version":3,"file":"Reference.js","sourceRoot":"","sources":["../../../src/components/shared/Reference.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Reference.js","sourceRoot":"","sources":["../../../src/components/shared/Reference.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAEzC,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,gBAAgB,MAAM,qBAAqB,CAAA;AAClD,OAAO,UAAU,MAAM,YAAY,CAAA;AAEnC,SAAS,SAAS,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAsB;IAClE,MAAM,EAAE,CAAC,EAAE,GAAG,kBAAkB,EAAE,CAAA;IAClC,SAAS,UAAU,CAAC,SAAiB,EAAE,SAAkD;QACvF,MAAM,YAAY,GAAG,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;QACzD,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,GAAG,GAAG,YAAY,CAAC,SAAS,CAAA;YAClC,MAAM,OAAO,GAAG,oBAAC,SAAS,IAAO,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,GAAG,GAAM,CAAA;YACnF,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,QAAQ,GAAG,mBAAmB,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;gBAC5D,OAAO,QAAQ,CAAC,CAAC,CAAC,6BAAK,GAAG,EAAE,GAAG,IAAG,OAAO,CAAO,CAAC,CAAC,CAAC,OAAO,CAAA;YAC5D,CAAC;QACH,CAAC;IACH,CAAC;IAED,SAAS,gBAAgB,CACvB,SAAiB,EACjB,cAI4B,EAC5B,SAAkD;QAElD,MAAM,YAAY,GAAG,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;QACzD,OAAO,CACL,YAAY,IAAI,CACd,oBAAC,KAAK,CAAC,QAAQ,IAAC,GAAG,EAAE,YAAY,CAAC,SAAS;YACzC;gBAAO,CAAC,CAAC,cAAc,CAAC;oBAAS;YACjC,oBAAC,SAAS,IAAO,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,GAAG,EAAE,YAAY,CAAC,SAAS,GAAM,CAC5E,CAClB,CACF,CAAA;IACH,CAAC;IAED,OAAO,CACL,8BAAM,SAAS,EAAE,UAAU,CAAC,cAAc,EAAE,EAAE,gBAAgB,EAAE,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC;QACvG;YACG,CAAC,CAAC,mBAAmB,CAAC;;YAAG,IAAI,CACzB;QACN,WAAW,CAAC,IAAI,EAAE;YACjB,UAAU,CAAC,QAAQ,EAAE,gBAAgB,CAAC;YACtC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC;YAC3B,UAAU,CAAC,WAAW,EAAE,gBAAgB,CAAC;YACzC,UAAU,CAAC,aAAa,EAAE,gBAAgB,CAAC;YAC3C,UAAU,CAAC,cAAc,EAAE,gBAAgB,CAAC;YAC5C,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC;YACvB,gBAAgB,CAAC,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,CAAC;YAC/D,gBAAgB,CAAC,gBAAgB,EAAE,2BAA2B,EAAE,MAAM,CAAC;YACvE,gBAAgB,CAAC,YAAY,EAAE,uBAAuB,EAAE,gBAAgB,CAAC;YACzE,gBAAgB,CAAC,aAAa,EAAE,wBAAwB,EAAE,gBAAgB,CAAC;YAC3E,UAAU,CAAC,MAAM,EAAE,gBAAgB,CAAC;SACrC,CAAC,CACG,CACR,CAAA;AACH,CAAC;AAED,SAAS,MAAM,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAsB;IAC/D,OAAO,gCAAK,gBAAgB,CAAC,OAAO,CAAC,CAAM,CAAA;AAC7C,CAAC;AAED,SAAS,IAAI,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAsB;IAC7D,OAAO,+BAAI,gBAAgB,CAAC,OAAO,CAAC,CAAK,CAAA;AAC3C,CAAC;AAED,SAAS,MAAM,CAAC,EAAE,OAAO,EAAsB;IAC7C,MAAM,WAAW,GAAG,OAAO,CAAC,WAAY,CAAA;IACxC,IAAI,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;QACnC,OAAO,kCAAO,WAAW,CAAQ,CAAA;IACnC,CAAC;SAAM,CAAC;QACN,uFAAuF;QACvF,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAA;QACzC,MAAM,EAAE,iBAAiB,EAAE,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAA;QAC3D,OAAO,kCAAO,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAQ,CAAA;IACtD,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,SAAiB,EAAE,QAA2B;IACjE,OAAO,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAoB,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE;QACzE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACd,IAAI,CAAC,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,GAAG,CAAC,IAAI,CAAC,8BAAM,GAAG,EAAE,CAAC,IAAG,SAAS,CAAQ,CAAC,CAAA;QAC5C,CAAC;QACD,OAAO,GAAG,CAAA;IACZ,CAAC,EAAE,EAAE,CAAC,CAAA;AACR,CAAC;AAED,eAAe,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA"}

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { AnnotationPart, WithAnnotationId } from '../../types/ExamAnnotations';
-export declare function getKey(annotation: AnnotationPart): number;
+export declare function getKey(annotation: AnnotationPart): string;
 export declare function isExistingAnnotation(annotation: AnnotationPart): annotation is WithAnnotationId<AnnotationPart>;
 export declare function markText(text: string, annotations: AnnotationPart[], onClickAnnotation: (e: React.MouseEvent<HTMLElement, MouseEvent>, annotationId: number) => void, setNewAnnotationRef: (ref: HTMLElement | null) => void): React.ReactNode[];
 //# sourceMappingURL=markText.d.ts.map

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

@@ -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,cAAc,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAI9E,wBAAgB,MAAM,CAAC,UAAU,EAAE,cAAc,UAEhD;AAED,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,cAAc,GAAG,UAAU,IAAI,gBAAgB,CAAC,cAAc,CAAC,CAE/G;AAMD,wBAAgB,QAAQ,CACtB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,cAAc,EAAE,EAC7B,iBAAiB,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,EAC/F,mBAAmB,EAAE,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,KAAK,IAAI,qBAqGvD"}
+{"version":3,"file":"markText.d.ts","sourceRoot":"","sources":["../../../src/components/shared/markText.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAI9E,wBAAgB,MAAM,CAAC,UAAU,EAAE,cAAc,UAIhD;AAED,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,cAAc,GAAG,UAAU,IAAI,gBAAgB,CAAC,cAAc,CAAC,CAE/G;AAMD,wBAAgB,QAAQ,CACtB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,cAAc,EAAE,EAC7B,iBAAiB,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,EAC/F,mBAAmB,EAAE,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,KAAK,IAAI,qBAgGvD"}