Merge branch 'standard-comments' into 'master'

Standard comments

See merge request !611

wax-prosemirror-services/src/CommentsService/components/RightArea.js

@@ -177,14 +177,26 @@ export default ({ area, users }) => {
   };
 
   useDeepCompareEffect(() => {
-    setMarksNodes(
-      updateMarks(
-        pmViews,
-        CommentDecorationPluginKey?.getState(
-          activeView.state,
-        )?.allCommentsDataList(),
-      ),
-    );
+    if (app.config.get('config.YjsService')) {
+      setMarksNodes(
+        updateMarks(
+          pmViews,
+          CommentDecorationPluginKey?.getState(
+            activeView.state,
+          )?.allCommentsDataList(),
+        ),
+      );
+    } else {
+      setMarksNodes(
+        updateMarks(
+          pmViews,
+          CommentDecorationPluginKey?.getState(
+            activeView.state,
+          )?.allCommentsList(),
+        ),
+      );
+    }
+
     let firstRunTimeout = () => true;
     if (isFirstRun) {
       firstRunTimeout = setTimeout(() => {

wax-prosemirror-services/src/CommentsService/plugins/CommentPlugin.js

@@ -7,7 +7,6 @@ import { CommentDecorationPluginKey } from './CommentDecorationPlugin';
 const commentPlugin = new PluginKey('commentPlugin');
 
 const getComment = (state, app) => {
-  if (!app.config.get('config.YjsService')) return getCommentNonYjs(state, app);
   const { context } = app;
   const commentsMap = CommentDecorationPluginKey.getState(state).getMap();
   const commentsDataMap = CommentDecorationPluginKey.getState(
@@ -24,6 +23,10 @@ const getComment = (state, app) => {
     }
   });
 
+  if (!app.config.get('config.YjsService')) {
+    return getCommentNonYjs(commentData, state, context);
+  }
+
   commentData = sortBy(commentData, ['data.pmFrom']);
 
   if (commentData.length > 0) {
@@ -44,8 +47,23 @@ const getComment = (state, app) => {
   return undefined;
 };
 
-const getCommentNonYjs = (state, app) => {
-  console.log('non yjs active');
+const getCommentNonYjs = (comments, state, context) => {
+  const commentData = sortBy(comments, ['from']);
+
+  if (commentData.length > 0) {
+    if (
+      (state.selection.from !== state.selection.to &&
+        last(commentData)?.data?.conversation.length === 0) ||
+      (state.selection.from === state.selection.to &&
+        last(commentData)?.data?.conversation.length !== 0)
+    ) {
+      context.setOption({ activeComment: last(commentData) });
+      return last(commentData);
+    }
+    return undefined;
+  }
+
+  return undefined;
 };
 
 export default (key, app) => {