From b599288e7174ffd2cf2654bbbf9ae0510382d0d3 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Fri, 4 Mar 2022 08:32:16 +0200
Subject: [PATCH] feedbakc readonly
---
editors/demo/src/NCBI/layout/EditorElements.js | 1 -
.../components/FeedbackComponent.js | 3 ++-
.../components/FillTheGapContainerComponent.js | 7 ++++++-
.../components/AnswerComponent.js | 7 ++++++-
.../TrueFalseQuestionService/components/AnswerComponent.js | 7 ++++++-
.../components/AnswerComponent.js | 7 ++++++-
.../components/AnswerComponent.js | 7 ++++++-
.../components/FeedbackComponent.js | 3 ++-
wax-prosemirror-services/src/NoteService/note.css | 2 +-
9 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/editors/demo/src/NCBI/layout/EditorElements.js b/editors/demo/src/NCBI/layout/EditorElements.js
index c5fd423e6..fcb7a36cf 100644
--- a/editors/demo/src/NCBI/layout/EditorElements.js
+++ b/editors/demo/src/NCBI/layout/EditorElements.js
@@ -13,7 +13,6 @@ const fontWriting = css`
export default css`
.ProseMirror {
background: white;
- counter-reset: footnote;
line-height: 12px;
width: 497px;
white-space: pre !important;
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/components/FeedbackComponent.js b/wax-prosemirror-services/src/FillTheGapQuestionService/components/FeedbackComponent.js
index 09f2a85e1..c9f4b2045 100644
--- a/wax-prosemirror-services/src/FillTheGapQuestionService/components/FeedbackComponent.js
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/components/FeedbackComponent.js
@@ -33,7 +33,7 @@ const FeedBackInput = styled.input`
}
`;
-export default ({ node, view, getPos }) => {
+export default ({ node, view, getPos, readOnly }) => {
const context = useContext(WaxContext);
const [feedBack, setFeedBack] = useState(' ');
const [isFirstRun, setFirstRun] = useState(true);
@@ -86,6 +86,7 @@ export default ({ node, view, getPos }) => {
<FeedBack>
<FeedBackLabel>Feedback</FeedBackLabel>
<FeedBackInput
+ disabled={readOnly}
onBlur={saveFeedBack}
onChange={feedBackInput}
onFocus={onFocus}
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/components/FillTheGapContainerComponent.js b/wax-prosemirror-services/src/FillTheGapQuestionService/components/FillTheGapContainerComponent.js
index b0781f807..af75baa87 100644
--- a/wax-prosemirror-services/src/FillTheGapQuestionService/components/FillTheGapContainerComponent.js
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/components/FillTheGapContainerComponent.js
@@ -38,7 +38,12 @@ export default ({ node, view, getPos }) => {
<FillTheGapContainer className="fill-the-gap">
<ContainerEditor getPos={getPos} node={node} view={view} />
{!(readOnly && !customProps.showFeedBack) && (
- <FeedbackComponent getPos={getPos} node={node} view={view} />
+ <FeedbackComponent
+ getPos={getPos}
+ node={node}
+ readOnly={readOnly}
+ view={view}
+ />
)}
</FillTheGapContainer>
</FillTheGapWrapper>
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/AnswerComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/AnswerComponent.js
index c013fc7b7..ccb94ade0 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/AnswerComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/AnswerComponent.js
@@ -180,7 +180,12 @@ export default ({ node, view, getPos }) => {
<EditorComponent getPos={getPos} node={node} view={view} />
</QuestionData>
{!(readOnly && !customProps.showFeedBack) && (
- <FeedbackComponent getPos={getPos} node={node} view={view} />
+ <FeedbackComponent
+ getPos={getPos}
+ node={node}
+ readOnly={readOnly}
+ view={view}
+ />
)}
</QuestionWrapper>
</QuestionControlsWrapper>
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/AnswerComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/AnswerComponent.js
index 7303a8847..198243920 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/AnswerComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/AnswerComponent.js
@@ -180,7 +180,12 @@ export default ({ node, view, getPos }) => {
<EditorComponent getPos={getPos} node={node} view={view} />
</QuestionData>
{!(readOnly && !customProps.showFeedBack) && (
- <FeedbackComponent getPos={getPos} node={node} view={view} />
+ <FeedbackComponent
+ getPos={getPos}
+ node={node}
+ readOnly={readOnly}
+ view={view}
+ />
)}
</QuestionWrapper>
</QuestionControlsWrapper>
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/AnswerComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/AnswerComponent.js
index 665837da3..36ba8d6e2 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/AnswerComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/AnswerComponent.js
@@ -180,7 +180,12 @@ export default ({ node, view, getPos }) => {
<EditorComponent getPos={getPos} node={node} view={view} />
</QuestionData>
{!(readOnly && !customProps.showFeedBack) && (
- <FeedbackComponent getPos={getPos} node={node} view={view} />
+ <FeedbackComponent
+ getPos={getPos}
+ node={node}
+ readOnly={readOnly}
+ view={view}
+ />
)}
</QuestionWrapper>
</QuestionControlsWrapper>
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/AnswerComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/AnswerComponent.js
index 8ad008394..39edde8db 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/AnswerComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/AnswerComponent.js
@@ -180,7 +180,12 @@ export default ({ node, view, getPos }) => {
<EditorComponent getPos={getPos} node={node} view={view} />
</QuestionData>
{!(readOnly && !customProps.showFeedBack) && (
- <FeedbackComponent getPos={getPos} node={node} view={view} />
+ <FeedbackComponent
+ getPos={getPos}
+ node={node}
+ readOnly={readOnly}
+ view={view}
+ />
)}
</QuestionWrapper>
</QuestionControlsWrapper>
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/FeedbackComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/FeedbackComponent.js
index 1eb7cf8ac..b7b59b96c 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/FeedbackComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/FeedbackComponent.js
@@ -31,7 +31,7 @@ const FeedBackInput = styled.input`
}
`;
-export default ({ node, view, getPos }) => {
+export default ({ node, view, getPos, readOnly }) => {
const context = useContext(WaxContext);
const [feedBack, setFeedBack] = useState(' ');
const [isFirstRun, setFirstRun] = useState(true);
@@ -96,6 +96,7 @@ export default ({ node, view, getPos }) => {
<FeedBack>
<FeedBackLabel>Feedback</FeedBackLabel>
<FeedBackInput
+ readOnly={readOnly}
onBlur={saveFeedBack}
onChange={feedBackInput}
onFocus={onFocus}
diff --git a/wax-prosemirror-services/src/NoteService/note.css b/wax-prosemirror-services/src/NoteService/note.css
index d42cfb895..9be7d97ad 100644
--- a/wax-prosemirror-services/src/NoteService/note.css
+++ b/wax-prosemirror-services/src/NoteService/note.css
@@ -1,7 +1,7 @@
/* FootNote */
.ProseMirror {
- counter-reset: footnote;
+ counter-reset: footnote!important;
}
.ProseMirror footnote {
--
GitLab