Merge pull request #3395 from nextcloud/backport/3350/stable25

[stable25] Don't apply author annotations when in composition
nextcloud · Nov 9, 2022 · 7f50399 · 7f50399
2 parents 51c1a50 + da52850
commit 7f50399
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 17 deletions.
diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/src/extensions/UserColor.js b/src/extensions/UserColor.js
@@ -43,11 +43,16 @@ const UserColor = Extension.create({
 	},
 
 	addProseMirrorPlugins() {
+		let viewReference = null
 		return [
 			new Plugin({
 				clientID: this.options.clientID,
 				color: this.options.color,
 				name: this.options.name,
+				view: (editorView) => {
+					viewReference = editorView
+					return {}
+				},
 				state: {
 					init(_, instance) {
 						return {
@@ -63,8 +68,11 @@ const UserColor = Extension.create({
 								// we have an undefined client id for own transactions
 								tr.setMeta('clientID', tr.steps.map(i => this.spec.clientID))
 							}
-							tracked = tracked.applyTransform(tr)
-							tState = tracked
+							// Don't apply transaction when in composition (Github issue #2871)
+							if (!viewReference.composing) {
+								tracked = tracked.applyTransform(tr)
+								tState = tracked
+							}
 						}
 						decos = tState.blameMap
 							.map(span => {