diff --git a/editors/demo/src/HHMI/HHMI.js b/editors/demo/src/HHMI/HHMI.js index 3de249ab081c5ab16a17604036c95bbf722431de..a0ed4a909162c625bb6ee8cfe917326084a2af39 100644 --- a/editors/demo/src/HHMI/HHMI.js +++ b/editors/demo/src/HHMI/HHMI.js @@ -14,6 +14,7 @@ const renderImage = file => { setTimeout(() => reader.readAsDataURL(file), 150); }); }; +const t = `<p class="paragraph">sdfsd</p><p class="paragraph">fdfs</p><div id="4cdb7e13-514d-4c6d-b2f3-f5b1a07af10a" class="mutiple-choice"><div class="mutiple-choice-option" id="d394ff84-5153-49e2-af12-141b05883be4" correct="false" feedback=""><p class="paragraph">rwerewrwer</p></div><div class="mutiple-choice-option" id="4efaa449-4d06-448b-98cd-a3b1c58b5b62" correct="false" feedback=""><p class="paragraph"></p></div></div>`; const Hhmi = () => { return ( @@ -22,10 +23,10 @@ const Hhmi = () => { config={config} autoFocus fileUpload={file => renderImage(file)} - value="" + value={t} // readonly layout={HhmiLayout} - // onChange={source => console.log(source)} + onChange={source => console.log(source)} /> </> ); diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/ToolBarBtn.js b/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/ToolBarBtn.js index 180b1787e4acfc66c4d42a31ef3563290c5dd7b2..110af71c7cc5b899f678a36a1cf1ee61383e061c 100644 --- a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/ToolBarBtn.js +++ b/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/ToolBarBtn.js @@ -58,7 +58,7 @@ const ToolBarBtn = ({ view = {}, item }) => { ), ); - /* create First Option */ + /* create Second Option */ const newAnswerId = uuidv4(); const answerOption = main.state.config.schema.nodes.multiple_choice.create( { id: newAnswerId }, diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js b/editors/demo/src/HHMI/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js index e63cf2aab632edb0fca12e8d534a88db67783099..14eed4e36a87be6342c8860f4856b3e2337bf757 100644 --- a/editors/demo/src/HHMI/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js +++ b/editors/demo/src/HHMI/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js @@ -4,8 +4,10 @@ const multipleChoiceContainerNode = { class: { default: 'mutiple-choice' }, }, group: 'block', - atom: true, - content: 'block+', + // atom: true, + selectable: true, + draggable: false, + content: 'multiple_choice+', parseDOM: [ { tag: 'div.mutiple-choice', diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/schema/multipleChoiceNode.js b/editors/demo/src/HHMI/MultipleChoiceQuestionService/schema/multipleChoiceNode.js index a4b95a133962f2d1f3a6661de60dcbb969672381..c7e79e9d25df6b5559c8cc9cc826aa7eb2a5c4ae 100644 --- a/editors/demo/src/HHMI/MultipleChoiceQuestionService/schema/multipleChoiceNode.js +++ b/editors/demo/src/HHMI/MultipleChoiceQuestionService/schema/multipleChoiceNode.js @@ -1,12 +1,16 @@ +import { v4 as uuidv4 } from 'uuid'; + const multipleChoiceNode = { attrs: { class: { default: 'mutiple-choice-option' }, - id: { default: '' }, + id: { default: uuidv4() }, correct: { default: false }, feedback: { default: '' }, }, group: 'block', content: 'block*', + defining: true, + // atom: true, parseDOM: [ { diff --git a/editors/demo/src/HHMI/layout/EditorElements.js b/editors/demo/src/HHMI/layout/EditorElements.js index 43acaf2e503e80fad9bc8faad44f5584a4caca53..7201b0de261de9726636805f0e482b573deeaea2 100644 --- a/editors/demo/src/HHMI/layout/EditorElements.js +++ b/editors/demo/src/HHMI/layout/EditorElements.js @@ -330,6 +330,7 @@ export default css` counter-reset: question-item-multiple; margin: 38px; padding: 20px; + padding-top: 0px; &:before { bottom: 45px; @@ -339,14 +340,6 @@ export default css` right: 20px; } - .portal p { - display: block !important; - } - - p:last-of-type { - display: none; - } - .ProseMirror { box-shadow: none; padding: 5px 5px 0 5px;