diff --git a/wax-prosemirror-components/src/components/Button.js b/wax-prosemirror-components/src/components/Button.js
index 7f6ec04c5010ab201202c7ec203764fcd8c66753..ed968a69aa5dcd5c0f61011fd9ddeb0cc4a5a4b6 100644
--- a/wax-prosemirror-components/src/components/Button.js
+++ b/wax-prosemirror-components/src/components/Button.js
@@ -19,10 +19,10 @@ const Button = ({ view = {}, item }) => {
run(state, dispatch);
};
- const isActive = active && active(state);
+ const isActive = active && active(state, activeViewId);
const isDisabled =
- enable && !enable(state) && !(select && select(view.state, activeViewId));
+ enable && !enable(state) && !(select && select(state, activeViewId));
return (
<MenuButton
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/Author.js b/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/Author.js
index 18e843d46f5f74019bff19790d3d8f74fa15a016..d622e7606f2dffdb1b337d9428694278f094be1e 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/Author.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/Author.js
@@ -16,6 +16,12 @@ class Author extends Tools {
};
}
+ get active() {
+ return (state, activeViewId) => {
+ return Commands.blockActive(state.config.schema.nodes.author)(state);
+ };
+ }
+
select = (state, activeViewId) => {
if (activeViewId !== 'main') return false;
return true;
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetry.js b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetry.js
index ef7b404fbf01d239cd441a7fde12a5e280afe9e3..fb321b08f5067ab90159316eb7fc6741afe79432 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetry.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetry.js
@@ -16,6 +16,14 @@ class EpigraphPoetry extends Tools {
};
}
+ get active() {
+ return (state, activeViewId) => {
+ return Commands.blockActive(state.config.schema.nodes.epigraphPoetry)(
+ state,
+ );
+ };
+ }
+
select = (state, activeViewId) => {
if (activeViewId !== 'main') return false;
return true;
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProse.js b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProse.js
index eebf0a30c24e5a2e21c6e50393ab6d12e8b13658..257d3a92237fb88fd13bcc647236d2dbe7836766 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProse.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProse.js
@@ -17,6 +17,14 @@ class EpigraphProse extends Tools {
};
}
+ get active() {
+ return (state, activeViewId) => {
+ return Commands.blockActive(state.config.schema.nodes.epigraphProse)(
+ state,
+ );
+ };
+ }
+
select = (state, activeViewId) => {
if (activeViewId !== 'main') return false;
return true;
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading1.js b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading1.js
index cb21632813e39978dd90e2d226270d5e990b1d6d..87c28214f24092f5972751321fec6d8624db95ef 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading1.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading1.js
@@ -18,6 +18,14 @@ class Heading1 extends Tools {
};
}
+ get active() {
+ return (state, activeViewId) => {
+ return Commands.blockActive(state.config.schema.nodes.heading, {
+ level: 1,
+ })(state);
+ };
+ }
+
select = (state, activeViewId) => {
if (activeViewId !== 'main') return false;
return true;
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading2.js b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading2.js
index 23bf3763961e6eab6e21d0327cfc7f81d6046272..fca907f60faac1607f65fddb2eb02a31e65c4512 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading2.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading2.js
@@ -18,6 +18,14 @@ class Heading2 extends Tools {
};
}
+ get active() {
+ return (state, activeViewId) => {
+ return Commands.blockActive(state.config.schema.nodes.heading, {
+ level: 2,
+ })(state);
+ };
+ }
+
select = (state, activeViewId) => {
if (activeViewId !== 'main') return false;
return true;
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading3.js b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading3.js
index 01e16ca8e771fd2cf3cadfee41916a037add87ec..682b0fc807b10d7fac96d04282b2501b66b62702 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading3.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading3.js
@@ -18,6 +18,14 @@ class Heading3 extends Tools {
};
}
+ get active() {
+ return (state, activeViewId) => {
+ return Commands.blockActive(state.config.schema.nodes.heading, {
+ level: 3,
+ })(state);
+ };
+ }
+
select = (state, activeViewId) => {
if (activeViewId !== 'main') return false;
return true;
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitle.js b/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitle.js
index cb14ab9fe6532e60d31d19693dc7304672adc44b..a4fb4795bf4462059be2cb418543bbe282b6486e 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitle.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitle.js
@@ -17,6 +17,12 @@ class SubTitle extends Tools {
};
}
+ get active() {
+ return (state, activeViewId) => {
+ return Commands.blockActive(state.config.schema.nodes.subtitle)(state);
+ };
+ }
+
select = (state, activeViewId) => {
if (activeViewId !== 'main') return false;
return true;
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/Title.js b/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/Title.js
index 443be005b94823baa770aca815c96d4e58332f18..0de73d091dbe64302b3c8e7c0bec361e3f78d5b7 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/Title.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/Title.js
@@ -2,7 +2,7 @@ import Tools from '../../lib/Tools';
import { injectable } from 'inversify';
import { Commands } from 'wax-prosemirror-utilities';
-export default
+export default
@injectable()
class Title extends Tools {
title = 'Change to Title';
@@ -17,6 +17,12 @@ class Title extends Tools {
};
}
+ get active() {
+ return (state, activeViewId) => {
+ return Commands.blockActive(state.config.schema.nodes.title)(state);
+ };
+ }
+
select = (state, activeViewId) => {
if (activeViewId !== 'main') return false;
return true;
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetry.js b/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetry.js
index 46e9adf51cfc6399bf078233c4ea102a25cdc527..be5fe190666ea5cd2d522dc2d97cc21bc254bca1 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetry.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetry.js
@@ -21,6 +21,14 @@ class ExtractPoetry extends Tools {
return true;
};
+ get active() {
+ return (state, activeViewId) => {
+ return Commands.blockActive(state.config.schema.nodes.extractPoetry)(
+ state,
+ );
+ };
+ }
+
get enable() {
return state => {
return Commands.setBlockType(state.config.schema.nodes.extractPoetry)(
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProse.js b/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProse.js
index 8573250630e87481cdc253d3a0991c4a5087f299..7da57142cae3584c8520556d16cdc43e1c6274c6 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProse.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProse.js
@@ -16,6 +16,14 @@ class ExtractProse extends Tools {
};
}
+ get active() {
+ return (state, activeViewId) => {
+ return Commands.blockActive(state.config.schema.nodes.extractProse)(
+ state,
+ );
+ };
+ }
+
select = (state, activeViewId) => {
if (activeViewId !== 'main') return false;
return true;
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinued.js b/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinued.js
index 203509e551cf5c8467554ae199ff3a76101162ac..a7437e99ad6e8cdf218db5652490a7a56454ca61 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinued.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinued.js
@@ -16,6 +16,14 @@ class ParagraphContinued extends Tools {
};
}
+ get active() {
+ return (state, activeViewId) => {
+ return Commands.blockActive(state.config.schema.nodes.paragraphCont)(
+ state,
+ );
+ };
+ }
+
select = (state, activeViewId) => {
if (activeViewId !== 'main') return false;
return true;
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/Paragraph.js b/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/Paragraph.js
index 1554be67dd2d501a2a22a2b4a232dcbb3ab90086..1b1c6dee6ac186127058d1cb66b55a61a7642fbd 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/Paragraph.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/Paragraph.js
@@ -17,6 +17,12 @@ class Paragraph extends Tools {
};
}
+ get active() {
+ return (state, activeViewId) => {
+ return Commands.blockActive(state.config.schema.nodes.paragraph)(state);
+ };
+ }
+
select = (state, activeViewId) => {
if (activeViewId !== 'main') return false;
return true;
diff --git a/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNote.js b/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNote.js
index 99e94d5e3c695c3fd50fa2da69b7a3ca360c0f28..9598082252fce76510681edce310608b0f36d9d8 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNote.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNote.js
@@ -16,6 +16,12 @@ class SourceNote extends Tools {
};
}
+ get active() {
+ return (state, activeViewId) => {
+ return Commands.blockActive(state.config.schema.nodes.sourceNote)(state);
+ };
+ }
+
select = (state, activeViewId) => {
if (activeViewId !== 'main') return false;
return true;
diff --git a/wax-prosemirror-utilities/src/commands/Commands.js b/wax-prosemirror-utilities/src/commands/Commands.js
index b4cc52255654bea57bf04a7166e661c5c60adea8..d5193ac54f3295ef2a41de4a1049d233cf99b90c 100644
--- a/wax-prosemirror-utilities/src/commands/Commands.js
+++ b/wax-prosemirror-utilities/src/commands/Commands.js
@@ -38,16 +38,31 @@ const markActive = type => state => {
: state.doc.rangeHasMark(from, to, type);
};
-const blockActive = (type, attrs = {}) => state => {
- const { $from, to, node } = state.selection;
-
- if (node) {
- return node.hasMarkup(type, attrs);
- }
-
- return to <= $from.end() && $from.parent.hasMarkup(type, attrs);
+const blockActive = (nodeType, attrs = {}) => {
+ return (state, dispatch) => {
+ const { from, to } = state.selection;
+ let isActive = false;
+ state.doc.nodesBetween(from, to, (node, pos) => {
+ if (!node.isTextblock || node.hasMarkup(nodeType, attrs)) return;
+ if (node.type === nodeType) {
+ isActive = true;
+ }
+ });
+ return isActive;
+ };
};
+//
+// const blockActive = (type, attrs = {}) => state => {
+// const { $from, to, node } = state.selection;
+//
+// if (node) {
+// return node.hasMarkup(type, attrs);
+// }
+//
+// return to <= $from.end() && $from.parent.hasMarkup(type, attrs);
+// };
+
const canInsert = type => state => {
const { $from } = state.selection;