Merge branch 'publish-new-comments' into 'master'

Publish new comments

See merge request !552

editors/demo/package.json

 {
   "name": "demo",
-  "version": "0.9.14",
+  "version": "0.9.15",
   "private": true,
   "dependencies": {
     "@guardian/prosemirror-invisibles": "^1.2.0",
@@ -15,10 +15,10 @@
     "typeface-fira-sans-condensed": "^0.0.54",
     "typeface-inter": "^1.1.13",
     "typeface-vollkorn": "^0.0.54",
-    "wax-prosemirror-core": "^0.9.14",
-    "wax-prosemirror-services": "^0.9.14",
-    "wax-questions-service": "^0.9.14",
-    "wax-table-service": "^0.9.14"
+    "wax-prosemirror-core": "^0.9.15",
+    "wax-prosemirror-services": "^0.9.15",
+    "wax-questions-service": "^0.9.15",
+    "wax-table-service": "^0.9.15"
   },
   "scripts": {
     "start": "react-app-rewired start",

editors/demo/src/Editoria/Editoria.js

@@ -55,7 +55,7 @@ const Editoria = () => {
           autoFocus
           placeholder="Type Something..."
           fileUpload={file => renderImage(file)}
-          value={demo}
+          // value={demo}
           // readonly
           layout={layout}
           // onChange={debounce(source => {

editors/demo/src/Editoria/config/config.js

@@ -225,7 +225,7 @@ export default {
         'HighlightToolGroup',
         'TransformToolGroup',
         'CustomTagInline',
-        'Notes',
+        // 'Notes',
         'Lists',
         'Images',
         'SpecialCharacters',
@@ -303,12 +303,12 @@ export default {
     ],
     updateTags: saveTags,
   },
-  // YjsService: {
-  //   // eslint-disable-next-line no-restricted-globals
-  //   connectionUrl: 'ws://localhost:4000',
-  //   docIdentifier: 'prosemirror-demo',
-  //   YjsType: 'prosemirror',
-  // },
+  YjsService: {
+    // eslint-disable-next-line no-restricted-globals
+    connectionUrl: 'ws://localhost:4000',
+    docIdentifier: 'prosemirror-demo',
+    YjsType: 'prosemirror',
+  },
 
   AskAiContentService: {
     AskAiContentTransformation: DummyPromise,
@@ -316,7 +316,7 @@ export default {
   },
 
   services: [
-    // new YjsService(),
+    new YjsService(),
     new BlockDropDownToolGroupService(),
     new AskAiContentService(),
     new CustomTagService(),
@@ -330,7 +330,7 @@ export default {
     new ImageService(),
     new TablesService(),
     new BaseService(),
-    new NoteService(),
+    // new NoteService(),
     new CodeBlockService(),
     new EditingSuggestingService(),
     new DisplayTextToolGroupService(),

lerna.json

 {
   "lerna": "2.6.0",
   "npmClient": "yarn",
-  "version": "0.9.14",
+  "version": "0.9.15",
   "useWorkspaces": true
 }

wax-prosemirror-core/package.json

 {
   "name": "wax-prosemirror-core",
   "author": "Christos Kokosias & Giannis Kopanas",
-  "version": "0.9.14",
+  "version": "0.9.15",
   "description": "Wax prosemirror core",
   "license": "MIT",
   "main": "dist/index.js",

wax-prosemirror-services/package.json

 {
   "name": "wax-prosemirror-services",
   "author": "Christos Kokosias & Giannis Kopanas",
-  "version": "0.9.14",
+  "version": "0.9.15",
   "description": "Wax prosemirror services",
   "license": "MIT",
   "main": "dist/index.js",
@@ -36,7 +36,7 @@
     "react-i18next": "^13.3.1",
     "use-deep-compare-effect": "^1.3.1",
     "uuid": "^7.0.3",
-    "wax-prosemirror-core": "^0.9.14",
+    "wax-prosemirror-core": "^0.9.15",
     "y-prosemirror": "1.2.0",
     "y-protocols": "1.0.5",
     "y-webrtc": "10.2.0",

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

@@ -19,6 +19,9 @@ export const CommentDecorationPlugin = (name, options) => {
         });
       },
       apply(transaction, pluginState, oldState, newState) {
+        console.log(transaction);
+        const yjsSync = transaction.getMeta('y-sync$');
+        if (yjsSync) console.log('hodododo');
         return pluginState.apply(transaction, newState);
       },
     },
@@ -36,9 +39,10 @@ export const CommentDecorationPlugin = (name, options) => {
           // options.onSelectionChange(annotations);
 
           options.onSelectionChange(this.getState(state).allCommentsList());
+          this.getState(state).createDecorations(state);
         }
-        contentSize = state.doc.content.size;
-        allCommentsCount = this.getState(state).allCommentsList().length;
+        // contentSize = state.doc.content.size;
+        // allCommentsCount = this.getState(state).allCommentsList().length;
         return decorations;
       },
     },

wax-questions-service/package.json

 {
   "name": "wax-questions-service",
   "author": "Christos Kokosias & Giannis Kopanas",
-  "version": "0.9.14",
+  "version": "0.9.15",
   "description": "Wax Questions Service",
   "license": "MIT",
   "main": "dist/index.js",
@@ -32,7 +32,7 @@
     "react-i18next": "^13.3.1",
     "use-dynamic-refs": "^1.0.0",
     "uuid": "^7.0.3",
-    "wax-prosemirror-core": "^0.9.14"
+    "wax-prosemirror-core": "^0.9.15"
   },
   "devDependencies": {
     "mocha": "^3.4.2",

wax-table-service/package.json

 {
   "name": "wax-table-service",
   "author": "Christos Kokosias & Giannis Kopanas",
-  "version": "0.9.14",
+  "version": "0.9.15",
   "description": "Wax Table Service",
   "license": "MIT",
   "main": "dist/index.js",
@@ -23,7 +23,7 @@
     "prosemirror-view": "1.30.2",
     "react-i18next": "^13.3.1",
     "uuid": "^7.0.3",
-    "wax-prosemirror-core": "^0.9.14"
+    "wax-prosemirror-core": "^0.9.15"
   },
   "devDependencies": {
     "mocha": "^3.4.2",