diff --git a/editors/demo/src/NCBI/layout/EditorElements.js b/editors/demo/src/NCBI/layout/EditorElements.js index c5fd423e6c92c29fbd4b5698a011717b5ae43eda..fcb7a36cfeaef041763c162fd847e3ad23431b14 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 09f2a85e199ca8f2001c65e9e469b104211e9f34..c9f4b2045207dee993360f85bf67cdeadf05d3e0 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 b0781f8077a20f183c030aa8dccb7303a1c1c6ec..af75baa87ac5376d688545444a386132fe25078b 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 c013fc7b771ec7db52d68fe79fbdd8f255bbc3e2..ccb94ade002431a21a64a868c28bf15a4bcaaead 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 7303a884752de59126663b088a21e960206148d6..1982439204b59fe5e9350afd1f4795fbd49b9595 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 665837da3a54e1e7d2b617015f20a702d5ef183b..36ba8d6e28a99382749e09b135adffda6583ba44 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 8ad008394c9199199be9d805ac87f1bfc79b84ea..39edde8db4deff27970a5cd7b7b4a0464a3dfaef 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 1eb7cf8ac7671e39106be6a638b4a3ed8cf92873..b7b59b96c8b95b6e36a5fa6b4a9bc4f7a233d454 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 d42cfb8950d2c38587faa6db12851a25ac9217c5..9be7d97ad6c7f0faf031c614bc141a47c31f768a 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 {