From d975857c1ce9bbb31de8edba114cdc4252fa7777 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Fri, 23 Apr 2021 16:37:35 +0300
Subject: [PATCH] fix
---
editors/demo/src/HHMI/HHMI.js | 5 -----
.../MultipleChoiceQuestionService/MultipleChoiceNodeView.js | 4 ++++
.../components/TestComponent.js | 3 ---
.../src/PortalService/AbstractNodeView.js | 3 +++
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/editors/demo/src/HHMI/HHMI.js b/editors/demo/src/HHMI/HHMI.js
index 7e45e524a..05e3769fa 100644
--- a/editors/demo/src/HHMI/HHMI.js
+++ b/editors/demo/src/HHMI/HHMI.js
@@ -56,13 +56,8 @@ const Hhmi = () => {
config={config}
autoFocus
fileUpload={file => renderImage(file)}
-<<<<<<< HEAD
- value=""
- // targetFormat="JSON"
-=======
value={initialValue}
targetFormat="JSON"
->>>>>>> create editor
// readonly
layout={HhmiLayout}
onChange={source => console.log(source)}
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceNodeView.js b/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceNodeView.js
index e4422c4c7..cc9ff4c5b 100644
--- a/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceNodeView.js
+++ b/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceNodeView.js
@@ -57,6 +57,7 @@ export default class MultipleChoiceNodeView extends AbstractNodeView {
}
update(node) {
+<<<<<<< HEAD
if (!node.sameMarkup(this.node)) return false;
this.node = node;
if (this.innerView) {
@@ -76,6 +77,9 @@ export default class MultipleChoiceNodeView extends AbstractNodeView {
);
}
}
+=======
+ console.log('in nodes update');
+>>>>>>> fix
return true;
}
}
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/TestComponent.js b/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/TestComponent.js
index fbc0d58cd..5130338c1 100644
--- a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/TestComponent.js
+++ b/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/TestComponent.js
@@ -24,17 +24,14 @@ const EditorWrapper = styled.div`
user-select: all;
`;
-
export default ({ node, view, getPos }) => {
const [showExplanation, setShowExplanation] = useState(false);
- }
const clickMe = () => {
setShowExplanation(true);
// view.dispatch(view.state.tr);
};
-;
return (
<>
<button onClick={clickMe}>Show Explanation</button>
diff --git a/wax-prosemirror-services/src/PortalService/AbstractNodeView.js b/wax-prosemirror-services/src/PortalService/AbstractNodeView.js
index 214ef693a..960062037 100644
--- a/wax-prosemirror-services/src/PortalService/AbstractNodeView.js
+++ b/wax-prosemirror-services/src/PortalService/AbstractNodeView.js
@@ -4,10 +4,13 @@ export default class AbstractNodeView {
constructor(node, view, getPos, decorations, createPortal, Component) {
this.dom = document.createElement('div');
// this.dom.setAttribute('contenteditable', true);
+<<<<<<< HEAD
const testDiv = document.createElement('div');
testDiv.setAttribute('id', 'test');
this.dom.append(testDiv);
+=======
+>>>>>>> fix
this.dom.id = uuidv4();
this.dom.classList.add('portal');
--
GitLab