Merge pull request #4323 from nextcloud/backport/4309/stable27

[stable27] fix: Pass origin along the initial state update
nextcloud · Jun 20, 2023 · fe9c162 · fe9c162
2 parents 12f0f70 + 4208120
commit fe9c162
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 24 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/files-modal.js b/js/files-modal.js
diff --git a/js/files-modal.js.map b/js/files-modal.js.map
diff --git a/js/text-editors.js b/js/text-editors.js
diff --git a/js/text-editors.js.map b/js/text-editors.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/components/Editor.vue b/src/components/Editor.vue
@@ -480,7 +480,7 @@ export default {
 
 		onLoaded({ documentSource, documentState }) {
 			if (documentState) {
-				applyDocumentState(this.$ydoc, documentState)
+				applyDocumentState(this.$ydoc, documentState, this.$providers[0])
 			}
 
 			this.hasConnectionIssue = false

diff --git a/src/helpers/yjs.js b/src/helpers/yjs.js
@@ -36,8 +36,9 @@ export function getDocumentState(ydoc) {
  *
  * @param {Doc} ydoc - apply state to this doc
  * @param {string} documentState - base64 encoded doc state
+ * @param {object} origin - initiator object e.g. WebsocketProvider
  */
-export function applyDocumentState(ydoc, documentState) {
+export function applyDocumentState(ydoc, documentState, origin) {
 	const update = decodeArrayBuffer(documentState)
-	applyUpdate(ydoc, update)
+	applyUpdate(ydoc, update, origin)
 }