From 07c7ce89d341bb5fe058c4229cf6cab8584c920d Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Thu, 27 May 2021 12:50:56 +0300
Subject: [PATCH] render all nodes
---
editors/demo/src/HHMI/HHMI.js | 2 +-
.../components/QuestionComponent.js | 1 -
.../schema/multipleChoiceNode.js | 2 +-
wax-prosemirror-core/src/PortalContext.js | 22 ++++++++++---------
.../components/PortalComponent.js | 1 +
5 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/editors/demo/src/HHMI/HHMI.js b/editors/demo/src/HHMI/HHMI.js
index 1baf671f6..58e26fb8c 100644
--- a/editors/demo/src/HHMI/HHMI.js
+++ b/editors/demo/src/HHMI/HHMI.js
@@ -183,7 +183,7 @@ const Hhmi = () => {
config={config}
autoFocus
fileUpload={file => renderImage(file)}
- value=""
+ value={initialValue}
targetFormat="JSON"
// readonly
layout={HhmiLayout}
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/QuestionComponent.js b/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/QuestionComponent.js
index face78635..e4675a6ca 100644
--- a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/QuestionComponent.js
+++ b/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/QuestionComponent.js
@@ -60,7 +60,6 @@ const Question = styled.div`
`;
export default ({ node, view, getPos }) => {
- console.log(node);
const context = useContext(WaxContext);
const [showExplanation, setShowExplanation] = useState(false);
const [explanationValue, setExplanationValue] = useState('');
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/schema/multipleChoiceNode.js b/editors/demo/src/HHMI/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
index ad3a371eb..adfd3e60e 100644
--- a/editors/demo/src/HHMI/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
+++ b/editors/demo/src/HHMI/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
@@ -1,6 +1,6 @@
const multipleChoiceNode = {
group: 'inline',
- content: 'inline*',
+ content: 'block*',
inline: true,
// atom: true,
attrs: {
diff --git a/wax-prosemirror-core/src/PortalContext.js b/wax-prosemirror-core/src/PortalContext.js
index 193cc1d36..4a8f32447 100644
--- a/wax-prosemirror-core/src/PortalContext.js
+++ b/wax-prosemirror-core/src/PortalContext.js
@@ -27,16 +27,18 @@ export default props => {
decorations,
context,
) => {
- setPortal({
- ...portal,
- id: uuidv4(),
- element,
- component,
- node,
- view,
- getPos,
- decorations,
- context,
+ setTimeout(() => {
+ setPortal({
+ ...portal,
+ id: uuidv4(),
+ element,
+ component,
+ node,
+ view,
+ getPos,
+ decorations,
+ context,
+ });
});
},
});
diff --git a/wax-prosemirror-services/src/PortalService/components/PortalComponent.js b/wax-prosemirror-services/src/PortalService/components/PortalComponent.js
index 983fdfb47..520c5d391 100644
--- a/wax-prosemirror-services/src/PortalService/components/PortalComponent.js
+++ b/wax-prosemirror-services/src/PortalService/components/PortalComponent.js
@@ -30,6 +30,7 @@ export default () => {
portals.map(({ dom, component: Component, id }) => {
return ReactDOM.createPortal(
<Component
+ key={id}
decorations={decorations}
getPos={getPos}
node={node}
--
GitLab