diff --git a/editors/demo/src/Editoria/config/config.js b/editors/demo/src/Editoria/config/config.js index b428865c8255d5b9220b7fce7ffdb073fa759ebc..6b4c4ec42c7103065651f9409457df9115a66d47 100644 --- a/editors/demo/src/Editoria/config/config.js +++ b/editors/demo/src/Editoria/config/config.js @@ -60,7 +60,7 @@ import invisibles, { // }; const updateTitle = debounce(title => { - console.log(title); + // console.log(title); }, 3000); const saveTags = tags => { diff --git a/editors/demo/src/Editors.js b/editors/demo/src/Editors.js index fa52e35509b57dc1e5f1d06514566f8cc480bbe7..977ed5cc4dbf7c694157ede01a713d4b2f5b983e 100644 --- a/editors/demo/src/Editors.js +++ b/editors/demo/src/Editors.js @@ -54,7 +54,7 @@ const Editors = () => { case 'ncbi': break; default: - return <Editoria />; + return <HHMI />; } }; diff --git a/editors/demo/src/HHMI/HHMI.js b/editors/demo/src/HHMI/HHMI.js index 58e26fb8cf0939141047a8e97f1609070ce149dc..1baf671f6dc2e4885b2bfe82bf6cf02f0176c567 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={initialValue} + value="" targetFormat="JSON" // readonly layout={HhmiLayout} diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/FeedBackNodeView.js b/editors/demo/src/HHMI/MultipleChoiceQuestionService/FeedBackNodeView.js new file mode 100644 index 0000000000000000000000000000000000000000..67df88fe3da1c3350c47df3a84cfc8b6ae486558 --- /dev/null +++ b/editors/demo/src/HHMI/MultipleChoiceQuestionService/FeedBackNodeView.js @@ -0,0 +1,7 @@ +import { AbstractNodeView } from 'wax-prosemirror-services'; + +export default class FeedBackNodeView extends AbstractNodeView { + static name() { + return 'feedback'; + } +} diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestion.js b/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestion.js index 595fa2ac3b886df2bfe3370cc49c8585a59cc544..99c378f1bc0a3733c143e69340622150989d6af0 100644 --- a/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestion.js +++ b/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestion.js @@ -12,6 +12,7 @@ class MultipleChoiceQuestion extends Tools { get run() { return (state, dispatch) => { + console.log(state); const { from, to } = state.selection; const { tr } = state; diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js b/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js index f5feaeabb8bb0bd380fa0d2165827da8bd78f865..5053c0221852fe3ede712da66e45660c3f8b7817 100644 --- a/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js +++ b/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js @@ -1,9 +1,11 @@ import { Service } from 'wax-prosemirror-services'; import MultipleChoiceQuestion from './MultipleChoiceQuestion'; import multipleChoiceNode from './schema/multipleChoiceNode'; +// import feedBackNode from './schema/feedBackNode'; import QuestionComponent from './components/QuestionComponent'; -import FeedbackComponent from './components/FeedbackComponent'; +// import FeedbackComponent from './components/FeedbackComponent'; import MultipleChoiceNodeView from './MultipleChoiceNodeView'; +// import FeedBackNodeView from './FeedBackNodeView'; class MultipleChoiceQuestionService extends Service { boot() {} @@ -16,6 +18,10 @@ class MultipleChoiceQuestionService extends Service { multiple_choice: multipleChoiceNode, }); + // createNode({ + // feedback: feedBackNode, + // }); + createNode({ question_wrapper: { group: 'block', @@ -47,7 +53,11 @@ class MultipleChoiceQuestionService extends Service { component: QuestionComponent, context: this.app, }); - // addPortal({ nodeView, component: FeedbackComponent, context: this.app }); + // addPortal({ + // nodeView: FeedBackNodeView, + // component: FeedbackComponent, + // context: this.app, + // }); } } diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/FeedbackComponent.js b/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/FeedbackComponent.js index e0e0c7af10bbb3e469fb40b9ac9890f362351df4..a2b4a42313999972eeef75072265a2fabf46d138 100644 --- a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/FeedbackComponent.js +++ b/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/FeedbackComponent.js @@ -6,6 +6,6 @@ import { WaxContext } from 'wax-prosemirror-core'; import EditorComponent from './EditorComponent'; export default ({ node, view, getPos }) => { - console.log(node); - return null; + console.log(node, 'feedback'); + return <EditorComponent node={node} view={view} getPos={getPos} />; }; diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/QuestionComponent.js b/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/QuestionComponent.js index 8d12be66b6c9e6a1a09369a136be79680c4d8fe3..face78635b144c9c595921259ed032926a78f19c 100644 --- a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/QuestionComponent.js +++ b/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/QuestionComponent.js @@ -4,6 +4,7 @@ import styled from 'styled-components'; import { TextSelection } from 'prosemirror-state'; import { WaxContext } from 'wax-prosemirror-core'; import EditorComponent from './EditorComponent'; +import FeedbackComponent from './FeedbackComponent'; const QuestionWrapper = styled.div` display: flex; @@ -59,6 +60,7 @@ 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('');