From 84168100440d0ca4338d990f52f1f7e937b206cf Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Sat, 8 Aug 2020 19:38:16 +0300
Subject: [PATCH] note deletion
---
.../components/notes/NoteEditorContainer.js | 11 ++++++---
.../src/layouts/EditorElements.js | 3 +++
.../src/nodes/footNoteNode.js | 2 +-
wax-prosemirror-schema/src/nodes/imageNode.js | 24 +++++++++----------
4 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js b/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js
index 9aee856a0..3d06af263 100644
--- a/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js
+++ b/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js
@@ -1,7 +1,7 @@
-import React from "react";
-import styled from "styled-components";
+import React from 'react';
+import styled from 'styled-components';
-import NoteNumber from "./NoteNumber";
+import NoteNumber from './NoteNumber';
const NoteEditorContainerStyled = styled.div`
display: flex;
@@ -23,6 +23,11 @@ const NoteStyled = styled.div`
&:focus {
outline: none;
}
+
+ p {
+ margin: 0;
+ }
+
span.comment {
border-bottom: 2px solid #ffab20;
border-radius: 3px 3px 0 0;
diff --git a/wax-prosemirror-layouts/src/layouts/EditorElements.js b/wax-prosemirror-layouts/src/layouts/EditorElements.js
index bff58dbea..32cce8b5d 100644
--- a/wax-prosemirror-layouts/src/layouts/EditorElements.js
+++ b/wax-prosemirror-layouts/src/layouts/EditorElements.js
@@ -170,6 +170,9 @@ export default css`
span.deletion {
text-decoration: line-through;
color: red;
+ footnote {
+ background: red;
+ }
}
span.insertion {
diff --git a/wax-prosemirror-schema/src/nodes/footNoteNode.js b/wax-prosemirror-schema/src/nodes/footNoteNode.js
index 4b98de07b..f1a97afd2 100644
--- a/wax-prosemirror-schema/src/nodes/footNoteNode.js
+++ b/wax-prosemirror-schema/src/nodes/footNoteNode.js
@@ -1,7 +1,7 @@
// TODO Write the node in WaxSchema
const footnote = {
group: 'inline',
- content: 'inline*',
+ content: 'block*',
inline: true,
atom: true,
attrs: {
diff --git a/wax-prosemirror-schema/src/nodes/imageNode.js b/wax-prosemirror-schema/src/nodes/imageNode.js
index 9ac1badd3..9f5d51daa 100644
--- a/wax-prosemirror-schema/src/nodes/imageNode.js
+++ b/wax-prosemirror-schema/src/nodes/imageNode.js
@@ -4,34 +4,34 @@ const image = {
src: {},
alt: { default: null },
title: { default: null },
- track: { default: [] }
+ track: { default: [] },
},
- group: "inline",
+ group: 'inline',
draggable: true,
parseDOM: [
{
- tag: "img[src]",
+ tag: 'img[src]',
getAttrs(hook, next) {
Object.assign(hook, {
- src: hook.dom.getAttribute("src"),
- title: hook.dom.getAttribute("title"),
+ src: hook.dom.getAttribute('src'),
+ title: hook.dom.getAttribute('title'),
// track: parseTracks(hook.dom.dataset.track),
- alt: hook.dom.getAttribute("alt")
+ alt: hook.dom.getAttribute('alt'),
});
next();
- }
- }
+ },
+ },
],
toDOM(hook, next) {
const attrs = {};
- let temp = "";
+ let temp = '';
// if (hook.node.attrs.track.length) {
// // attrs["data-track"] = JSON.stringify(hook.node.attrs.track);
// }
- let { src, alt, title } = hook.node.attrs;
- hook.value = ["img", { src, alt, title }];
+ const { src, alt, title } = hook.node.attrs;
+ hook.value = ['img', { src, alt, title }];
next();
- }
+ },
};
export default image;
--
GitLab