From 2bc93ebbdc3922b6e4a45042b0cc92bbcacb4f62 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Thu, 23 Jul 2020 18:31:54 +0300
Subject: [PATCH] add TODO's
---
.../src/components/comments/Comment.js | 4 ++--
wax-prosemirror-utilities/src/document/DocumentHelpers.js | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/wax-prosemirror-components/src/components/comments/Comment.js b/wax-prosemirror-components/src/components/comments/Comment.js
index bffc51e23..fd1c59c3a 100644
--- a/wax-prosemirror-components/src/components/comments/Comment.js
+++ b/wax-prosemirror-components/src/components/comments/Comment.js
@@ -67,7 +67,7 @@ export default ({ comment, activeView, user }) => {
// saveComment();
}
- // TODO Also find fragmented marks
+ // TODO pass correct comment pos for notes
if (conversation.length === 0 && value === '') {
const commentPosition = DocumentHelpers.findMarkPosition(activeView, comment.pos, 'comment');
dispatch(state.tr.removeMark(commentPosition.from, commentPosition.to, commentMark));
@@ -75,7 +75,7 @@ export default ({ comment, activeView, user }) => {
};
const resolveComment = () => {
- // TODO Also find fragmented marks
+ // TODO pass correct comment pos for notes
const commentPosition = DocumentHelpers.findMarkPoistion(activeView, comment.pos, 'comment');
dispatch(state.tr.removeMark(commentPosition.from, commentPosition.to, commentMark));
};
diff --git a/wax-prosemirror-utilities/src/document/DocumentHelpers.js b/wax-prosemirror-utilities/src/document/DocumentHelpers.js
index e6ad8a8d6..3f1e2d59d 100644
--- a/wax-prosemirror-utilities/src/document/DocumentHelpers.js
+++ b/wax-prosemirror-utilities/src/document/DocumentHelpers.js
@@ -96,10 +96,11 @@ const findAllCommentsWithSameId = state => {
return allCommentsWithSameId;
};
+// TODO Also find fragmented marks
const findMarkPosition = (activeView, initialPos, markType) => {
- let $pos = activeView.state.tr.doc.resolve(initialPos);
- let parent = $pos.parent;
- let start = parent.childAfter($pos.parentOffset);
+ const $pos = activeView.state.tr.doc.resolve(initialPos);
+ const { parent } = $pos;
+ const start = parent.childAfter($pos.parentOffset);
if (!start.node) return null;
const actualMark = start.node.marks.find(mark => mark.type.name === markType);
let startIndex = $pos.index();
--
GitLab