@digabi/exam-engine-core 23.4.7 → 23.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/__tests__/playwright/Annotations.test.js +110 -28
- package/dist/__tests__/playwright/Annotations.test.js.map +1 -1
- package/dist/__tests__/playwright/attachments/Attachments.test.js +1 -1
- package/dist/__tests__/playwright/attachments/Attachments.test.js.map +1 -1
- package/dist/__tests__/playwright/exam/Exam.test.js +1 -1
- package/dist/__tests__/playwright/exam/Exam.test.js.map +1 -1
- package/dist/__tests__/playwright/grading-instructions/GradingInstructions.test.js +1 -1
- package/dist/__tests__/playwright/grading-instructions/GradingInstructions.test.js.map +1 -1
- package/dist/__tests__/playwright/stories/Annotations.story.d.ts +2 -2
- package/dist/__tests__/playwright/stories/Annotations.story.d.ts.map +1 -1
- package/dist/__tests__/playwright/stories/attachments/Attachments.story.d.ts +2 -2
- package/dist/__tests__/playwright/stories/attachments/Attachments.story.d.ts.map +1 -1
- package/dist/__tests__/playwright/stories/exam/Exam.story.d.ts +2 -2
- package/dist/__tests__/playwright/stories/exam/Exam.story.d.ts.map +1 -1
- package/dist/__tests__/playwright/stories/grading-intructions/GradingInstructions.story.d.ts +2 -2
- package/dist/__tests__/playwright/stories/grading-intructions/GradingInstructions.story.d.ts.map +1 -1
- package/dist/__tests__/playwright/utils/utils.d.ts +2 -1
- package/dist/__tests__/playwright/utils/utils.d.ts.map +1 -1
- package/dist/__tests__/playwright/utils/utils.js +19 -3
- package/dist/__tests__/playwright/utils/utils.js.map +1 -1
- package/dist/__tests__/tsconfig.tsbuildinfo +1 -1
- package/dist/components/context/AnnotationProvider.d.ts +11 -9
- package/dist/components/context/AnnotationProvider.d.ts.map +1 -1
- package/dist/components/context/AnnotationProvider.js +29 -13
- package/dist/components/context/AnnotationProvider.js.map +1 -1
- package/dist/components/exam/Exam.d.ts +2 -2
- package/dist/components/exam/Exam.d.ts.map +1 -1
- package/dist/components/exam/Exam.js.map +1 -1
- package/dist/components/grading/examAnnotationUtils.d.ts +2 -1
- package/dist/components/grading/examAnnotationUtils.d.ts.map +1 -1
- package/dist/components/grading/examAnnotationUtils.js +55 -49
- package/dist/components/grading/examAnnotationUtils.js.map +1 -1
- package/dist/components/shared/AnnotatableText.d.ts.map +1 -1
- package/dist/components/shared/AnnotatableText.js +6 -6
- package/dist/components/shared/AnnotatableText.js.map +1 -1
- package/dist/components/shared/AnnotationImageMark.d.ts +3 -2
- package/dist/components/shared/AnnotationImageMark.d.ts.map +1 -1
- package/dist/components/shared/AnnotationImageMark.js +4 -3
- package/dist/components/shared/AnnotationImageMark.js.map +1 -1
- package/dist/components/shared/AnnotationPopup.d.ts.map +1 -1
- package/dist/components/shared/AnnotationPopup.js +5 -2
- package/dist/components/shared/AnnotationPopup.js.map +1 -1
- package/dist/components/shared/Formula.d.ts +2 -2
- package/dist/components/shared/Formula.d.ts.map +1 -1
- package/dist/components/shared/Formula.js +81 -9
- package/dist/components/shared/Formula.js.map +1 -1
- package/dist/components/shared/markText.d.ts +4 -3
- package/dist/components/shared/markText.d.ts.map +1 -1
- package/dist/components/shared/markText.js +4 -3
- package/dist/components/shared/markText.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/main-bundle.js +1 -1
- package/dist/main.css +1 -1
- package/dist/types/ExamAnnotations.d.ts +0 -1
- package/dist/types/ExamAnnotations.d.ts.map +1 -1
- package/dist/types/Score.d.ts +0 -26
- package/dist/types/Score.d.ts.map +1 -1
- package/package.json +2 -2
- package/dist/__tests__/annotations.test.d.ts +0 -2
- package/dist/__tests__/annotations.test.d.ts.map +0 -1
- package/dist/__tests__/annotations.test.js +0 -306
- package/dist/__tests__/annotations.test.js.map +0 -1
- package/dist/assets/closeButton.svg +0 -1
- package/dist/assets/collapse.svg +0 -12
- package/dist/assets/expand.svg +0 -12
- package/dist/assets/helpButton.svg +0 -9
- package/dist/assets/redoButton.svg +0 -5
- package/dist/assets/undoButton.svg +0 -5
- package/dist/components/results/DNDAnswerContainer.d.ts +0 -4
- package/dist/components/results/DNDAnswerContainer.d.ts.map +0 -1
- package/dist/components/results/DNDAnswerContainer.js +0 -22
- package/dist/components/results/DNDAnswerContainer.js.map +0 -1
- package/dist/eslint.config.d.ts +0 -22
- package/dist/eslint.config.d.ts.map +0 -1
- package/dist/eslint.config.js +0 -31
- package/dist/eslint.config.js.map +0 -1
- package/dist/i18n/exam_titles_fi-FI.d.ts +0 -46
- package/dist/i18n/exam_titles_fi-FI.d.ts.map +0 -1
- package/dist/i18n/exam_titles_fi-FI.js +0 -46
- package/dist/i18n/exam_titles_fi-FI.js.map +0 -1
- package/dist/i18n/exam_titles_fi-FI.json +0 -45
- package/dist/i18n/exam_titles_sv-FI.d.ts +0 -46
- package/dist/i18n/exam_titles_sv-FI.d.ts.map +0 -1
- package/dist/i18n/exam_titles_sv-FI.js +0 -46
- package/dist/i18n/exam_titles_sv-FI.js.map +0 -1
- package/dist/i18n/exam_titles_sv-FI.json +0 -45
- package/dist/i18n/exams.d.ts +0 -11
- package/dist/i18n/exams.d.ts.map +0 -1
- package/dist/i18n/exams.js +0 -10
- package/dist/i18n/exams.js.map +0 -1
@@ -1,21 +1,23 @@
|
|
1
1
|
import React from 'react';
|
2
|
-
import { NewExamAnnotation,
|
2
|
+
import { AnnotationPart, ExamImageAnnotation, NewExamAnnotation, WithAnnotationId } from '../../types/ExamAnnotations';
|
3
3
|
import { AnnotationProps } from '../exam/Exam';
|
4
4
|
interface Props {
|
5
5
|
children: React.ReactNode;
|
6
6
|
}
|
7
|
-
export
|
8
|
-
|
9
|
-
onClickAnnotation?: (e: React.MouseEvent<HTMLElement, MouseEvent>, annotation: RenderableAnnotation) => void;
|
10
|
-
onSaveAnnotation?: (annotation: NewExamAnnotation, comment: string) => Promise<string | undefined>;
|
11
|
-
}
|
12
|
-
export interface AnnotationContextType extends RenderableAnnotationProps {
|
7
|
+
export type AnnotationContextType = {
|
8
|
+
annotationsEnabled: true;
|
13
9
|
newAnnotation: NewExamAnnotation | null;
|
14
10
|
setNewAnnotation: (a: NewExamAnnotation | null) => void;
|
15
11
|
newAnnotationRef: HTMLElement | null;
|
16
12
|
setNewAnnotationRef: (ref: HTMLElement | null) => void;
|
17
|
-
|
18
|
-
|
13
|
+
textAnnotations: Record<string, WithAnnotationId<AnnotationPart>[]>;
|
14
|
+
imageAnnotations: Record<string, ExamImageAnnotation[]>;
|
15
|
+
onClickAnnotation: (e: React.MouseEvent<HTMLElement, MouseEvent>, annotationId: number) => void;
|
16
|
+
onSaveAnnotation: (annotation: NewExamAnnotation, comment: string) => Promise<string | undefined>;
|
17
|
+
};
|
18
|
+
export declare const AnnotationContext: React.Context<AnnotationContextType | {
|
19
|
+
annotationsEnabled: false;
|
20
|
+
}>;
|
19
21
|
export declare const AnnotationProvider: ({ children, annotations, onClickAnnotation, onSaveAnnotation }: Props & AnnotationProps) => string | number | boolean | React.JSX.Element | Iterable<React.ReactNode> | null | undefined;
|
20
22
|
export {};
|
21
23
|
//# sourceMappingURL=AnnotationProvider.d.ts.map
|
@@ -1 +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,iBAAiB,EAAE,
|
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"}
|
@@ -2,7 +2,9 @@ import * as _ from 'lodash-es';
|
|
2
2
|
import React, { useMemo } from 'react';
|
3
3
|
import { onMouseDownForAnnotation } from '../grading/examAnnotationUtils';
|
4
4
|
import { AnnotationPopup } from '../shared/AnnotationPopup';
|
5
|
-
export const AnnotationContext = React.createContext({
|
5
|
+
export const AnnotationContext = React.createContext({
|
6
|
+
annotationsEnabled: false
|
7
|
+
});
|
6
8
|
export const AnnotationProvider = ({ children, annotations, onClickAnnotation, onSaveAnnotation }) => {
|
7
9
|
const [newAnnotation, setNewAnnotation] = React.useState(null);
|
8
10
|
const [newAnnotationRef, setNewAnnotationRef] = React.useState(null);
|
@@ -18,21 +20,35 @@ export const AnnotationProvider = ({ children, annotations, onClickAnnotation, o
|
|
18
20
|
}
|
19
21
|
onMouseDownForAnnotation(e, mouseUpCallback);
|
20
22
|
}
|
21
|
-
|
23
|
+
const annotationsEnabled = !!annotations && !!onClickAnnotation && !!onSaveAnnotation;
|
24
|
+
if (!annotationsEnabled) {
|
22
25
|
return children;
|
23
26
|
}
|
24
|
-
const
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
27
|
+
const textAnnotations = useMemo(() => _.groupBy(annotations.flatMap(a => {
|
28
|
+
if (a.annotationType === 'text') {
|
29
|
+
return a.annotationParts.map((p, index, arr) => {
|
30
|
+
const isLastChild = index === arr.length - 1;
|
31
|
+
return {
|
32
|
+
...p,
|
33
|
+
annotationId: a.annotationId,
|
34
|
+
markNumber: isLastChild ? a.markNumber : undefined,
|
35
|
+
hidden: a.hidden,
|
36
|
+
resolved: a === null || a === void 0 ? void 0 : a.resolved
|
37
|
+
};
|
38
|
+
});
|
39
|
+
}
|
40
|
+
return [];
|
41
|
+
}), a => a.annotationAnchor), [annotations]);
|
42
|
+
const imageAnnotations = useMemo(() => _.groupBy(annotations.flatMap(a => {
|
43
|
+
if (a.annotationType === 'image') {
|
44
|
+
return a;
|
45
|
+
}
|
46
|
+
return [];
|
47
|
+
}), a => a.annotationAnchor), [annotations]);
|
34
48
|
return (React.createElement(AnnotationContext.Provider, { value: {
|
35
|
-
|
49
|
+
annotationsEnabled: true,
|
50
|
+
textAnnotations: textAnnotations,
|
51
|
+
imageAnnotations: imageAnnotations,
|
36
52
|
onClickAnnotation,
|
37
53
|
onSaveAnnotation,
|
38
54
|
newAnnotation,
|
@@ -1 +1 @@
|
|
1
|
-
{"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,OAAO,EAAE,MAAM,OAAO,CAAA;AAGtC,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAA;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;
|
1
|
+
{"version":3,"file":"AnnotationProvider.js","sourceRoot":"","sources":["../../../src/components/context/AnnotationProvider.tsx"],"names":[],"mappings":"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"}
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import React from 'react';
|
2
|
-
import { ExamAnnotation, ExamAnswer, ExamServerAPI, InitialCasStatus, NewExamAnnotation,
|
2
|
+
import { ExamAnnotation, ExamAnswer, ExamServerAPI, InitialCasStatus, NewExamAnnotation, RestrictedAudioPlaybackStats } from '../../index';
|
3
3
|
import { RichTextAnswer, TextAnswer as TextAnswerType } from '../../types/ExamAnswer';
|
4
4
|
/** Props common to taking the exams and viewing results */
|
5
5
|
export interface CommonExamProps {
|
@@ -17,7 +17,7 @@ export interface CommonExamProps {
|
|
17
17
|
}
|
18
18
|
export interface AnnotationProps {
|
19
19
|
annotations?: ExamAnnotation[];
|
20
|
-
onClickAnnotation?: (e: React.MouseEvent<HTMLElement, MouseEvent>,
|
20
|
+
onClickAnnotation?: (e: React.MouseEvent<HTMLElement, MouseEvent>, annotationId: number) => void;
|
21
21
|
onSaveAnnotation?: (annotation: NewExamAnnotation, comment: string) => Promise<string | undefined>;
|
22
22
|
}
|
23
23
|
interface UndoViewProps {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"Exam.d.ts","sourceRoot":"","sources":["../../../src/components/exam/Exam.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqD,MAAM,OAAO,CAAA;AAOzE,OAAO,EACL,cAAc,EACd,UAAU,EACV,aAAa,EACb,gBAAgB,EAChB,iBAAiB,EACjB,
|
1
|
+
{"version":3,"file":"Exam.d.ts","sourceRoot":"","sources":["../../../src/components/exam/Exam.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqD,MAAM,OAAO,CAAA;AAOzE,OAAO,EACL,cAAc,EACd,UAAU,EACV,aAAa,EACb,gBAAgB,EAChB,iBAAiB,EACjB,4BAA4B,EAC7B,MAAM,aAAa,CAAA;AAIpB,OAAO,EAAE,cAAc,EAAE,UAAU,IAAI,cAAc,EAAE,MAAM,wBAAwB,CAAA;AA8CrF,2DAA2D;AAC3D,MAAM,WAAW,eAAe;IAC9B,sBAAsB;IACtB,OAAO,EAAE,UAAU,EAAE,CAAA;IACrB,uCAAuC;IACvC,cAAc,EAAE,MAAM,CAAA;IACtB,iEAAiE;IACjE,iBAAiB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAA;IAC/C,mBAAmB;IACnB,GAAG,EAAE,WAAW,CAAA;IAChB,mCAAmC;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,EAAE,cAAc,EAAE,CAAA;IAC9B,iBAAiB,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAA;IAChG,gBAAgB,CAAC,EAAE,CAAC,UAAU,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;CACnG;AACD,UAAU,aAAa;IACrB,KAAK,EAAE,MAAM,IAAI,CAAA;IACjB,aAAa,EAAE,CAAC,UAAU,EAAE,cAAc,GAAG,cAAc,KAAK,IAAI,CAAA;IACpE,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;CACd;AAED,uDAAuD;AACvD,MAAM,WAAW,SAAU,SAAQ,eAAe;IAChD,2CAA2C;IAC3C,SAAS,EAAE,gBAAgB,CAAA;IAC3B,oEAAoE;IACpE,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B;;;OAGG;IACH,4BAA4B,EAAE,4BAA4B,EAAE,CAAA;IAC5D,qCAAqC;IACrC,aAAa,EAAE,aAAa,CAAA;IAC5B,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,OAAO,CAAA;IACrB,aAAa,EAAE,aAAa,CAAA;CAC7B;AAED,eAAO,MAAM,gBAAgB,yDA+B3B,CAAA;;AA2MF,wBAAuE"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"Exam.js","sourceRoot":"","sources":["../../../src/components/exam/Exam.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;
|
1
|
+
{"version":3,"file":"Exam.js","sourceRoot":"","sources":["../../../src/components/exam/Exam.tsx"],"names":[],"mappings":"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"}
|
@@ -1,3 +1,4 @@
|
|
1
1
|
import React from 'react';
|
2
|
-
|
2
|
+
import { NewExamAnnotation } from '../../types/ExamAnnotations';
|
3
|
+
export declare function onMouseDownForAnnotation(e: React.MouseEvent, mouseUpCallback: (a: NewExamAnnotation) => void): void;
|
3
4
|
//# sourceMappingURL=examAnnotationUtils.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"examAnnotationUtils.d.ts","sourceRoot":"","sources":["../../../src/components/grading/examAnnotationUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;
|
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"}
|
@@ -1,16 +1,17 @@
|
|
1
1
|
import { textAnnotationFromRange } from './editAnnotations';
|
2
2
|
export function onMouseDownForAnnotation(e, mouseUpCallback) {
|
3
3
|
function onMouseUpAfterAnswerMouseDown() {
|
4
|
-
var _a, _b;
|
5
4
|
window.removeEventListener('mouseup', onMouseUpAfterAnswerMouseDown);
|
6
5
|
/**
|
7
6
|
* selection.anchorNode = where mouse is pressed down (chronologically first)
|
8
7
|
* selection.getRangeAt(0).startContainer = where selection starts (first in DOM)
|
9
8
|
*/
|
10
9
|
const selection = window.getSelection();
|
11
|
-
|
12
|
-
|
13
|
-
|
10
|
+
if (selection === null)
|
11
|
+
return;
|
12
|
+
const startNode = selection.getRangeAt(0).startContainer.parentElement;
|
13
|
+
const endNode = selection.getRangeAt(selection.rangeCount - 1).endContainer.parentElement;
|
14
|
+
if (startNode && endNode && selection.toString().length > 0) {
|
14
15
|
const hasMarks = selectionContainsNonhiddenMarks(selection);
|
15
16
|
const startNodedisplayNumber = getDisplayNumber(startNode);
|
16
17
|
const endNodeDisplayNumber = getDisplayNumber(endNode);
|
@@ -20,8 +21,9 @@ export function onMouseDownForAnnotation(e, mouseUpCallback) {
|
|
20
21
|
!hasMarks) {
|
21
22
|
const annotations = extractAnnotationsFromSelection(selection);
|
22
23
|
mouseUpCallback({
|
24
|
+
annotationType: 'text',
|
23
25
|
annotationParts: annotations,
|
24
|
-
displayNumber: startNodedisplayNumber,
|
26
|
+
displayNumber: startNodedisplayNumber !== null && startNodedisplayNumber !== void 0 ? startNodedisplayNumber : '',
|
25
27
|
selectedText: annotations.map(a => a.selectedText).join(' ')
|
26
28
|
});
|
27
29
|
}
|
@@ -42,63 +44,67 @@ const selectionContainsNonhiddenMarks = (selection) => {
|
|
42
44
|
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'); };
|
43
45
|
const isAnnotatable = (node) => (node === null || node === void 0 ? void 0 : node.getAttribute('data-annotation-path')) && node.tagName !== 'MARK';
|
44
46
|
const extractAnnotationsFromSelection = (selection) => {
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
if (!(rangeChildren === null || rangeChildren === void 0 ? void 0 : rangeChildren.length)) {
|
50
|
-
// selection is plain text
|
51
|
-
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');
|
52
|
-
const startAndLength = textAnnotationFromRange(firstSelectedNodeInDOM, range);
|
53
|
-
return [
|
54
|
-
{
|
55
|
-
annotationAnchor,
|
56
|
-
selectedText: (selection === null || selection === void 0 ? void 0 : selection.toString()) || '',
|
57
|
-
startIndex: (startAndLength === null || startAndLength === void 0 ? void 0 : startAndLength.startIndex) || 0,
|
58
|
-
length: (startAndLength === null || startAndLength === void 0 ? void 0 : startAndLength.length) || 0
|
59
|
-
}
|
60
|
-
];
|
47
|
+
const ranges = [];
|
48
|
+
for (let i = 0; i < selection.rangeCount; i++) {
|
49
|
+
const range = selection.getRangeAt(i);
|
50
|
+
ranges.push(range);
|
61
51
|
}
|
62
|
-
|
63
|
-
|
64
|
-
const
|
65
|
-
|
66
|
-
|
67
|
-
|
52
|
+
const annotations = ranges.reduce((annotations, range, rangeIndex) => {
|
53
|
+
var _a, _b, _c;
|
54
|
+
const firstNode = range.startContainer.parentElement;
|
55
|
+
const rangeElements = Array.from(range.cloneContents().children);
|
56
|
+
if (!firstNode)
|
57
|
+
return annotations;
|
58
|
+
if (rangeElements.length === 0) {
|
59
|
+
const annotationAnchor = firstNode.getAttribute('data-annotation-path');
|
60
|
+
if (!annotationAnchor)
|
61
|
+
return annotations;
|
62
|
+
const startAndLength = textAnnotationFromRange(firstNode, range);
|
63
|
+
annotations.push({
|
64
|
+
annotationAnchor,
|
65
|
+
selectedText: (_a = selection === null || selection === void 0 ? void 0 : selection.toString()) !== null && _a !== void 0 ? _a : '',
|
66
|
+
startIndex: (_b = startAndLength === null || startAndLength === void 0 ? void 0 : startAndLength.startIndex) !== null && _b !== void 0 ? _b : 0,
|
67
|
+
length: (_c = startAndLength === null || startAndLength === void 0 ? void 0 : startAndLength.length) !== null && _c !== void 0 ? _c : 0
|
68
|
+
});
|
69
|
+
}
|
70
|
+
rangeElements.forEach((element, elementIndex) => {
|
71
|
+
var _a, _b;
|
72
|
+
const childsAnnotationPath = element.getAttribute('data-annotation-path');
|
73
|
+
const isFirstRangeChild = rangeIndex === 0 && elementIndex === 0;
|
74
|
+
const isLastRangeChild = rangeIndex === ranges.length - 1 && elementIndex === rangeElements.length - 1;
|
68
75
|
if (childsAnnotationPath) {
|
69
|
-
// child is
|
70
|
-
const
|
76
|
+
// child is an annotable node, like <span> text </span> or <e:formula>...</e:formula>
|
77
|
+
const textContent = (_b = (_a = element.getAttribute('data-annotation-content')) !== null && _a !== void 0 ? _a : element.textContent) !== null && _b !== void 0 ? _b : '';
|
78
|
+
const annotationPart = {
|
71
79
|
annotationAnchor: childsAnnotationPath,
|
72
|
-
selectedText:
|
73
|
-
startIndex:
|
74
|
-
length: isLastRangeChild ? range.endOffset :
|
80
|
+
selectedText: textContent,
|
81
|
+
startIndex: isFirstRangeChild ? range.startOffset : 0,
|
82
|
+
length: isLastRangeChild ? range.endOffset : textContent.length
|
75
83
|
};
|
76
|
-
|
84
|
+
annotations.push(annotationPart);
|
77
85
|
}
|
78
86
|
else {
|
79
87
|
// child is a node with children, like <b> <span> text </span> </b>
|
80
|
-
const allChildrenWithAnnotationPath =
|
81
|
-
allChildrenWithAnnotationPath
|
82
|
-
var _a;
|
83
|
-
const dataAnnotationPath =
|
88
|
+
const allChildrenWithAnnotationPath = element.querySelectorAll('[data-annotation-path]');
|
89
|
+
allChildrenWithAnnotationPath.forEach(child => {
|
90
|
+
var _a, _b, _c;
|
91
|
+
const dataAnnotationPath = child.getAttribute('data-annotation-path');
|
92
|
+
const textContent = (_b = (_a = child.getAttribute('data-annotation-content')) !== null && _a !== void 0 ? _a : child.textContent) !== null && _b !== void 0 ? _b : '';
|
84
93
|
if (dataAnnotationPath) {
|
85
|
-
const
|
86
|
-
const
|
87
|
-
const isLastOfAll = isLastRangeChild && isLastGrandChild;
|
88
|
-
const startAndLength = textAnnotationFromRange(firstSelectedNodeInDOM, range);
|
89
|
-
const newElement = {
|
94
|
+
const startAndLength = textAnnotationFromRange(firstNode, range);
|
95
|
+
const annotationPart = {
|
90
96
|
annotationAnchor: dataAnnotationPath,
|
91
|
-
selectedText:
|
92
|
-
startIndex:
|
93
|
-
length:
|
97
|
+
selectedText: textContent,
|
98
|
+
startIndex: isFirstRangeChild ? ((_c = startAndLength === null || startAndLength === void 0 ? void 0 : startAndLength.startIndex) !== null && _c !== void 0 ? _c : 0) : 0,
|
99
|
+
length: isLastRangeChild ? range.endOffset : textContent.length
|
94
100
|
};
|
95
|
-
|
101
|
+
annotations.push(annotationPart);
|
96
102
|
}
|
97
103
|
});
|
98
|
-
return acc;
|
99
104
|
}
|
100
|
-
}
|
105
|
+
});
|
101
106
|
return annotations;
|
102
|
-
}
|
107
|
+
}, []);
|
108
|
+
return annotations;
|
103
109
|
};
|
104
110
|
//# sourceMappingURL=examAnnotationUtils.js.map
|
@@ -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,
|
1
|
+
{"version":3,"file":"examAnnotationUtils.js","sourceRoot":"","sources":["../../../src/components/grading/examAnnotationUtils.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"AnnotatableText.d.ts","sourceRoot":"","sources":["../../../src/components/shared/AnnotatableText.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAA;AAMzC,eAAO,MAAM,eAAe,aAAc;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,+
|
1
|
+
{"version":3,"file":"AnnotatableText.d.ts","sourceRoot":"","sources":["../../../src/components/shared/AnnotatableText.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAA;AAMzC,eAAO,MAAM,eAAe,aAAc;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,+BA6BvD,CAAA"}
|
@@ -7,16 +7,16 @@ export const AnnotatableText = ({ node }) => {
|
|
7
7
|
var _a, _b;
|
8
8
|
const annotationContextData = useContext(AnnotationContext);
|
9
9
|
const { isInSidebar } = useContext(IsInSidebarContext);
|
10
|
-
const
|
11
|
-
const canNotBeAnnotated = (annotationContextData === null || annotationContextData === void 0 ? void 0 : annotationContextData.annotations) === undefined ||
|
12
|
-
((_a = node.textContent) === null || _a === void 0 ? void 0 : _a.trim().length) === 0 ||
|
13
|
-
isInSidebar !== undefined;
|
10
|
+
const canNotBeAnnotated = !annotationContextData.annotationsEnabled || ((_a = node.textContent) === null || _a === void 0 ? void 0 : _a.trim().length) === 0 || isInSidebar !== undefined;
|
14
11
|
if (canNotBeAnnotated) {
|
15
12
|
return node.textContent;
|
16
13
|
}
|
14
|
+
const { textAnnotations, onClickAnnotation, setNewAnnotationRef, newAnnotation } = annotationContextData;
|
17
15
|
const path = getElementPath(node);
|
18
|
-
const newAnnotationPartsForThisNode = (
|
19
|
-
|
16
|
+
const newAnnotationPartsForThisNode = (newAnnotation === null || newAnnotation === void 0 ? void 0 : newAnnotation.annotationType) === 'text'
|
17
|
+
? ((_b = newAnnotation === null || newAnnotation === void 0 ? void 0 : newAnnotation.annotationParts) === null || _b === void 0 ? void 0 : _b.filter(p => p.annotationAnchor === path)) || []
|
18
|
+
: [];
|
19
|
+
const savedAnnotationsForThisNode = (textAnnotations === null || textAnnotations === void 0 ? void 0 : textAnnotations[path]) || [];
|
20
20
|
const allAnnotationsForThisNode = [...savedAnnotationsForThisNode, ...newAnnotationPartsForThisNode];
|
21
21
|
return (React.createElement("span", { className: "e-annotatable", key: path, "data-annotation-path": path, "data-testid": path }, allAnnotationsForThisNode.length > 0 && onClickAnnotation
|
22
22
|
? markText(node.textContent, allAnnotationsForThisNode, onClickAnnotation, setNewAnnotationRef)
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"AnnotatableText.js","sourceRoot":"","sources":["../../../src/components/shared/AnnotatableText.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,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;
|
1
|
+
{"version":3,"file":"AnnotatableText.js","sourceRoot":"","sources":["../../../src/components/shared/AnnotatableText.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,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;IAEtD,MAAM,iBAAiB,GACrB,CAAC,qBAAqB,CAAC,kBAAkB,IAAI,CAAA,MAAA,IAAI,CAAC,WAAW,0CAAE,IAAI,GAAG,MAAM,MAAK,CAAC,IAAI,WAAW,KAAK,SAAS,CAAA;IAEjH,IAAI,iBAAiB,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC,WAAY,CAAA;IAC1B,CAAC;IAED,MAAM,EAAE,eAAe,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,aAAa,EAAE,GAAG,qBAAqB,CAAA;IAExG,MAAM,IAAI,GAAG,cAAc,CAAC,IAAe,CAAC,CAAA;IAE5C,MAAM,6BAA6B,GACjC,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,cAAc,MAAK,MAAM;QACtC,CAAC,CAAC,CAAA,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,eAAe,0CAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,KAAK,IAAI,CAAC,KAAI,EAAE;QAChF,CAAC,CAAC,EAAE,CAAA;IACR,MAAM,2BAA2B,GAAG,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAG,IAAI,CAAC,KAAI,EAAE,CAAA;IACjE,MAAM,yBAAyB,GAAG,CAAC,GAAG,2BAA2B,EAAE,GAAG,6BAA6B,CAAC,CAAA;IAEpG,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,CAAC,IAAI,CAAC,WAAY,EAAE,yBAAyB,EAAE,iBAAiB,EAAE,mBAAmB,CAAC;QAChG,CAAC,CAAC,IAAI,CAAC,WAAW,CACf,CACR,CAAA;AACH,CAAC,CAAA"}
|
@@ -4,8 +4,9 @@ export declare const AnnotationImageMark: React.NamedExoticComponent<{
|
|
4
4
|
rect: NewExamImageAnnotation["rect"];
|
5
5
|
onClickAnnotation: (e: React.MouseEvent<HTMLElement, MouseEvent>, annotationId: number) => void;
|
6
6
|
setNewAnnotationRef: (e: HTMLElement | null) => void;
|
7
|
-
annotationId?: number
|
8
|
-
markNumber?: number
|
7
|
+
annotationId?: number;
|
8
|
+
markNumber?: number;
|
9
|
+
resolved?: boolean;
|
9
10
|
}>;
|
10
11
|
export declare function useImageAnnotation(anchor: string, description: string, setNewAnnotation: (a: NewExamAnnotation | null) => void): {
|
11
12
|
elementRef: React.RefObject<HTMLElement>;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"AnnotationImageMark.d.ts","sourceRoot":"","sources":["../../../src/components/shared/AnnotationImageMark.tsx"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"AnnotationImageMark.d.ts","sourceRoot":"","sources":["../../../src/components/shared/AnnotationImageMark.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmD,MAAM,OAAO,CAAA;AACvE,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAGvG,eAAO,MAAM,mBAAmB;UAQxB,sBAAsB,CAAC,MAAM,CAAC;uBACjB,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI;yBAC1E,CAAC,CAAC,EAAE,WAAW,GAAG,IAAI,KAAK,IAAI;mBACrC,MAAM;iBACR,MAAM;eACR,OAAO;EA6ClB,CAAA;AAEF,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,CAAC,CAAC,EAAE,iBAAiB,GAAG,IAAI,KAAK,IAAI;;;qBA4DnB,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC;EAkB9E"}
|
@@ -1,7 +1,8 @@
|
|
1
|
+
import classNames from 'classnames';
|
1
2
|
import { clamp } from 'lodash-es';
|
2
3
|
import React, { useCallback, useEffect, useRef, useState } from 'react';
|
3
4
|
// eslint-disable-next-line prefer-arrow-callback
|
4
|
-
export const AnnotationImageMark = React.memo(function AnnotationImageMark({ rect: { x1, y1, x2, y2 }, onClickAnnotation, setNewAnnotationRef, annotationId, markNumber }) {
|
5
|
+
export const AnnotationImageMark = React.memo(function AnnotationImageMark({ rect: { x1, y1, x2, y2 }, onClickAnnotation, setNewAnnotationRef, annotationId, markNumber, resolved }) {
|
5
6
|
const markRef = useRef(null);
|
6
7
|
const supRef = useRef(null);
|
7
8
|
useEffect(() => {
|
@@ -24,9 +25,9 @@ export const AnnotationImageMark = React.memo(function AnnotationImageMark({ rec
|
|
24
25
|
e.stopPropagation();
|
25
26
|
onClickAnnotation(e, annotationId);
|
26
27
|
}
|
27
|
-
}, [annotationId]);
|
28
|
+
}, [annotationId, onClickAnnotation]);
|
28
29
|
return (React.createElement(React.Fragment, null,
|
29
|
-
React.createElement("mark", { ref: markRef, className:
|
30
|
+
React.createElement("mark", { ref: markRef, className: classNames('e-annotation e-annotation--shape', { resolved }), "data-annotation-id": annotationId, "data-hidden": "false", onMouseDown: onMouseDown }),
|
30
31
|
markNumber && React.createElement("sup", { ref: supRef, className: "e-annotation", "data-content": markNumber })));
|
31
32
|
});
|
32
33
|
export function useImageAnnotation(anchor, description, setNewAnnotation) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"AnnotationImageMark.js","sourceRoot":"","sources":["../../../src/components/shared/AnnotationImageMark.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AACjC,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAGvE,iDAAiD;AACjD,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,mBAAmB,CAAC,EACzE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EACxB,iBAAiB,EACjB,mBAAmB,EACnB,YAAY,EACZ,UAAU,
|
1
|
+
{"version":3,"file":"AnnotationImageMark.js","sourceRoot":"","sources":["../../../src/components/shared/AnnotationImageMark.tsx"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,YAAY,CAAA;AACnC,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AACjC,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAGvE,iDAAiD;AACjD,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,mBAAmB,CAAC,EACzE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EACxB,iBAAiB,EACjB,mBAAmB,EACnB,YAAY,EACZ,UAAU,EACV,QAAQ,EAQT;IACC,MAAM,OAAO,GAAG,MAAM,CAAc,IAAI,CAAC,CAAA;IACzC,MAAM,MAAM,GAAG,MAAM,CAAc,IAAI,CAAC,CAAA;IAExC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;gBAC5B,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,CAAA;QAC7H,CAAC;QAED,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,CAAA;YAC3D,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,CAAA;QAC5D,CAAC;IACH,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;IAEpB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,CAAC,OAAO,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAClD,mBAAmB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACtC,CAAC;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,WAAW,GAAG,WAAW,CAC7B,CAAC,CAAoC,EAAE,EAAE;QACvC,IAAI,YAAY,EAAE,CAAC;YACjB,CAAC,CAAC,eAAe,EAAE,CAAA;YACnB,iBAAiB,CAAC,CAAC,EAAE,YAAY,CAAC,CAAA;QACpC,CAAC;IACH,CAAC,EACD,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAClC,CAAA;IAED,OAAO,CACL;QACE,8BACE,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,UAAU,CAAC,kCAAkC,EAAE,EAAE,QAAQ,EAAE,CAAC,wBACnD,YAAY,iBACpB,OAAO,EACnB,WAAW,EAAE,WAAW,GACxB;QACD,UAAU,IAAI,6BAAK,GAAG,EAAE,MAAM,EAAE,SAAS,EAAC,cAAc,kBAAe,UAAU,GAAI,CACrF,CACJ,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,MAAM,UAAU,kBAAkB,CAChC,MAAc,EACd,WAAmB,EACnB,gBAAuD;IAEvD,MAAM,UAAU,GAAG,MAAM,CAAc,IAAI,CAAC,CAAA;IAC5C,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,EAAkB,CAAA;IACtE,MAAM,iBAAiB,GAAG,MAAM,EAAkB,CAAA;IAElD,SAAS,CAAC,GAAG,EAAE;QACb,iBAAiB,CAAC,OAAO,GAAG,cAAc,CAAA;IAC5C,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAA;IAEpB,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC,CAAa,EAAE,EAAE;QAChD,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,CAAA;QAC7B,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;YAChB,OAAM;QACR,CAAC;QAED,CAAC,CAAC,cAAc,EAAE,CAAA;QAClB,CAAC,CAAC,eAAe,EAAE,CAAA;QAEnB,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;QACxC,iBAAiB,CAAC,IAAI,CAAC,EAAE;YACvB,IAAI,IAAI,EAAE,CAAC;gBACT,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,IAAI,CAAA;gBACvB,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAA;YAC3B,CAAC;YACD,OAAO,IAAI,CAAA;QACb,CAAC,CAAC,CAAA;IACJ,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAa,EAAE,EAAE;;QAC9C,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,CAAA;QAC7B,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;YAChB,OAAM;QACR,CAAC;QAED,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;QAChD,MAAM,CAAC,mBAAmB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;QAEpD,MAAM,aAAa,GAAG,MAAA,MAAA,UAAU,CAAC,OAAO,0CACpC,OAAO,CAAC,6BAA6B,CAAC,0CACtC,YAAY,CAAC,wBAAwB,CAAC,CAAA;QAE1C,IAAI,CAAC,aAAa,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC;YACjD,iBAAiB,CAAC,SAAS,CAAC,CAAA;YAC5B,OAAM;QACR,CAAC;QAED,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,iBAAiB,CAAC,OAAO,CAAA;QAC5C,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;QAExC,gBAAgB,CAAC;YACf,cAAc,EAAE,OAAO;YACvB,aAAa;YACb,gBAAgB,EAAE,MAAM;YACxB,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE;YACxB,WAAW;SACZ,CAAC,CAAA;QACF,iBAAiB,CAAC,SAAS,CAAC,CAAA;IAC9B,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC,CAA4C,EAAE,EAAE;QAC/E,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,CAAA;QAC7B,IAAI,EAAE,KAAK,IAAI,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClC,OAAM;QACR,CAAC;QAED,CAAC,CAAC,cAAc,EAAE,CAAA;QAClB,CAAC,CAAC,eAAe,EAAE,CAAA;QAEnB,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;QAC7C,MAAM,CAAC,gBAAgB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;QAEjD,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;QACxC,iBAAiB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;QAC7C,gBAAgB,CAAC,IAAI,CAAC,CAAA;IACxB,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,CAAA;AACpD,CAAC;AAED,SAAS,gBAAgB,CAAC,EAAe,EAAE,CAAuC;IAChF,MAAM,IAAI,GAAG,EAAE,CAAC,qBAAqB,EAAE,CAAA;IACvC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AAC/G,CAAC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"AnnotationPopup.d.ts","sourceRoot":"","sources":["../../../src/components/shared/AnnotationPopup.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAA;AAIzC,wBAAgB,eAAe,
|
1
|
+
{"version":3,"file":"AnnotationPopup.d.ts","sourceRoot":"","sources":["../../../src/components/shared/AnnotationPopup.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAA;AAIzC,wBAAgB,eAAe,6BAgC9B"}
|
@@ -2,10 +2,13 @@ import React, { useContext } from 'react';
|
|
2
2
|
import { AnnotationContext } from '../context/AnnotationProvider';
|
3
3
|
import { Popup } from './Popup';
|
4
4
|
export function AnnotationPopup() {
|
5
|
-
const
|
6
|
-
if (!
|
5
|
+
const annotationContext = useContext(AnnotationContext);
|
6
|
+
if (!annotationContext.annotationsEnabled ||
|
7
|
+
!annotationContext.newAnnotation ||
|
8
|
+
!annotationContext.newAnnotationRef) {
|
7
9
|
return null;
|
8
10
|
}
|
11
|
+
const { newAnnotation, newAnnotationRef, setNewAnnotation, setNewAnnotationRef, onSaveAnnotation } = annotationContext;
|
9
12
|
return (React.createElement(Popup, { element: newAnnotationRef, initialTextContent: '', onValueSave: async (comment) => {
|
10
13
|
const error = await onSaveAnnotation(newAnnotation, comment);
|
11
14
|
if (!error) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"AnnotationPopup.js","sourceRoot":"","sources":["../../../src/components/shared/AnnotationPopup.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE/B,MAAM,UAAU,eAAe;IAC7B,MAAM,
|
1
|
+
{"version":3,"file":"AnnotationPopup.js","sourceRoot":"","sources":["../../../src/components/shared/AnnotationPopup.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE/B,MAAM,UAAU,eAAe;IAC7B,MAAM,iBAAiB,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAA;IAEvD,IACE,CAAC,iBAAiB,CAAC,kBAAkB;QACrC,CAAC,iBAAiB,CAAC,aAAa;QAChC,CAAC,iBAAiB,CAAC,gBAAgB,EACnC,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,GAAG,iBAAiB,CAAA;IAEtH,OAAO,CACL,oBAAC,KAAK,IACJ,OAAO,EAAE,gBAAgB,EACzB,kBAAkB,EAAE,EAAE,EACtB,WAAW,EAAE,KAAK,EAAE,OAAe,EAAE,EAAE;YACrC,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAA;YAC5D,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,gBAAgB,CAAC,IAAI,CAAC,CAAA;gBACtB,mBAAmB,CAAC,IAAI,CAAC,CAAA;YAC3B,CAAC;YACD,OAAO,KAAK,CAAA;QACd,CAAC,EACD,YAAY,EAAE,KAAK,EACnB,QAAQ,EAAE,GAAG,EAAE;YACb,gBAAgB,CAAC,IAAI,CAAC,CAAA;YACtB,mBAAmB,CAAC,IAAI,CAAC,CAAA;QAC3B,CAAC,GACD,CACH,CAAA;AACH,CAAC"}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import React from 'react';
|
2
2
|
import { ExamComponentProps } from '../../createRenderChildNodes';
|
3
|
-
|
4
|
-
declare const _default: React.
|
3
|
+
type Props = Omit<ExamComponentProps, 'renderChildNodes'>;
|
4
|
+
declare const _default: React.NamedExoticComponent<Props>;
|
5
5
|
export default _default;
|
6
6
|
//# sourceMappingURL=Formula.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"Formula.d.ts","sourceRoot":"","sources":["../../../src/components/shared/Formula.tsx"],"names":[],"mappings":"
|
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"}
|