@digabi/exam-engine-core 20.3.1 → 20.3.2-annoteta-react.0
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/__tests__/annotations.test.d.ts +2 -0
- package/dist/__tests__/annotations.test.d.ts.map +1 -0
- package/dist/__tests__/annotations.test.js +179 -0
- package/dist/__tests__/annotations.test.js.map +1 -0
- package/dist/__tests__/testExamRendering.js.map +1 -1
- package/dist/__tests__/tsconfig.tsbuildinfo +1 -1
- package/dist/components/attachments/Attachments.d.ts.map +1 -1
- package/dist/components/attachments/Attachments.js +17 -13
- package/dist/components/attachments/Attachments.js.map +1 -1
- package/dist/components/context/AnnotationContext.d.ts +9 -0
- package/dist/components/context/AnnotationContext.d.ts.map +1 -0
- package/dist/components/context/AnnotationContext.js +3 -0
- package/dist/components/context/AnnotationContext.js.map +1 -0
- package/dist/components/context/AnnotationProvider.d.ts +19 -0
- package/dist/components/context/AnnotationProvider.d.ts.map +1 -0
- package/dist/components/context/AnnotationProvider.js +19 -0
- package/dist/components/context/AnnotationProvider.js.map +1 -0
- package/dist/components/exam/DropdownAnswer.d.ts.map +1 -1
- package/dist/components/exam/DropdownAnswer.js +9 -1
- package/dist/components/exam/DropdownAnswer.js.map +1 -1
- package/dist/components/exam/Exam.d.ts +6 -1
- package/dist/components/exam/Exam.d.ts.map +1 -1
- package/dist/components/exam/Exam.js +35 -31
- package/dist/components/exam/Exam.js.map +1 -1
- package/dist/components/grading/editAnnotations.d.ts.map +1 -1
- package/dist/components/grading/editAnnotations.js +1 -0
- package/dist/components/grading/editAnnotations.js.map +1 -1
- package/dist/components/grading/examAnnotationUtils.d.ts +4 -0
- package/dist/components/grading/examAnnotationUtils.d.ts.map +1 -0
- package/dist/components/grading/examAnnotationUtils.js +53 -0
- package/dist/components/grading/examAnnotationUtils.js.map +1 -0
- package/dist/components/grading/reactAnnotation.d.ts +4 -0
- package/dist/components/grading/reactAnnotation.d.ts.map +1 -0
- package/dist/components/grading/reactAnnotation.js +54 -0
- package/dist/components/grading/reactAnnotation.js.map +1 -0
- package/dist/components/grading-instructions/GradingInstructions.d.ts +2 -2
- package/dist/components/grading-instructions/GradingInstructions.d.ts.map +1 -1
- package/dist/components/grading-instructions/GradingInstructions.js +19 -14
- package/dist/components/grading-instructions/GradingInstructions.js.map +1 -1
- package/dist/components/shared/AnnotationPopup.d.ts +3 -0
- package/dist/components/shared/AnnotationPopup.d.ts.map +1 -0
- package/dist/components/shared/AnnotationPopup.js +61 -0
- package/dist/components/shared/AnnotationPopup.js.map +1 -0
- package/dist/components/shared/CreateAnnotationPopup.d.ts +6 -0
- package/dist/components/shared/CreateAnnotationPopup.d.ts.map +1 -0
- package/dist/components/shared/CreateAnnotationPopup.js +11 -0
- package/dist/components/shared/CreateAnnotationPopup.js.map +1 -0
- package/dist/createRenderChildNodes.d.ts.map +1 -1
- package/dist/createRenderChildNodes.js +85 -6
- package/dist/createRenderChildNodes.js.map +1 -1
- package/dist/main-bundle.js +1 -1
- package/dist/main.css +1 -1
- package/dist/types/Score.d.ts +17 -8
- package/dist/types/Score.d.ts.map +1 -1
- package/package.json +2 -2
@@ -1,6 +1,6 @@
|
|
1
1
|
import React from 'react';
|
2
|
-
import { CommonExamProps } from '../exam/Exam';
|
2
|
+
import { AnnotationProps, CommonExamProps } from '../exam/Exam';
|
3
3
|
export declare const GradingInstructionsPageTitle: React.FunctionComponent;
|
4
|
-
declare const _default: React.MemoExoticComponent<React.ComponentType<CommonExamProps>>;
|
4
|
+
declare const _default: React.MemoExoticComponent<React.ComponentType<CommonExamProps & AnnotationProps>>;
|
5
5
|
export default _default;
|
6
6
|
//# sourceMappingURL=GradingInstructions.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"GradingInstructions.d.ts","sourceRoot":"","sources":["../../../src/components/grading-instructions/GradingInstructions.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgC,MAAM,OAAO,CAAA;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;
|
1
|
+
{"version":3,"file":"GradingInstructions.d.ts","sourceRoot":"","sources":["../../../src/components/grading-instructions/GradingInstructions.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgC,MAAM,OAAO,CAAA;AACpD,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AA6I/D,eAAO,MAAM,4BAA4B,EAAE,KAAK,CAAC,iBAGhD,CAAA;;AAED,wBAAqE"}
|
@@ -29,6 +29,8 @@ import Recording from './Recording';
|
|
29
29
|
import QuestionInstruction from '../exam/QuestionInstruction';
|
30
30
|
import { QuestionNumber } from '../shared/QuestionNumber';
|
31
31
|
import ExamTranslation from '../shared/ExamTranslation';
|
32
|
+
import { AnnotationProvider } from '../context/AnnotationProvider';
|
33
|
+
import { AnnotationPopup } from '../shared/AnnotationPopup';
|
32
34
|
const renderIfWithinGradingInstructionContent = renderIf(({ element }) => queryAncestors(element, [
|
33
35
|
// Keep in sync with lists in mastering/index.ts
|
34
36
|
'answer-grading-instruction',
|
@@ -69,7 +71,7 @@ const renderChildNodes = createRenderChildNodes({
|
|
69
71
|
'section-title': SectionTitle,
|
70
72
|
video: Recording
|
71
73
|
});
|
72
|
-
const GradingInstructions = ({ doc }) => {
|
74
|
+
const GradingInstructions = ({ doc, annotations, onClickAnnotation, onSaveAnnotation }) => {
|
73
75
|
const root = doc.documentElement;
|
74
76
|
const { date, dateTimeFormatter, dayCode, examCode, language, subjectLanguage } = useContext(CommonExamContext);
|
75
77
|
const examTitle = findChildElement(root, 'exam-title');
|
@@ -83,19 +85,22 @@ const GradingInstructions = ({ doc }) => {
|
|
83
85
|
const i18n = useCached(() => initI18n(language, examCode, dayCode));
|
84
86
|
useEffect(changeLanguage(i18n, language));
|
85
87
|
useEffect(scrollToHash, []);
|
86
|
-
return (React.createElement(
|
87
|
-
React.createElement(
|
88
|
-
React.createElement(
|
89
|
-
|
90
|
-
React.createElement(
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
88
|
+
return (React.createElement(AnnotationProvider, { annotations: annotations, onClickAnnotation: onClickAnnotation, onSaveAnnotation: onSaveAnnotation },
|
89
|
+
React.createElement(I18nextProvider, { i18n: i18n },
|
90
|
+
React.createElement("main", { className: "e-exam e-grading-instructions", lang: subjectLanguage },
|
91
|
+
React.createElement(AnnotationPopup, null),
|
92
|
+
React.createElement(React.StrictMode, null),
|
93
|
+
React.createElement(SectionElement, { "aria-labelledby": examTitleId },
|
94
|
+
React.createElement(DocumentTitle, { id: examTitleId },
|
95
|
+
React.createElement(GradingInstructionsPageTitle, null),
|
96
|
+
" ",
|
97
|
+
examTitle && renderChildNodes(examTitle)),
|
98
|
+
date && (React.createElement("p", null,
|
99
|
+
React.createElement("strong", null, dateTimeFormatter.format(date)))),
|
100
|
+
examGradingInstruction && (React.createElement(ExamGradingInstruction, { element: examGradingInstruction, renderChildNodes })),
|
101
|
+
tableOfContents && (React.createElement("div", { className: "main-toc-container" },
|
102
|
+
React.createElement(TableOfContents, { element: tableOfContents, renderChildNodes })))),
|
103
|
+
renderChildNodes(root)))));
|
99
104
|
};
|
100
105
|
// Wrap to a separate component, since we can't use translation hooks in the root component.
|
101
106
|
export const GradingInstructionsPageTitle = () => {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"GradingInstructions.js","sourceRoot":"","sources":["../../../src/components/grading-instructions/GradingInstructions.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAEpD,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACvF,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAC/C,OAAO,OAAO,MAAM,WAAW,CAAA;AAC/B,OAAO,YAAY,MAAM,gBAAgB,CAAA;AACzC,OAAO,QAAQ,MAAM,YAAY,CAAA;AACjC,OAAO,IAAI,MAAM,gBAAgB,CAAA;AACjC,OAAO,sBAAsB,MAAM,0BAA0B,CAAA;AAC7D,OAAO,gBAAgB,MAAM,oBAAoB,CAAA;AACjD,OAAO,KAAK,MAAM,iBAAiB,CAAA;AACnC,OAAO,OAAO,MAAM,mBAAmB,CAAA;AACvC,OAAO,sBAAsB,MAAM,0BAA0B,CAAA;AAC7D,OAAO,aAAa,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,aAAa,MAAM,kBAAkB,CAAA;AAC5C,OAAO,cAAc,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,kBAAkB,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,wBAAwB,MAAM,4BAA4B,CAAA;AACjE,OAAO,gBAAgB,MAAM,0BAA0B,CAAA;AACvD,OAAO,iBAAiB,MAAM,2BAA2B,CAAA;AACzD,OAAO,SAAS,MAAM,aAAa,CAAA;AACnC,OAAO,mBAAmB,MAAM,6BAA6B,CAAA;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,eAAe,MAAM,2BAA2B,CAAA;
|
1
|
+
{"version":3,"file":"GradingInstructions.js","sourceRoot":"","sources":["../../../src/components/grading-instructions/GradingInstructions.tsx"],"names":[],"mappings":"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"}
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"AnnotationPopup.d.ts","sourceRoot":"","sources":["../../../src/components/shared/AnnotationPopup.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA0C,MAAM,OAAO,CAAA;AAK9D,wBAAgB,eAAe,6BAuE9B"}
|
@@ -0,0 +1,61 @@
|
|
1
|
+
import React, { useContext, useEffect, useState } from 'react';
|
2
|
+
import { AnnotationContext } from '../context/AnnotationProvider';
|
3
|
+
import { makeRichText } from 'rich-text-editor';
|
4
|
+
export function AnnotationPopup() {
|
5
|
+
const popupRef = React.createRef();
|
6
|
+
const textAreaRef = React.createRef();
|
7
|
+
const { newAnnotation, setNewAnnotation, newAnnotationRef, onSaveAnnotation } = useContext(AnnotationContext);
|
8
|
+
const [comment, setComment] = useState('');
|
9
|
+
const [saveEnabled, setSaveEnabled] = useState(false);
|
10
|
+
useEffect(() => {
|
11
|
+
if (newAnnotationRef && textAreaRef.current) {
|
12
|
+
showAndPositionElement(newAnnotationRef, popupRef);
|
13
|
+
textAreaRef.current.innerHTML = comment;
|
14
|
+
makeRichText(textAreaRef.current, {
|
15
|
+
locale: 'FI',
|
16
|
+
screenshotSaver: () => Promise.resolve('')
|
17
|
+
}, value => {
|
18
|
+
setComment(value.answerHTML);
|
19
|
+
setSaveEnabled(value.answerHTML.trim().length > 0);
|
20
|
+
});
|
21
|
+
textAreaRef.current.focus();
|
22
|
+
}
|
23
|
+
}, [newAnnotationRef]);
|
24
|
+
if (!newAnnotation) {
|
25
|
+
return null;
|
26
|
+
}
|
27
|
+
const closeEditor = () => setNewAnnotation(null);
|
28
|
+
function updateComment(annotation, comment) {
|
29
|
+
onSaveAnnotation({ ...annotation, message: comment, annotationId: annotation.annotationId });
|
30
|
+
closeEditor();
|
31
|
+
}
|
32
|
+
return (React.createElement("div", { className: "annotation-popup", style: { position: 'absolute', opacity: 0 }, ref: popupRef, "data-testid": "annotation-popup" },
|
33
|
+
React.createElement("div", { className: "comment-content", "data-testid": "edit-comment", role: "textbox", "aria-multiline": "true", ref: textAreaRef }),
|
34
|
+
React.createElement("span", { className: "comment-button-area" },
|
35
|
+
React.createElement("span", null,
|
36
|
+
React.createElement("button", { className: "button", onClick: e => {
|
37
|
+
e.stopPropagation();
|
38
|
+
updateComment(newAnnotation, comment);
|
39
|
+
}, "data-testid": "save-comment", disabled: !saveEnabled }, "Vastaa"),
|
40
|
+
React.createElement("button", { className: "button text-button", onClick: closeEditor }, "Peru")))));
|
41
|
+
}
|
42
|
+
function showAndPositionElement(mark, popupRef) {
|
43
|
+
const popup = popupRef.current;
|
44
|
+
if (mark && popup) {
|
45
|
+
const style = popup.style;
|
46
|
+
const markRect = mark === null || mark === void 0 ? void 0 : mark.getBoundingClientRect();
|
47
|
+
const popupRect = popup.getBoundingClientRect();
|
48
|
+
const top = markRect.height + markRect.top + window.scrollY;
|
49
|
+
const windowWidth = window.innerWidth;
|
50
|
+
style.top = `${String(top)}px`;
|
51
|
+
style.opacity = '1';
|
52
|
+
const popupHitsWindowRight = markRect.left + popupRect.width > windowWidth;
|
53
|
+
if (popupHitsWindowRight) {
|
54
|
+
style.left = `${markRect.right - popupRect.width}px`;
|
55
|
+
}
|
56
|
+
else {
|
57
|
+
style.left = `${markRect.left}px`;
|
58
|
+
}
|
59
|
+
}
|
60
|
+
}
|
61
|
+
//# sourceMappingURL=AnnotationPopup.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"AnnotationPopup.js","sourceRoot":"","sources":["../../../src/components/shared/AnnotationPopup.tsx"],"names":[],"mappings":"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"}
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"CreateAnnotationPopup.d.ts","sourceRoot":"","sources":["../../../src/components/shared/CreateAnnotationPopup.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAA;AAEvC,wBAAgB,qBAAqB,CAAC,EACpC,aAAa,EACb,WAAW,EACZ,EAAE;IACD,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACtC,WAAW,EAAE,MAAM,IAAI,CAAA;CACxB,qBAyBA"}
|
@@ -0,0 +1,11 @@
|
|
1
|
+
import React, { useState } from 'react';
|
2
|
+
export function CreateAnnotationPopup({ updateComment, closeEditor }) {
|
3
|
+
const [comment, setComment] = useState('');
|
4
|
+
return (React.createElement("span", { className: "annotation-popup", style: { position: 'absolute' } },
|
5
|
+
React.createElement("textarea", { className: "comment-content", role: "textbox", "aria-multiline": "true", onChange: e => setComment(e.target.value), value: comment, autoFocus: true }),
|
6
|
+
React.createElement("span", { className: "comment-button-area" },
|
7
|
+
React.createElement("span", null,
|
8
|
+
React.createElement("button", { onClick: () => updateComment(comment), disabled: comment.trim().length === 0 }, "Vastaa"),
|
9
|
+
React.createElement("button", { className: "text-button", onClick: () => closeEditor() }, "Peru")))));
|
10
|
+
}
|
11
|
+
//# sourceMappingURL=CreateAnnotationPopup.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"CreateAnnotationPopup.js","sourceRoot":"","sources":["../../../src/components/shared/CreateAnnotationPopup.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEvC,MAAM,UAAU,qBAAqB,CAAC,EACpC,aAAa,EACb,WAAW,EAIZ;IACC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAS,EAAE,CAAC,CAAA;IAElD,OAAO,CACL,8BAAM,SAAS,EAAC,kBAAkB,EAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE;QAChE,kCACE,SAAS,EAAC,iBAAiB,EAC3B,IAAI,EAAC,SAAS,oBACC,MAAM,EACrB,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EACzC,KAAK,EAAE,OAAO,EACd,SAAS,EAAE,IAAI,GACf;QACF,8BAAM,SAAS,EAAC,qBAAqB;YACnC;gBACE,gCAAQ,OAAO,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,aAE3E;gBACT,gCAAQ,SAAS,EAAC,aAAa,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,WAEnD,CACJ,CACF,CACF,CACR,CAAA;AACH,CAAC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"createRenderChildNodes.d.ts","sourceRoot":"","sources":["../src/createRenderChildNodes.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
1
|
+
{"version":3,"file":"createRenderChildNodes.d.ts","sourceRoot":"","sources":["../src/createRenderChildNodes.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwC,MAAM,OAAO,CAAA;AAO5D,eAAO,MAAM,gBAAgB,0CAA0C,CAAA;AACvE,eAAO,MAAM,iBAAiB,iCAAiC,CAAA;AAE/D,MAAM,WAAW,kBAAkB;IACjC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,kCAAkC;IAClC,OAAO,EAAE,OAAO,CAAA;IAChB,2EAA2E;IAC3E,gBAAgB,EAAE,gBAAgB,CAAA;CACnC;AAED,0BAAkB,aAAa;IAC7B,UAAU,IAAA;IACV,QAAQ,IAAA;CACT;AAED,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,aAAa,KAAK,KAAK,CAAC,SAAS,EAAE,CAAA;AAmB/F,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC,GACpE,gBAAgB,CAiDlB"}
|
@@ -1,13 +1,33 @@
|
|
1
|
-
import React from 'react';
|
2
|
-
import {
|
1
|
+
import React, { useContext, useEffect, useRef } from 'react';
|
2
|
+
import { AnnotationContext } from './components/context/AnnotationProvider';
|
3
|
+
import { onMouseDownForAnnotation } from './components/grading/examAnnotationUtils';
|
4
|
+
import { mapChildNodes, queryAncestors } from './dom-utils';
|
5
|
+
import { IsInSidebarContext } from './components/context/IsInSidebarContext';
|
3
6
|
export const ExamNamespaceURI = 'http://ylioppilastutkinto.fi/exam.xsd';
|
4
7
|
export const XHTMLNamespaceURI = 'http://www.w3.org/1999/xhtml';
|
8
|
+
function getElementPath(element) {
|
9
|
+
var _a, _b, _c;
|
10
|
+
const temp = !element.tagName && Array.from(((_a = element.parentNode) === null || _a === void 0 ? void 0 : _a.childNodes) || []).indexOf(element);
|
11
|
+
const elementIndex = Array.from(((_b = element.parentElement) === null || _b === void 0 ? void 0 : _b.children) || []).indexOf(element);
|
12
|
+
let path = `${element.nodeName}:${elementIndex > 0 ? elementIndex : temp}`;
|
13
|
+
let currentElement = element;
|
14
|
+
while (currentElement.parentElement) {
|
15
|
+
currentElement = currentElement.parentElement;
|
16
|
+
const displayNumber = currentElement.getAttribute('display-number');
|
17
|
+
const index = Number(displayNumber) || Array.from(((_c = currentElement.parentElement) === null || _c === void 0 ? void 0 : _c.children) || []).indexOf(currentElement);
|
18
|
+
const elementId = currentElement.getAttribute('id');
|
19
|
+
path = `${elementId || currentElement.nodeName}:${index} > ${path}`;
|
20
|
+
}
|
21
|
+
return path;
|
22
|
+
}
|
5
23
|
export function createRenderChildNodes(componentMap) {
|
6
24
|
function renderChildNode(node, index, options) {
|
7
25
|
switch (node.nodeType) {
|
8
26
|
case Node.TEXT_NODE:
|
9
|
-
case Node.CDATA_SECTION_NODE:
|
10
|
-
|
27
|
+
case Node.CDATA_SECTION_NODE: {
|
28
|
+
const path = getElementPath(node);
|
29
|
+
return options === 0 /* RenderOptions.RenderHTML */ ? renderTextNode(node, path) : null;
|
30
|
+
}
|
11
31
|
case Node.ELEMENT_NODE:
|
12
32
|
return renderElement(node, index, options);
|
13
33
|
default:
|
@@ -45,9 +65,68 @@ export function createRenderChildNodes(componentMap) {
|
|
45
65
|
}
|
46
66
|
return renderChildNodes;
|
47
67
|
}
|
48
|
-
function renderTextNode(node) {
|
49
|
-
|
68
|
+
function renderTextNode(node, key) {
|
69
|
+
var _a;
|
70
|
+
const annotationContextData = useContext(AnnotationContext);
|
71
|
+
const { isInSidebar } = useContext(IsInSidebarContext);
|
72
|
+
if ((annotationContextData === null || annotationContextData === void 0 ? void 0 : annotationContextData.annotations) === undefined ||
|
73
|
+
((_a = node.textContent) === null || _a === void 0 ? void 0 : _a.trim().length) === 0 ||
|
74
|
+
isInSidebar !== undefined) {
|
75
|
+
return node.textContent;
|
76
|
+
}
|
77
|
+
const { annotations, onClickAnnotation, setNewAnnotation, setNewAnnotationRef, newAnnotation } = annotationContextData;
|
78
|
+
const newAnnotationForThisNode = (newAnnotation === null || newAnnotation === void 0 ? void 0 : newAnnotation.annotationAnchor) === key ? newAnnotation : null;
|
79
|
+
const thisNodeAnnotations = ((annotations === null || annotations === void 0 ? void 0 : annotations[key]) || []).concat(newAnnotationForThisNode || []);
|
80
|
+
const mouseUpCallback = (annotation) => {
|
81
|
+
var _a;
|
82
|
+
const displayNumber = ((_a = queryAncestors(node.parentElement, 'question')) === null || _a === void 0 ? void 0 : _a.getAttribute('display-number')) || '';
|
83
|
+
setNewAnnotation({ ...annotation, annotationAnchor: key, displayNumber });
|
84
|
+
};
|
85
|
+
function onMouseDown(e) {
|
86
|
+
const target = e.target;
|
87
|
+
const clickIsInPopup = target.closest('.annotation-popup');
|
88
|
+
if (!clickIsInPopup) {
|
89
|
+
setNewAnnotation(null);
|
90
|
+
}
|
91
|
+
onMouseDownForAnnotation(e, mouseUpCallback);
|
92
|
+
}
|
93
|
+
return (React.createElement("span", { onMouseDown: onMouseDown, className: "e-annotatable", key: key }, (thisNodeAnnotations === null || thisNodeAnnotations === void 0 ? void 0 : thisNodeAnnotations.length) > 0 ? markText(node.textContent, thisNodeAnnotations) : node.textContent));
|
94
|
+
function markText(text, annotations) {
|
95
|
+
if (annotations.length === 0) {
|
96
|
+
return [text];
|
97
|
+
}
|
98
|
+
const nodes = [];
|
99
|
+
let lastIndex = 0;
|
100
|
+
annotations.sort((a, b) => a.startIndex - b.startIndex);
|
101
|
+
for (const annotation of annotations) {
|
102
|
+
if (annotation.startIndex < 0 || annotation.length <= 0) {
|
103
|
+
return [text];
|
104
|
+
}
|
105
|
+
// Add unmarked text before this mark
|
106
|
+
if (annotation.startIndex > lastIndex) {
|
107
|
+
nodes.push(text.substring(lastIndex, annotation.startIndex));
|
108
|
+
}
|
109
|
+
// Add marked text
|
110
|
+
const markedText = text.substring(annotation.startIndex, annotation.startIndex + annotation.length);
|
111
|
+
nodes.push(annotation.hidden ? (React.createElement("mark", { key: annotation.startIndex, className: "e-annotation", "data-annotation-id": annotation.annotationId, "data-hidden": "true" })) : (React.createElement(Mark, { key: annotation.startIndex, annotation: annotation, markedText: markedText, onClickAnnotation: onClickAnnotation, setNewAnnotationRef: setNewAnnotationRef })));
|
112
|
+
lastIndex = annotation.startIndex + annotation.length;
|
113
|
+
}
|
114
|
+
// Add remaining unmarked text
|
115
|
+
nodes.push(text.substring(lastIndex));
|
116
|
+
return nodes;
|
117
|
+
}
|
50
118
|
}
|
119
|
+
const Mark = ({ annotation, markedText, onClickAnnotation, setNewAnnotationRef }) => {
|
120
|
+
const markRef = useRef(null);
|
121
|
+
useEffect(() => {
|
122
|
+
if (markRef.current && !annotation.annotationId) {
|
123
|
+
setNewAnnotationRef(markRef.current);
|
124
|
+
}
|
125
|
+
}, []);
|
126
|
+
return (React.createElement("mark", { key: annotation.startIndex, ref: markRef, className: "e-annotation", "data-annotation-id": annotation.annotationId || '', "data-hidden": "false", onClick: e => onClickAnnotation(e, annotation) },
|
127
|
+
markedText,
|
128
|
+
(annotation === null || annotation === void 0 ? void 0 : annotation.markNumber) && React.createElement("sup", { className: "e-annotation", "data-content": annotation === null || annotation === void 0 ? void 0 : annotation.markNumber })));
|
129
|
+
};
|
51
130
|
function htmlAttributes2props(element, index) {
|
52
131
|
const props = { key: key(element, index) };
|
53
132
|
for (const attribute of element.attributes) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"createRenderChildNodes.js","sourceRoot":"","sources":["../src/createRenderChildNodes.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;
|
1
|
+
{"version":3,"file":"createRenderChildNodes.js","sourceRoot":"","sources":["../src/createRenderChildNodes.tsx"],"names":[],"mappings":"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"}
|