fix activeView

wax-prosemirror-components/src/components/Button.js

@@ -5,12 +5,12 @@ import MenuButton from '../ui/buttons/MenuButton';
 
 const Button = ({ view = {}, item }) => {
   const { active, icon, label, run, select, title } = item;
-
+  const context = useContext(WaxContext);
   const {
     view: { main },
     activeViewId,
     activeView,
-  } = useContext(WaxContext);
+  } = context;
 
   const isEditable = main.props.editable(editable => {
     return editable;
@@ -44,7 +44,7 @@ const Button = ({ view = {}, item }) => {
         title={title}
       />
     ),
-    [isActive, isDisabled],
+    [isActive, isDisabled, activeViewId],
   );
 
   return MenuButtonComponent;

wax-prosemirror-components/src/components/images/ImageUpload.js

@@ -93,7 +93,7 @@ const ImageUpload = ({ item, fileUpload, view }) => {
         </label>
       </Wrapper>
     ),
-    [isDisabled],
+    [isDisabled, activeViewId],
   );
 
   return ImageUploadComponent;

wax-prosemirror-services/src/EssayService/EssayQuestion.js

@@ -96,10 +96,10 @@ class EssayQuestion extends Tools {
       tr.replaceSelectionWith(essayAnswer);
       dispatch(tr);
 
-      //  setTimeout(() => {
-      //    createEmptyParagraph(context, essayQuestion.attrs.id);
-      //    createEmptyParagraph(context, essayAnswer.attrs.id);
-      //  }, 50);
+      setTimeout(() => {
+        createEmptyParagraph(context, essayAnswer.attrs.id);
+        createEmptyParagraph(context, essayQuestion.attrs.id);
+      }, 50);
     };
   }
 

wax-prosemirror-services/src/EssayService/components/EssayAnswerComponent.js

@@ -15,7 +15,7 @@ import {
   liftListItem,
   sinkListItem,
 } from 'prosemirror-schema-list';
-import Placeholder from '../plugins/placeholder';
+import Placeholder from '../../MultipleChoiceQuestionService/plugins/placeholder';
 
 const EditorWrapper = styled.div`
   border: none;

wax-prosemirror-services/src/EssayService/components/EssayQuestionComponent.js

@@ -15,7 +15,7 @@ import {
   liftListItem,
   sinkListItem,
 } from 'prosemirror-schema-list';
-import Placeholder from '../plugins/placeholder';
+import Placeholder from '../../MultipleChoiceQuestionService/plugins/placeholder';
 
 const EditorWrapper = styled.div`
   border: none;
@@ -150,6 +150,9 @@ const EssayQuestionComponent = ({ node, view, getPos }) => {
             if (essayQuestionView.hasFocus()) essayQuestionView.focus();
           },
         },
+        handleClickOn: () => {
+          context.updateView({}, questionId);
+        },
 
         attributes: {
           spellcheck: 'false',