diff --git a/editors/demo/src/Editors.js b/editors/demo/src/Editors.js index abd0628fb70695fdd171c22a2956784070ef3345..d19991a2ed8613a7f85ed0fed95a7dc6ef294736 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-components/src/ui/tabs/BlockLevelTools.js b/wax-prosemirror-components/src/ui/tabs/BlockLevelTools.js index 1597c036ca6cb5de83b6fa30d21355073cef2812..4da9fb35fe73f42f49defa4fe9eed461e8320c40 100644 --- a/wax-prosemirror-components/src/ui/tabs/BlockLevelTools.js +++ b/wax-prosemirror-components/src/ui/tabs/BlockLevelTools.js @@ -22,8 +22,8 @@ const BlockLevelTools = props => { groups.map(group => ( <BlockElementGroup groupName={group.groupName} - key={group.groupName} items={group.items} + key={group.groupName} view={view} /> ))} diff --git a/wax-prosemirror-core/src/Wax.js b/wax-prosemirror-core/src/Wax.js index 1aa1373a3d1031f88db0f11975001ea2e39ac950..b94cde27fd140f08badd06679d5f1410c0ba5a92 100644 --- a/wax-prosemirror-core/src/Wax.js +++ b/wax-prosemirror-core/src/Wax.js @@ -2,7 +2,6 @@ import React, { useEffect, useState, forwardRef } from 'react'; import { DOMSerializer } from 'prosemirror-model'; import { DefaultSchema } from 'wax-prosemirror-utilities'; - import WaxProvider from './WaxContext'; import PortalProvider from './PortalContext'; import Application from './Application'; diff --git a/wax-prosemirror-core/src/WaxView.js b/wax-prosemirror-core/src/WaxView.js index 7ff86c91d1044160552128e62df1774bbd4bdb59..6f51fe61bbd190efe95fa18bda4582840db26ac4 100644 --- a/wax-prosemirror-core/src/WaxView.js +++ b/wax-prosemirror-core/src/WaxView.js @@ -11,7 +11,7 @@ import React, { } from 'react'; import applyDevTools from 'prosemirror-dev-tools'; -import { EditorState, TextSelection } from 'prosemirror-state'; +import { EditorState } from 'prosemirror-state'; import { EditorView } from 'prosemirror-view'; import { trackedTransaction } from 'wax-prosemirror-services'; import { WaxContext } from './WaxContext'; diff --git a/wax-prosemirror-services/src/EssayService/components/EssayAnswerComponent.js b/wax-prosemirror-services/src/EssayService/components/EssayAnswerComponent.js index ac28f36023118d42080a3cdd2f7d9d0ded463340..68e48c7262da4ed1f231d33ae939c62af87a4895 100644 --- a/wax-prosemirror-services/src/EssayService/components/EssayAnswerComponent.js +++ b/wax-prosemirror-services/src/EssayService/components/EssayAnswerComponent.js @@ -22,6 +22,8 @@ const EditorWrapper = styled.div` display: flex; flex: 2 1 auto; justify-content: left; + opacity: ${props => (props.editable ? 1 : 0.4)}; + cursor: ${props => (props.editable ? 'default' : 'not-allowed')}; .ProseMirror { white-space: break-spaces; @@ -118,7 +120,7 @@ const EssayAnswerComponent = ({ node, view, getPos }) => { mount: editorRef.current, }, { - editable: () => isEditable, + editable: () => !isEditable, state: EditorState.create({ doc: node, plugins: finalPlugins, @@ -191,7 +193,7 @@ const EssayAnswerComponent = ({ node, view, getPos }) => { }; return ( - <EditorWrapper> + <EditorWrapper editable={!isEditable}> <div ref={editorRef} /> </EditorWrapper> );