From bb229d0b2cefe93d786494776aa30c8a3cd7461f Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Tue, 1 Sep 2020 13:56:50 +0300
Subject: [PATCH] fix ordering
---
.../src/components/rightArea/RightArea.js | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/wax-prosemirror-components/src/components/rightArea/RightArea.js b/wax-prosemirror-components/src/components/rightArea/RightArea.js
index b66fa208e..980806afb 100644
--- a/wax-prosemirror-components/src/components/rightArea/RightArea.js
+++ b/wax-prosemirror-components/src/components/rightArea/RightArea.js
@@ -27,12 +27,7 @@ export default ({ area }) => {
let top = 0;
const allCommentsTop = [];
- const nodesMarksToIterrate =
- marksNodes[area] === 'main'
- ? sortBy(marksNodes[area], ['pos'])
- : marksNodes[area];
-
- each(nodesMarksToIterrate, (markNode, pos) => {
+ each(marksNodes[area], (markNode, pos) => {
const WaxSurface = main.dom.getBoundingClientRect();
const id =
markNode instanceof Mark ? markNode.attrs.id : markNode.node.attrs.id;
@@ -186,7 +181,6 @@ const updateMarks = view => {
const nodesAndMarks = [...uniqBy(finalMarks, 'attrs.id'), ...finalNodes];
const groupedMarkNodes = {};
-
nodesAndMarks.forEach(markNode => {
const markNodeAttrs = markNode.attrs
? markNode.attrs
@@ -198,7 +192,11 @@ const updateMarks = view => {
groupedMarkNodes[markNodeAttrs.group].push(markNode);
}
});
- return groupedMarkNodes;
+
+ return {
+ main: sortBy(groupedMarkNodes.main, ['pos']),
+ notes: groupedMarkNodes.notes,
+ };
}
return [];
};
--
GitLab