From 526f5fd6bed9656bb11c0ecc0191a3ee97b67c5c Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Tue, 21 Sep 2021 22:31:16 +0300
Subject: [PATCH] fix multiple schema
---
editors/demo/src/HHMI/HHMI.js | 5 +++--
.../components/ToolBarBtn.js | 2 +-
.../schema/multipleChoiceContainerNode.js | 6 ++++--
.../schema/multipleChoiceNode.js | 6 +++++-
editors/demo/src/HHMI/layout/EditorElements.js | 9 +--------
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/editors/demo/src/HHMI/HHMI.js b/editors/demo/src/HHMI/HHMI.js
index 3de249ab0..a0ed4a909 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 180b1787e..110af71c7 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 e63cf2aab..14eed4e36 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 a4b95a133..c7e79e9d2 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 43acaf2e5..7201b0de2 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;
--
GitLab