From b51375a86088728e133b823efce2a6c52e4a6041 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Wed, 23 Mar 2022 11:38:07 +0200
Subject: [PATCH] =?UTF-8?q?=C3=A7leanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
editors/demo/src/Editors.js | 2 +-
wax-prosemirror-core/src/WaxView.js | 1 -
.../src/GetContentOnEnterPlugin.js | 12 +++++++-----
.../components/MatchingContainerComponent.js | 15 ++++++++++++++-
.../schema/matchingContainerNode.js | 1 +
5 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/editors/demo/src/Editors.js b/editors/demo/src/Editors.js
index 166168897..1e839e3d3 100644
--- a/editors/demo/src/Editors.js
+++ b/editors/demo/src/Editors.js
@@ -70,7 +70,7 @@ const Editors = () => {
case 'ncbi':
return <NCBI />;
default:
- return <Editoria />;
+ return <HHMI />;
}
};
diff --git a/wax-prosemirror-core/src/WaxView.js b/wax-prosemirror-core/src/WaxView.js
index 457eaaff6..aff7a6402 100644
--- a/wax-prosemirror-core/src/WaxView.js
+++ b/wax-prosemirror-core/src/WaxView.js
@@ -73,7 +73,6 @@ const WaxView = forwardRef((props, ref) => {
state: EditorState.create(options),
dispatchTransaction,
disallowedTools: [],
- options,
user,
scrollMargin: 200,
scrollThreshold: 200,
diff --git a/wax-prosemirror-plugins/src/GetContentOnEnterPlugin.js b/wax-prosemirror-plugins/src/GetContentOnEnterPlugin.js
index 3d910ce0c..c40aa3ab1 100644
--- a/wax-prosemirror-plugins/src/GetContentOnEnterPlugin.js
+++ b/wax-prosemirror-plugins/src/GetContentOnEnterPlugin.js
@@ -40,6 +40,8 @@ export default props => {
}
const {
selection: { from, to },
+ config: { schema, plugins },
+ doc: { content },
} = view.state;
view.state.doc.nodesBetween(from, to, node => {
@@ -47,16 +49,16 @@ export default props => {
});
if (!isList) {
- const serialize = serializer(view.props.options.schema);
- props.getContentOnEnter(serialize(view.state.doc.content));
+ const serialize = serializer(schema);
+ props.getContentOnEnter(serialize(content));
const WaxOptions = {
doc: {},
- schema: view.props.options.schema,
- plugins: view.props.options.plugins,
+ schema,
+ plugins,
};
- const parse = parser(view.props.options.schema);
+ const parse = parser(schema);
WaxOptions.doc = parse('');
view.updateState(EditorState.create(WaxOptions));
if (view.dispatch) {
diff --git a/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js b/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js
index d8fbb4c76..645a861ca 100644
--- a/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js
+++ b/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js
@@ -45,6 +45,14 @@ const StyledIconAction = styled(Icon)`
width: 24px;
`;
+const OptionArea = styled.div`
+ display: flex;
+`;
+
+const AddOption = styled.div`
+ display: flex;
+`;
+
export default ({ node, view, getPos }) => {
const context = useContext(WaxContext);
const {
@@ -85,7 +93,12 @@ export default ({ node, view, getPos }) => {
</LeftArea>
<RightArea>Right</RightArea>
</QuestionWrapper>
- <CreateOptions>Options</CreateOptions>
+ <CreateOptions>
+ <OptionArea>Options Area</OptionArea>
+ <AddOption>
+ <input type="text"></input>
+ </AddOption>
+ </CreateOptions>
{!(readOnly && !customProps.showFeedBack) && (
<FeedbackComponent
getPos={getPos}
diff --git a/wax-prosemirror-services/src/MatchingService/schema/matchingContainerNode.js b/wax-prosemirror-services/src/MatchingService/schema/matchingContainerNode.js
index f2d714604..887d518de 100644
--- a/wax-prosemirror-services/src/MatchingService/schema/matchingContainerNode.js
+++ b/wax-prosemirror-services/src/MatchingService/schema/matchingContainerNode.js
@@ -2,6 +2,7 @@ const matchingContainerNode = {
attrs: {
id: { default: '' },
class: { default: 'matching-container' },
+ questions: { default: { question: [], answer: '' } },
},
group: 'block questions',
atom: true,
--
GitLab