From ca5edd79bb80f41f825102552b1ee9f9ef7b9f5e Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Fri, 6 Aug 2021 11:15:03 +0300
Subject: [PATCH] images in progress
---
.../src/components/images/ImageUpload.js | 4 ++--
.../src/components/tables/CreateTable.js | 5 +----
wax-prosemirror-services/src/ImageService/Image.js | 5 +++--
wax-prosemirror-services/src/NoteService/Editor.js | 2 +-
.../src/TablesService/InsertTableService/Table.js | 4 ++--
5 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/wax-prosemirror-components/src/components/images/ImageUpload.js b/wax-prosemirror-components/src/components/images/ImageUpload.js
index 300b60b92..8d66bdda0 100644
--- a/wax-prosemirror-components/src/components/images/ImageUpload.js
+++ b/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;
diff --git a/wax-prosemirror-components/src/components/tables/CreateTable.js b/wax-prosemirror-components/src/components/tables/CreateTable.js
index 78b1453da..2ddcc4ecc 100644
--- a/wax-prosemirror-components/src/components/tables/CreateTable.js
+++ b/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;
diff --git a/wax-prosemirror-services/src/ImageService/Image.js b/wax-prosemirror-services/src/ImageService/Image.js
index 382f08e69..a5e792d5d 100644
--- a/wax-prosemirror-services/src/ImageService/Image.js
+++ b/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;
};
diff --git a/wax-prosemirror-services/src/NoteService/Editor.js b/wax-prosemirror-services/src/NoteService/Editor.js
index 21b868fcf..42a65453d 100644
--- a/wax-prosemirror-services/src/NoteService/Editor.js
+++ b/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]) {
diff --git a/wax-prosemirror-services/src/TablesService/InsertTableService/Table.js b/wax-prosemirror-services/src/TablesService/InsertTableService/Table.js
index b3e6bf75b..2ac2d69ab 100644
--- a/wax-prosemirror-services/src/TablesService/InsertTableService/Table.js
+++ b/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;
};
--
GitLab