From 25bfb82709a57bdfcf1451f5f905768e89bc450a Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Tue, 21 Apr 2020 00:24:22 +0300
Subject: [PATCH] fix rest appearing empty
---
.../src/components/ToolGroupComponent.js | 2 +-
wax-prosemirror-services/src/lib/ToolGroup.js | 4 ++--
wax-prosemirror-services/src/lib/Tools.js | 10 +++++++---
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/wax-prosemirror-components/src/components/ToolGroupComponent.js b/wax-prosemirror-components/src/components/ToolGroupComponent.js
index 26c069f4b..3b53be6d6 100644
--- a/wax-prosemirror-components/src/components/ToolGroupComponent.js
+++ b/wax-prosemirror-components/src/components/ToolGroupComponent.js
@@ -31,7 +31,7 @@ const ToolGroupComponent = ({ view, tools, name, title }) => {
DisplayTitle = isFunction(title) ? title : () => title;
tools.forEach(tool => {
- tool.hideOnToolbar
+ tool.hideOnToolbar && tool.isDisplayed()
? rest.push(tool.renderTool(view))
: toolsShown.push(tool.renderTool(view));
});
diff --git a/wax-prosemirror-services/src/lib/ToolGroup.js b/wax-prosemirror-services/src/lib/ToolGroup.js
index 6cbadb4b0..8ef865de8 100644
--- a/wax-prosemirror-services/src/lib/ToolGroup.js
+++ b/wax-prosemirror-services/src/lib/ToolGroup.js
@@ -20,13 +20,13 @@ export default class ToolGroup {
if (include.includes(tool.constructor.name)) {
tool.displayTool();
} else {
- tool.notDisplayTool();
+ tool.hideTool();
}
});
} else {
this._tools.map(tool => {
if (exclude.includes(tool.constructor.name)) {
- tool.notDisplayTool();
+ tool.hideTool();
}
});
}
diff --git a/wax-prosemirror-services/src/lib/Tools.js b/wax-prosemirror-services/src/lib/Tools.js
index d203e2572..efd25c824 100644
--- a/wax-prosemirror-services/src/lib/Tools.js
+++ b/wax-prosemirror-services/src/lib/Tools.js
@@ -55,11 +55,15 @@ export default class Tools {
) : null;
}
- notDisplayTool() {
+ displayTool() {
+ this._isDisplayed = true;
+ }
+
+ hideTool() {
this._isDisplayed = false;
}
- displayTool() {
- this._isDisplayed = true;
+ isDisplayed() {
+ return this._isDisplayed;
}
}
--
GitLab