@digabi/exam-engine-core 23.5.0 → 23.5.1
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 +0 -50
- package/dist/__tests__/playwright/Annotations.test.js.map +1 -1
- package/dist/__tests__/tsconfig.tsbuildinfo +1 -1
- package/dist/components/context/AnnotationProvider.d.ts +1 -5
- package/dist/components/context/AnnotationProvider.d.ts.map +1 -1
- package/dist/components/context/AnnotationProvider.js +12 -12
- package/dist/components/context/AnnotationProvider.js.map +1 -1
- package/dist/components/grading/examAnnotationUtils.d.ts.map +1 -1
- package/dist/components/grading/examAnnotationUtils.js +47 -50
- package/dist/components/grading/examAnnotationUtils.js.map +1 -1
- package/dist/components/shared/Formula.d.ts.map +1 -1
- package/dist/components/shared/Formula.js +11 -37
- package/dist/components/shared/Formula.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 +8 -4
- package/dist/components/shared/markText.js.map +1 -1
- package/dist/main-bundle.js +1 -1
- package/dist/main.css +1 -1
- package/package.json +2 -2
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { AnnotationPart, ExamImageAnnotation, NewExamAnnotation, WithAnnotationId } from '../../types/ExamAnnotations';
|
|
3
3
|
import { AnnotationProps } from '../exam/Exam';
|
|
4
|
-
interface Props {
|
|
5
|
-
children: React.ReactNode;
|
|
6
|
-
}
|
|
7
4
|
export type AnnotationContextType = {
|
|
8
5
|
annotationsEnabled: true;
|
|
9
6
|
newAnnotation: NewExamAnnotation | null;
|
|
@@ -18,6 +15,5 @@ export type AnnotationContextType = {
|
|
|
18
15
|
export declare const AnnotationContext: React.Context<AnnotationContextType | {
|
|
19
16
|
annotationsEnabled: false;
|
|
20
17
|
}>;
|
|
21
|
-
export declare const AnnotationProvider: ({ children, annotations, onClickAnnotation, onSaveAnnotation }:
|
|
22
|
-
export {};
|
|
18
|
+
export declare const AnnotationProvider: ({ children, annotations, onClickAnnotation, onSaveAnnotation }: React.PropsWithChildren<AnnotationProps>) => string | number | boolean | React.JSX.Element | Iterable<React.ReactNode> | null | undefined;
|
|
23
19
|
//# 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,
|
|
1
|
+
{"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"}
|
|
@@ -1,29 +1,29 @@
|
|
|
1
1
|
import * as _ from 'lodash-es';
|
|
2
|
-
import React, { useMemo } from 'react';
|
|
2
|
+
import React, { useCallback, useMemo } from 'react';
|
|
3
3
|
import { onMouseDownForAnnotation } from '../grading/examAnnotationUtils';
|
|
4
4
|
import { AnnotationPopup } from '../shared/AnnotationPopup';
|
|
5
5
|
export const AnnotationContext = React.createContext({
|
|
6
6
|
annotationsEnabled: false
|
|
7
7
|
});
|
|
8
8
|
export const AnnotationProvider = ({ children, annotations, onClickAnnotation, onSaveAnnotation }) => {
|
|
9
|
+
const annotationsEnabled = !!annotations && !!onClickAnnotation && !!onSaveAnnotation;
|
|
10
|
+
if (!annotationsEnabled) {
|
|
11
|
+
return children;
|
|
12
|
+
}
|
|
13
|
+
return (React.createElement(AnnotationContextProvider, { annotations: annotations, onClickAnnotation: onClickAnnotation, onSaveAnnotation: onSaveAnnotation }, children));
|
|
14
|
+
};
|
|
15
|
+
function AnnotationContextProvider({ children, annotations, onClickAnnotation, onSaveAnnotation }) {
|
|
9
16
|
const [newAnnotation, setNewAnnotation] = React.useState(null);
|
|
10
17
|
const [newAnnotationRef, setNewAnnotationRef] = React.useState(null);
|
|
11
|
-
const
|
|
12
|
-
setNewAnnotation(annotation);
|
|
13
|
-
};
|
|
14
|
-
function onMouseDown(e) {
|
|
18
|
+
const onMouseDown = useCallback((e) => {
|
|
15
19
|
const target = e.target;
|
|
16
20
|
const clickIsInPopup = !!target.closest('.e-popup');
|
|
17
21
|
if (!clickIsInPopup) {
|
|
18
22
|
setNewAnnotation(null);
|
|
19
23
|
setNewAnnotationRef(null);
|
|
20
24
|
}
|
|
21
|
-
onMouseDownForAnnotation(e,
|
|
22
|
-
}
|
|
23
|
-
const annotationsEnabled = !!annotations && !!onClickAnnotation && !!onSaveAnnotation;
|
|
24
|
-
if (!annotationsEnabled) {
|
|
25
|
-
return children;
|
|
26
|
-
}
|
|
25
|
+
onMouseDownForAnnotation(e, setNewAnnotation);
|
|
26
|
+
}, [setNewAnnotation, setNewAnnotationRef, onMouseDownForAnnotation]);
|
|
27
27
|
const textAnnotations = useMemo(() => _.groupBy(annotations.flatMap(a => {
|
|
28
28
|
if (a.annotationType === 'text') {
|
|
29
29
|
return a.annotationParts.map((p, index, arr) => {
|
|
@@ -59,5 +59,5 @@ export const AnnotationProvider = ({ children, annotations, onClickAnnotation, o
|
|
|
59
59
|
React.createElement("span", { onMouseDown: onMouseDown },
|
|
60
60
|
React.createElement(AnnotationPopup, null),
|
|
61
61
|
children)));
|
|
62
|
-
}
|
|
62
|
+
}
|
|
63
63
|
//# sourceMappingURL=AnnotationProvider.js.map
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"AnnotationProvider.js","sourceRoot":"","sources":["../../../src/components/context/AnnotationProvider.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +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,
|
|
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,QAwC5G"}
|
|
@@ -1,17 +1,16 @@
|
|
|
1
1
|
import { textAnnotationFromRange } from './editAnnotations';
|
|
2
2
|
export function onMouseDownForAnnotation(e, mouseUpCallback) {
|
|
3
3
|
function onMouseUpAfterAnswerMouseDown() {
|
|
4
|
+
var _a, _b;
|
|
4
5
|
window.removeEventListener('mouseup', onMouseUpAfterAnswerMouseDown);
|
|
5
6
|
/**
|
|
6
7
|
* selection.anchorNode = where mouse is pressed down (chronologically first)
|
|
7
8
|
* selection.getRangeAt(0).startContainer = where selection starts (first in DOM)
|
|
8
9
|
*/
|
|
9
10
|
const selection = window.getSelection();
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
const endNode = selection.getRangeAt(selection.rangeCount - 1).endContainer.parentElement;
|
|
14
|
-
if (startNode && endNode && selection.toString().length > 0) {
|
|
11
|
+
const startNode = (_a = selection === null || selection === void 0 ? void 0 : selection.anchorNode) === null || _a === void 0 ? void 0 : _a.parentElement;
|
|
12
|
+
const endNode = (_b = selection === null || selection === void 0 ? void 0 : selection.focusNode) === null || _b === void 0 ? void 0 : _b.parentElement;
|
|
13
|
+
if (selection && startNode && endNode && selection.toString().length > 0) {
|
|
15
14
|
const hasMarks = selectionContainsNonhiddenMarks(selection);
|
|
16
15
|
const startNodedisplayNumber = getDisplayNumber(startNode);
|
|
17
16
|
const endNodeDisplayNumber = getDisplayNumber(endNode);
|
|
@@ -44,67 +43,65 @@ const selectionContainsNonhiddenMarks = (selection) => {
|
|
|
44
43
|
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'); };
|
|
45
44
|
const isAnnotatable = (node) => (node === null || node === void 0 ? void 0 : node.getAttribute('data-annotation-path')) && node.tagName !== 'MARK';
|
|
46
45
|
const extractAnnotationsFromSelection = (selection) => {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
const
|
|
55
|
-
|
|
56
|
-
|
|
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({
|
|
46
|
+
var _a, _b;
|
|
47
|
+
const range = selection.getRangeAt(0);
|
|
48
|
+
const rangeChildren = Array.from(selection === null || selection === void 0 ? void 0 : selection.getRangeAt(0).cloneContents().children);
|
|
49
|
+
const firstSelectedNodeInDOM = range.startContainer.parentElement;
|
|
50
|
+
if (!(rangeChildren === null || rangeChildren === void 0 ? void 0 : rangeChildren.length)) {
|
|
51
|
+
// selection is plain text
|
|
52
|
+
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');
|
|
53
|
+
const startAndLength = textAnnotationFromRange(firstSelectedNodeInDOM, range);
|
|
54
|
+
return [
|
|
55
|
+
{
|
|
64
56
|
annotationAnchor,
|
|
65
|
-
selectedText: (
|
|
66
|
-
startIndex: (
|
|
67
|
-
length: (
|
|
68
|
-
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
57
|
+
selectedText: (selection === null || selection === void 0 ? void 0 : selection.toString()) || '',
|
|
58
|
+
startIndex: (startAndLength === null || startAndLength === void 0 ? void 0 : startAndLength.startIndex) || 0,
|
|
59
|
+
length: (startAndLength === null || startAndLength === void 0 ? void 0 : startAndLength.length) || 0
|
|
60
|
+
}
|
|
61
|
+
];
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
// selection is in multiple elements
|
|
65
|
+
const annotations = rangeChildren === null || rangeChildren === void 0 ? void 0 : rangeChildren.reduce((acc, child, index, arr) => {
|
|
66
|
+
var _a;
|
|
67
|
+
const childsAnnotationPath = child.getAttribute('data-annotation-path');
|
|
68
|
+
const isLastRangeChild = index === arr.length - 1;
|
|
75
69
|
if (childsAnnotationPath) {
|
|
76
|
-
// child is an annotable node, like <span> text </span>
|
|
77
|
-
const textContent = (
|
|
78
|
-
const
|
|
70
|
+
// child is an annotable node, like <span> text </span>
|
|
71
|
+
const textContent = (_a = child.textContent) !== null && _a !== void 0 ? _a : '';
|
|
72
|
+
const newElement = {
|
|
79
73
|
annotationAnchor: childsAnnotationPath,
|
|
80
74
|
selectedText: textContent,
|
|
81
|
-
startIndex:
|
|
75
|
+
startIndex: index === 0 ? range.startOffset : 0,
|
|
82
76
|
length: isLastRangeChild ? range.endOffset : textContent.length
|
|
83
77
|
};
|
|
84
|
-
|
|
78
|
+
return [...acc, newElement];
|
|
85
79
|
}
|
|
86
80
|
else {
|
|
87
81
|
// child is a node with children, like <b> <span> text </span> </b>
|
|
88
|
-
const allChildrenWithAnnotationPath =
|
|
89
|
-
allChildrenWithAnnotationPath.forEach(
|
|
90
|
-
var _a
|
|
91
|
-
const dataAnnotationPath =
|
|
92
|
-
const textContent = (
|
|
82
|
+
const allChildrenWithAnnotationPath = child.querySelectorAll('[data-annotation-path]');
|
|
83
|
+
allChildrenWithAnnotationPath === null || allChildrenWithAnnotationPath === void 0 ? void 0 : allChildrenWithAnnotationPath.forEach((grandChild, kidIndex) => {
|
|
84
|
+
var _a;
|
|
85
|
+
const dataAnnotationPath = grandChild.getAttribute('data-annotation-path');
|
|
86
|
+
const textContent = (_a = grandChild.textContent) !== null && _a !== void 0 ? _a : '';
|
|
93
87
|
if (dataAnnotationPath) {
|
|
94
|
-
const
|
|
95
|
-
const
|
|
88
|
+
const isFirstOfAll = index === 0 && kidIndex === 0;
|
|
89
|
+
const isLastGrandChild = kidIndex === allChildrenWithAnnotationPath.length - 1;
|
|
90
|
+
const isLastOfAll = isLastRangeChild && isLastGrandChild;
|
|
91
|
+
const startAndLength = textAnnotationFromRange(firstSelectedNodeInDOM, range);
|
|
92
|
+
const newElement = {
|
|
96
93
|
annotationAnchor: dataAnnotationPath,
|
|
97
94
|
selectedText: textContent,
|
|
98
|
-
startIndex:
|
|
99
|
-
length:
|
|
95
|
+
startIndex: isFirstOfAll ? (startAndLength === null || startAndLength === void 0 ? void 0 : startAndLength.startIndex) || 0 : 0,
|
|
96
|
+
length: isLastOfAll ? range.endOffset : textContent.length
|
|
100
97
|
};
|
|
101
|
-
|
|
98
|
+
acc.push(newElement);
|
|
102
99
|
}
|
|
103
100
|
});
|
|
101
|
+
return acc;
|
|
104
102
|
}
|
|
105
|
-
});
|
|
103
|
+
}, []);
|
|
106
104
|
return annotations;
|
|
107
|
-
}
|
|
108
|
-
return annotations;
|
|
105
|
+
}
|
|
109
106
|
};
|
|
110
107
|
//# 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,eAA+C;IAC3G,SAAS,6BAA6B
|
|
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":"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;
|
|
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;AAOjE,KAAK,KAAK,GAAG,IAAI,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAA;;AAGzD,wBASE"}
|
|
@@ -3,8 +3,6 @@ import React, { useContext } from 'react';
|
|
|
3
3
|
import { getAttribute, getElementPath } from '../../dom-utils';
|
|
4
4
|
import { AnnotationContext } from '../context/AnnotationProvider';
|
|
5
5
|
import { IsInSidebarContext } from '../context/IsInSidebarContext';
|
|
6
|
-
import { isExistingAnnotation } from './markText';
|
|
7
|
-
import AnnotationMark from './AnnotationTextMark';
|
|
8
6
|
import HiddenAnnotationMark from './HiddenAnnotationMark';
|
|
9
7
|
import { AnnotationImageMark, useImageAnnotation } from './AnnotationImageMark';
|
|
10
8
|
// eslint-disable-next-line prefer-arrow-callback
|
|
@@ -18,9 +16,9 @@ export default React.memo(function Formula({ element, className }) {
|
|
|
18
16
|
});
|
|
19
17
|
// eslint-disable-next-line prefer-arrow-callback
|
|
20
18
|
const PlainFormula = React.memo(function PlainFormula(props) {
|
|
21
|
-
const { svg, assistiveTitle,
|
|
19
|
+
const { svg, assistiveTitle, isDisplayFormula } = useElementAttributes(props);
|
|
22
20
|
return (React.createElement(React.Fragment, null,
|
|
23
|
-
React.createElement("span", { className: className, dangerouslySetInnerHTML: { __html: svg }, "aria-hidden": "true" }),
|
|
21
|
+
React.createElement("span", { className: classNames('e-formula', { 'e-block e-text-center': isDisplayFormula }, props.className), dangerouslySetInnerHTML: { __html: svg }, "aria-hidden": "true" }),
|
|
24
22
|
React.createElement(AssistiveTitle, { assistiveTitle: assistiveTitle })));
|
|
25
23
|
});
|
|
26
24
|
// eslint-disable-next-line prefer-arrow-callback
|
|
@@ -29,26 +27,12 @@ const AssistiveTitle = React.memo(function AssistiveTitle({ assistiveTitle }) {
|
|
|
29
27
|
});
|
|
30
28
|
// eslint-disable-next-line prefer-arrow-callback
|
|
31
29
|
const AnnotatableFormula = React.memo(function AnnotatableFormula(props) {
|
|
32
|
-
var _a
|
|
33
|
-
const {
|
|
34
|
-
const { svg, assistiveTitle,
|
|
30
|
+
var _a;
|
|
31
|
+
const { imageAnnotations, onClickAnnotation, setNewAnnotationRef, newAnnotation, setNewAnnotation } = props.annotationContext;
|
|
32
|
+
const { svg, assistiveTitle, isDisplayFormula, textContent } = useElementAttributes(props);
|
|
35
33
|
const path = getElementPath(props.element);
|
|
36
34
|
const { elementRef, annotationRect, onMouseDown } = useImageAnnotation(path, `kaava ${textContent}`, setNewAnnotation);
|
|
37
|
-
const
|
|
38
|
-
...((_a = textAnnotations[path]) !== null && _a !== void 0 ? _a : []),
|
|
39
|
-
...((newAnnotation === null || newAnnotation === void 0 ? void 0 : newAnnotation.annotationType) === 'text'
|
|
40
|
-
? ((_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 : [])
|
|
41
|
-
: [])
|
|
42
|
-
];
|
|
43
|
-
const textMarks = textElementAnnotations.map(annotation => {
|
|
44
|
-
const annotationId = isExistingAnnotation(annotation) ? annotation.annotationId : null;
|
|
45
|
-
const key = `${annotationId !== null && annotationId !== void 0 ? annotationId : 0}_${annotation.startIndex}`;
|
|
46
|
-
if (annotation.hidden) {
|
|
47
|
-
return React.createElement(HiddenAnnotationMark, { key: key, annotationId: annotationId });
|
|
48
|
-
}
|
|
49
|
-
return (React.createElement(AnnotationMark, { key: key, annotation: annotation, onClickAnnotation: onClickAnnotation, setNewAnnotationRef: setNewAnnotationRef, __html: svg }));
|
|
50
|
-
});
|
|
51
|
-
const imageMarks = ((_d = imageAnnotations[path]) !== null && _d !== void 0 ? _d : [])
|
|
35
|
+
const imageMarks = ((_a = imageAnnotations[path]) !== null && _a !== void 0 ? _a : [])
|
|
52
36
|
.map(({ annotationId, markNumber, resolved, hidden, rect }) => {
|
|
53
37
|
const key = `${annotationId}_${markNumber}`;
|
|
54
38
|
if (hidden) {
|
|
@@ -56,20 +40,11 @@ const AnnotatableFormula = React.memo(function AnnotatableFormula(props) {
|
|
|
56
40
|
}
|
|
57
41
|
return (React.createElement(AnnotationImageMark, { key: key, rect: rect, onClickAnnotation: onClickAnnotation, setNewAnnotationRef: setNewAnnotationRef, annotationId: annotationId, markNumber: markNumber, resolved: resolved }));
|
|
58
42
|
})
|
|
59
|
-
.concat((newAnnotation === null || newAnnotation === void 0 ? void 0 : newAnnotation.annotationType) === 'image' && newAnnotation.annotationAnchor === path
|
|
60
|
-
? [
|
|
61
|
-
React.createElement(AnnotationImageMark, { key: "new-annotation-mark", rect: newAnnotation.rect, onClickAnnotation: onClickAnnotation, setNewAnnotationRef: setNewAnnotationRef })
|
|
62
|
-
]
|
|
63
|
-
: [])
|
|
64
|
-
.concat(annotationRect
|
|
65
|
-
? [
|
|
66
|
-
React.createElement(AnnotationImageMark, { key: "annotation-rect", rect: annotationRect, onClickAnnotation: onClickAnnotation, setNewAnnotationRef: setNewAnnotationRef })
|
|
67
|
-
]
|
|
68
|
-
: []);
|
|
43
|
+
.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 })) : ([]))
|
|
44
|
+
.concat(annotationRect ? (React.createElement(AnnotationImageMark, { key: "annotation-rect", rect: annotationRect, onClickAnnotation: onClickAnnotation, setNewAnnotationRef: setNewAnnotationRef })) : ([]));
|
|
69
45
|
return (React.createElement(React.Fragment, null,
|
|
70
|
-
React.createElement("span", { ref: elementRef, className:
|
|
71
|
-
|
|
72
|
-
textMarks,
|
|
46
|
+
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 },
|
|
47
|
+
React.createElement("span", { dangerouslySetInnerHTML: { __html: svg } }),
|
|
73
48
|
imageMarks),
|
|
74
49
|
React.createElement(AssistiveTitle, { assistiveTitle: assistiveTitle })));
|
|
75
50
|
});
|
|
@@ -79,7 +54,6 @@ function useElementAttributes(props) {
|
|
|
79
54
|
const textContent = (_a = props.element.textContent) === null || _a === void 0 ? void 0 : _a.trim();
|
|
80
55
|
const assistiveTitle = (_b = (getAttribute(props.element, 'assistive-title') || textContent)) !== null && _b !== void 0 ? _b : '';
|
|
81
56
|
const isDisplayFormula = getAttribute(props.element, 'mode') === 'display';
|
|
82
|
-
|
|
83
|
-
return { svg, assistiveTitle, textContent, className };
|
|
57
|
+
return { svg, assistiveTitle, isDisplayFormula, textContent };
|
|
84
58
|
}
|
|
85
59
|
//# sourceMappingURL=Formula.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Formula.js","sourceRoot":"","sources":["../../../src/components/shared/Formula.tsx"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,YAAY,CAAA;AAEnC,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAEzC,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAyB,MAAM,+BAA+B,CAAA;AACxF,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AAClE,OAAO,
|
|
1
|
+
{"version":3,"file":"Formula.js","sourceRoot":"","sources":["../../../src/components/shared/Formula.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { AnnotationPart, WithAnnotationId } from '../../types/ExamAnnotations';
|
|
3
|
-
export declare function getKey(annotation: AnnotationPart):
|
|
3
|
+
export declare function getKey(annotation: AnnotationPart): string;
|
|
4
4
|
export declare function isExistingAnnotation(annotation: AnnotationPart): annotation is WithAnnotationId<AnnotationPart>;
|
|
5
5
|
export declare function markText(text: string, annotations: AnnotationPart[], onClickAnnotation: (e: React.MouseEvent<HTMLElement, MouseEvent>, annotationId: number) => void, setNewAnnotationRef: (ref: HTMLElement | null) => void): React.ReactNode[];
|
|
6
6
|
//# 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,cAAc,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAI9E,wBAAgB,MAAM,CAAC,UAAU,EAAE,cAAc,
|
|
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,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"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import * as _ from 'lodash-es';
|
|
2
2
|
import React from 'react';
|
|
3
|
-
import
|
|
3
|
+
import AnnotationTextMark from './AnnotationTextMark';
|
|
4
4
|
import HiddenAnnotationMark from './HiddenAnnotationMark';
|
|
5
5
|
export function getKey(annotation) {
|
|
6
|
-
return isExistingAnnotation(annotation)
|
|
6
|
+
return isExistingAnnotation(annotation)
|
|
7
|
+
? annotation.annotationId + annotation.annotationAnchor
|
|
8
|
+
: annotation.annotationAnchor;
|
|
7
9
|
}
|
|
8
10
|
export function isExistingAnnotation(annotation) {
|
|
9
11
|
return 'annotationId' in annotation;
|
|
@@ -21,7 +23,8 @@ export function markText(text, annotations, onClickAnnotation, setNewAnnotationR
|
|
|
21
23
|
const nodes = [];
|
|
22
24
|
hiddenAnnotations.forEach(annotation => {
|
|
23
25
|
const key = getKey(annotation);
|
|
24
|
-
|
|
26
|
+
const annotationId = isExistingAnnotation(annotation) ? annotation.annotationId : null;
|
|
27
|
+
nodes.push(React.createElement(HiddenAnnotationMark, { key: key, annotationId: annotationId }));
|
|
25
28
|
});
|
|
26
29
|
let lastIndex = 0;
|
|
27
30
|
const onlyLeadingSpacesRemoved = text.replace(/^\s+/, ' ');
|
|
@@ -63,7 +66,8 @@ export function markText(text, annotations, onClickAnnotation, setNewAnnotationR
|
|
|
63
66
|
}
|
|
64
67
|
// Add marked text
|
|
65
68
|
const key = getKey(annotation);
|
|
66
|
-
|
|
69
|
+
const annotationId = isExistingAnnotation(annotation) ? annotation.annotationId : null;
|
|
70
|
+
nodes.push(annotation.hidden ? (React.createElement(HiddenAnnotationMark, { key: key, annotationId: annotationId })) : (React.createElement(AnnotationTextMark, { key: key, annotation: annotation, onClickAnnotation: onClickAnnotation, setNewAnnotationRef: setNewAnnotationRef }, annotatedTextWithCorrectedStartIndex)));
|
|
67
71
|
lastIndex = correctStartIndex + annotation.length;
|
|
68
72
|
}
|
|
69
73
|
// 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,
|
|
1
|
+
{"version":3,"file":"markText.js","sourceRoot":"","sources":["../../../src/components/shared/markText.tsx"],"names":[],"mappings":"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"}
|