images in progress

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

@@ -15,7 +15,7 @@ const Wrapper = styled.div`
 const ImageUpload = ({ item, fileUpload, view }) => {
   const {
     app,
-    activeViewId,
+    activeView,
     view: { main },
   } = useContext(WaxContext);
 
@@ -37,7 +37,7 @@ const ImageUpload = ({ item, fileUpload, view }) => {
     insertImage(urls, view, placeholderPlugin);
   }
 
-  let isDisabled = !item.select(view.state, activeViewId);
+  let isDisabled = !item.select(activeView);
 
   const isEditable = main.props.editable(editable => {
     return editable;

wax-prosemirror-components/src/components/tables/CreateTable.js

@@ -27,9 +27,6 @@ const CreateTable = ({ view = {}, item }) => {
     activeView,
     activeViewId,
   } = useContext(WaxContext);
-  if (item.onlyOnMain) {
-    view = main;
-  }
 
   const { icon, run, select, title } = item;
   const ref = useRef();
@@ -48,7 +45,7 @@ const CreateTable = ({ view = {}, item }) => {
     setIsOpen(!isOpen);
   };
 
-  let isDisabled = !select(activeView, activeViewId);
+  let isDisabled = !select(activeView);
 
   const isEditable = main.props.editable(editable => {
     return editable;

wax-prosemirror-services/src/ImageService/Image.js

@@ -18,8 +18,9 @@ class Image extends Tools {
     return true;
   }
 
-  select = (state, activeViewId) => {
-    if (activeViewId !== 'main') return false;
+  select = activeView => {
+    const { disallowedTools } = activeView.props;
+    if (disallowedTools.includes('images')) return false;
     return true;
   };
 

wax-prosemirror-services/src/NoteService/Editor.js

@@ -37,7 +37,7 @@ export default ({ node, view }) => {
         }),
         // This is the magic part
         dispatchTransaction,
-        disallowedTools: ['tables'],
+        disallowedTools: ['tables', 'images'],
         handleDOMEvents: {
           blur: () => {
             if (context.view[noteId]) {

wax-prosemirror-services/src/TablesService/InsertTableService/Table.js

@@ -19,8 +19,8 @@ class Table extends Tools {
     };
   }
 
-  select = (view, activeViewId) => {
-    const { disallowedTools } = view.props;
+  select = activeView => {
+    const { disallowedTools } = activeView.props;
     if (disallowedTools.includes('tables')) return false;
     return true;
   };