From 83d54d06593ef5cee0dcbeb252a08405e22d4afd Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Wed, 2 Mar 2022 13:32:00 +0200
Subject: [PATCH] fix tool disabled
---
.../src/components/various/FullScreen.js | 2 +-
.../src/CodeBlockService/CodeBlockTool.js | 2 +-
wax-prosemirror-services/src/NoteService/Editor.js | 9 ++-------
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/wax-prosemirror-components/src/components/various/FullScreen.js b/wax-prosemirror-components/src/components/various/FullScreen.js
index 69805d397..2615a2a3b 100644
--- a/wax-prosemirror-components/src/components/various/FullScreen.js
+++ b/wax-prosemirror-components/src/components/various/FullScreen.js
@@ -15,7 +15,7 @@ const Button = ({ view = {}, item }) => {
const handleMouseDown = (e, editorState, editorDispatch) => {
e.preventDefault();
- options.fullScreen = !options.fullScreen;
+ Object.assign(options, { fullScreen: !options.fullScreen });
activeView.dispatch(
activeView.state.tr.setSelection(
TextSelection.between(
diff --git a/wax-prosemirror-services/src/CodeBlockService/CodeBlockTool.js b/wax-prosemirror-services/src/CodeBlockService/CodeBlockTool.js
index b6a816e84..56ab4bd37 100644
--- a/wax-prosemirror-services/src/CodeBlockService/CodeBlockTool.js
+++ b/wax-prosemirror-services/src/CodeBlockService/CodeBlockTool.js
@@ -16,7 +16,7 @@ class CodeBlockTool extends Tools {
select = (state, activeViewId, activeView) => {
const { disallowedTools } = activeView.props;
- if (disallowedTools.includes('codeBlock')) return false;
+ if (disallowedTools.includes('CodeBlock')) return false;
return true;
};
diff --git a/wax-prosemirror-services/src/NoteService/Editor.js b/wax-prosemirror-services/src/NoteService/Editor.js
index 33b19ea17..4a72ecae8 100644
--- a/wax-prosemirror-services/src/NoteService/Editor.js
+++ b/wax-prosemirror-services/src/NoteService/Editor.js
@@ -1,4 +1,3 @@
-/* eslint-disable react/destructuring-assignment */
/* eslint react/prop-types: 0 */
import React, { useEffect, useRef, useContext, useMemo } from 'react';
import styled from 'styled-components';
@@ -45,7 +44,7 @@ export default ({ node, view }) => {
}),
// This is the magic part
dispatchTransaction,
- disallowedTools: ['Tables', 'Images'],
+ disallowedTools: ['Tables', 'Images', 'Lists', 'CodeBlock'],
handleDOMEvents: {
blur: (editorView, event) => {
if (context.view[noteId]) {
@@ -62,9 +61,6 @@ export default ({ node, view }) => {
mousedown: () => {
context.updateView({}, noteId);
clickInNote = true;
- // Kludge to prevent issues due to the fact that the whole
- // footnote is node-selected (and thus DOM-selected) when
- // the parent editor is focused.
// if (noteView.hasFocus()) noteView.focus();
},
},
@@ -147,7 +143,7 @@ export default ({ node, view }) => {
const outerTr = view.state.tr;
const offsetMap = StepMap.offset(noteFound[0].pos + 1);
for (let i = 0; i < transactions.length; i++) {
- let { steps } = transactions[i];
+ const { steps } = transactions[i];
for (let j = 0; j < steps.length; j++)
outerTr.step(steps[j].map(offsetMap));
}
@@ -169,7 +165,6 @@ export default ({ node, view }) => {
return {
'Mod-z': () => undo(view.state, view.dispatch),
'Mod-y': () => redo(view.state, view.dispatch),
- // 'Mod-u': () => Commands.markActive(noteView.state.config.schema.marks.underline)(noteView.state),
};
};
--
GitLab