From 9304e2925df857ca652f894ac669f17319036fb2 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Sun, 15 Jan 2023 22:35:07 +0200
Subject: [PATCH] yjs comments
---
.../components/ConnectedComment.js | 20 ++++++++++++++-----
.../components/FindAndReplaceTool.js | 3 ++-
.../TablesService/components/CreateTable.js | 4 +++-
3 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/wax-prosemirror-services/src/CommentsService/components/ConnectedComment.js b/wax-prosemirror-services/src/CommentsService/components/ConnectedComment.js
index b805180f6..347e79156 100644
--- a/wax-prosemirror-services/src/CommentsService/components/ConnectedComment.js
+++ b/wax-prosemirror-services/src/CommentsService/components/ConnectedComment.js
@@ -4,6 +4,7 @@ import { TextSelection } from 'prosemirror-state';
import { last, maxBy } from 'lodash';
import styled from 'styled-components';
import { WaxContext, DocumentHelpers } from 'wax-prosemirror-core';
+import { v4 as uuidv4 } from 'uuid';
import CommentBox from './ui/comments/CommentBox';
const ConnectedCommentStyled = styled.div`
@@ -73,15 +74,24 @@ export default ({ comment, top, commentId, recalculateTops }) => {
};
comment.attrs.conversation.push(obj);
-
+ const id = uuidv4();
allCommentsWithSameId.forEach(singleComment => {
- dispatch(
- tr
+ activeView.dispatch(
+ activeView.state.tr.removeMark(
+ singleComment.pos,
+ singleComment.pos + singleComment.node.nodeSize,
+ commentMark,
+ ),
+ );
+ activeView.dispatch(
+ activeView.state.tr
.addMark(
singleComment.pos,
- singleComment.pos + singleComment.nodeSize,
+ singleComment.pos + singleComment.node.nodeSize,
commentMark.create({
- ...((comment && comment.attrs) || {}),
+ id,
+ group: comment.attrs.group,
+ viewid: comment.attrs.viewid,
conversation: comment.attrs.conversation,
}),
)
diff --git a/wax-prosemirror-services/src/FindAndReplaceService/components/FindAndReplaceTool.js b/wax-prosemirror-services/src/FindAndReplaceService/components/FindAndReplaceTool.js
index 194ea9d62..b8a8603c5 100644
--- a/wax-prosemirror-services/src/FindAndReplaceService/components/FindAndReplaceTool.js
+++ b/wax-prosemirror-services/src/FindAndReplaceService/components/FindAndReplaceTool.js
@@ -8,7 +8,7 @@ import React, {
} from 'react';
import styled from 'styled-components';
-import { grid } from '@pubsweet/ui-toolkit';
+import { grid, override } from '@pubsweet/ui-toolkit';
import { WaxContext, MenuButton } from 'wax-prosemirror-core';
import FindAndReplaceComponent from './FindAndReplaceComponent';
@@ -23,6 +23,7 @@ const DropWrapper = styled.div`
margin-top: ${grid(1)};
position: absolute;
top: 32px;
+ ${override('Wax.FindReplaceWrapper')}
`;
const FindAndReplaceTool = ({ item }) => {
diff --git a/wax-prosemirror-services/src/TablesService/components/CreateTable.js b/wax-prosemirror-services/src/TablesService/components/CreateTable.js
index e3fccffe0..5144c6526 100644
--- a/wax-prosemirror-services/src/TablesService/components/CreateTable.js
+++ b/wax-prosemirror-services/src/TablesService/components/CreateTable.js
@@ -6,7 +6,7 @@ import {
MenuButton,
} from 'wax-prosemirror-core';
import styled from 'styled-components';
-import { grid } from '@pubsweet/ui-toolkit';
+import { grid, override } from '@pubsweet/ui-toolkit';
import InsertTableTool from './InsertTableTool';
const Wrapper = styled.div`
@@ -19,6 +19,8 @@ const DropWrapper = styled.div`
background: white;
margin-top: ${grid(1)};
position: absolute;
+
+ ${override('Wax.CreateTableWrapper')}
`;
const CreateTable = ({ item }) => {
--
GitLab