Skip to content
Snippets Groups Projects
Commit bb229d0b authored by chris's avatar chris
Browse files

fix ordering

parent 4bedb047
No related branches found
No related tags found
1 merge request!150Various improvments
...@@ -27,12 +27,7 @@ export default ({ area }) => { ...@@ -27,12 +27,7 @@ export default ({ area }) => {
let top = 0; let top = 0;
const allCommentsTop = []; const allCommentsTop = [];
const nodesMarksToIterrate = each(marksNodes[area], (markNode, pos) => {
marksNodes[area] === 'main'
? sortBy(marksNodes[area], ['pos'])
: marksNodes[area];
each(nodesMarksToIterrate, (markNode, pos) => {
const WaxSurface = main.dom.getBoundingClientRect(); const WaxSurface = main.dom.getBoundingClientRect();
const id = const id =
markNode instanceof Mark ? markNode.attrs.id : markNode.node.attrs.id; markNode instanceof Mark ? markNode.attrs.id : markNode.node.attrs.id;
...@@ -186,7 +181,6 @@ const updateMarks = view => { ...@@ -186,7 +181,6 @@ const updateMarks = view => {
const nodesAndMarks = [...uniqBy(finalMarks, 'attrs.id'), ...finalNodes]; const nodesAndMarks = [...uniqBy(finalMarks, 'attrs.id'), ...finalNodes];
const groupedMarkNodes = {}; const groupedMarkNodes = {};
nodesAndMarks.forEach(markNode => { nodesAndMarks.forEach(markNode => {
const markNodeAttrs = markNode.attrs const markNodeAttrs = markNode.attrs
? markNode.attrs ? markNode.attrs
...@@ -198,7 +192,11 @@ const updateMarks = view => { ...@@ -198,7 +192,11 @@ const updateMarks = view => {
groupedMarkNodes[markNodeAttrs.group].push(markNode); groupedMarkNodes[markNodeAttrs.group].push(markNode);
} }
}); });
return groupedMarkNodes;
return {
main: sortBy(groupedMarkNodes.main, ['pos']),
notes: groupedMarkNodes.notes,
};
} }
return []; return [];
}; };
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment