From 7b209b87f9875c83dfe2b33370a8002080721658 Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Sat, 6 Feb 2021 22:20:50 +0200 Subject: [PATCH] new command in progress --- .../CustomTagBlockService.js | 15 +++++---------- .../CustomTagBlockService/CustomTagBlockTool.js | 10 +++++----- .../src/commands/Commands.js | 4 +++- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/wax-prosemirror-services/src/CustomTagService/CustomTagBlockService/CustomTagBlockService.js b/wax-prosemirror-services/src/CustomTagService/CustomTagBlockService/CustomTagBlockService.js index 821b5bb82..a867b59b8 100644 --- a/wax-prosemirror-services/src/CustomTagService/CustomTagBlockService/CustomTagBlockService.js +++ b/wax-prosemirror-services/src/CustomTagService/CustomTagBlockService/CustomTagBlockService.js @@ -1,20 +1,15 @@ +import { customBlockNode } from 'wax-prosemirror-schema'; import CustomTagBlockTool from './CustomTagBlockTool'; import Service from '../../Service'; -import { customBlockNode } from 'wax-prosemirror-schema'; - class CustomTagBlockService extends Service { - register() { this.container.bind('CustomTagBlockTool').to(CustomTagBlockTool); const createNode = this.container.get('CreateNode'); - createNode( - { - customTagBlock: customBlockNode, - } - ); + createNode({ + customTagBlock: customBlockNode, + }); } - } -export default CustomTagBlockService; \ No newline at end of file +export default CustomTagBlockService; diff --git a/wax-prosemirror-services/src/CustomTagService/CustomTagBlockService/CustomTagBlockTool.js b/wax-prosemirror-services/src/CustomTagService/CustomTagBlockService/CustomTagBlockTool.js index e413effa4..4584f38c2 100644 --- a/wax-prosemirror-services/src/CustomTagService/CustomTagBlockService/CustomTagBlockTool.js +++ b/wax-prosemirror-services/src/CustomTagService/CustomTagBlockService/CustomTagBlockTool.js @@ -1,7 +1,5 @@ -import React from 'react'; -// eslint-disable-next-line import/no-named-as-default,import/no-named-as-default-member -import Tools from '../../lib/Tools'; import { Commands } from 'wax-prosemirror-utilities'; +import Tools from '../../lib/Tools'; class CustomTagBlockTool extends Tools { title = 'Custom Tag Block'; @@ -10,14 +8,16 @@ class CustomTagBlockTool extends Tools { get run() { return (state, dispatch, val) => { Commands.setBlockType(state.config.schema.nodes.customTagBlock, { - class: 'custom-tag-block ' + val + class: `custom-tag-block ${val}`, })(state, dispatch); }; } get active() { return state => { - return Commands.blockActive(state.config.schema.nodes.customTagBlock)(state); + return Commands.customTagBlockActive( + state.config.schema.nodes.customTagBlock, + )(state); }; } } diff --git a/wax-prosemirror-utilities/src/commands/Commands.js b/wax-prosemirror-utilities/src/commands/Commands.js index 4aefd0dee..3b5429c08 100644 --- a/wax-prosemirror-utilities/src/commands/Commands.js +++ b/wax-prosemirror-utilities/src/commands/Commands.js @@ -55,7 +55,8 @@ const blockActive = (nodeType, attrs = {}) => { }; }; -// +const customTagBlockActive = (type, attrs = {}) => state => {}; + // const blockActive = (type, attrs = {}) => state => { // const { $from, to, node } = state.selection; // @@ -208,6 +209,7 @@ const createCommentOnFootnote = (state, dispatch, group, viewid) => { export default { setBlockType, blockActive, + customTagBlockActive, canInsert, createComment, createLink, -- GitLab