diff --git a/editors/demo/package.json b/editors/demo/package.json
index 39a6046789f9384d74f16fb60979d3673a184e80..bdf4f221b2056cf26fca727d4bb9666db8bdd6aa 100644
--- a/editors/demo/package.json
+++ b/editors/demo/package.json
@@ -1,6 +1,6 @@
{
"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",
diff --git a/editors/demo/src/Editoria/Editoria.js b/editors/demo/src/Editoria/Editoria.js
index 8837b278e3d8c3e0e7c6f5a3ea237f63a71cfb22..3e85568eaea88403be4213b9ad9291685b3f3d73 100644
--- a/editors/demo/src/Editoria/Editoria.js
+++ b/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 => {
diff --git a/editors/demo/src/Editoria/config/config.js b/editors/demo/src/Editoria/config/config.js
index 8d4dc6ce512de938b9882159f8797eaf26e747a2..4bb09f3377b327c1b1c50df1515c9773cf147e7a 100644
--- a/editors/demo/src/Editoria/config/config.js
+++ b/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(),
diff --git a/lerna.json b/lerna.json
index 4e92be738095fec93544bda1814d9ab501680ce5..dc856c8bfedd71a15310428cad8a1097b931e563 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
{
"lerna": "2.6.0",
"npmClient": "yarn",
- "version": "0.9.14",
+ "version": "0.9.15",
"useWorkspaces": true
}
diff --git a/wax-prosemirror-core/package.json b/wax-prosemirror-core/package.json
index a74c4570afb766c060dff7681bf7539e40f9261e..192d942ca5ca4bab16cf03c0aaf133bb92c0eecd 100644
--- a/wax-prosemirror-core/package.json
+++ b/wax-prosemirror-core/package.json
@@ -1,7 +1,7 @@
{
"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",
diff --git a/wax-prosemirror-services/package.json b/wax-prosemirror-services/package.json
index fe4ac9d785852b5c58cf220dd8f0643883d7245f..58111e50d7190f6808566ae411bc8e340eaf5a29 100644
--- a/wax-prosemirror-services/package.json
+++ b/wax-prosemirror-services/package.json
@@ -1,7 +1,7 @@
{
"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",
diff --git a/wax-prosemirror-services/src/CommentsService/plugins/CommentDecorationPlugin.js b/wax-prosemirror-services/src/CommentsService/plugins/CommentDecorationPlugin.js
index 96cc05e1519cd5257135d31ef472db504e22919e..dd895567b4a32b4f99d03ba5ae8a905a0885ceb6 100644
--- a/wax-prosemirror-services/src/CommentsService/plugins/CommentDecorationPlugin.js
+++ b/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;
},
},
diff --git a/wax-questions-service/package.json b/wax-questions-service/package.json
index 02089573d2254c695b4962dac03b989a7705c708..a1f1c73e756b02ad018902c5b7716f8ca65c2d26 100644
--- a/wax-questions-service/package.json
+++ b/wax-questions-service/package.json
@@ -1,7 +1,7 @@
{
"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",
diff --git a/wax-table-service/package.json b/wax-table-service/package.json
index f507bb8cf041305b4639390abab13d8f984bd0a6..6cb8c803709b058dcacc5060bcc9490b3a33f51b 100644
--- a/wax-table-service/package.json
+++ b/wax-table-service/package.json
@@ -1,7 +1,7 @@
{
"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",