fix: Pass origin along the initial state update

juliusknorr · backportbot-nextcloud[bot] · commit 22fd61c2349f · 2023-06-20T07:17:40.000Z
Signed-off-by: Julius Härtl &lt;jus@bitgrid.net&gt;
diff --git a/src/components/Editor.vue b/src/components/Editor.vue
@@ -464,7 +464,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)
 }

Original file line number	Diff line number	Diff line change
`@@ -464,7 +464,7 @@ export default {`
`464`	`464`
`465`	`465`	`onLoaded({ documentSource, documentState }) {`
`466`	`466`	`if (documentState) {`
`467`		`- applyDocumentState(this.$ydoc, documentState)`
	`467`	`+ applyDocumentState(this.$ydoc, documentState, this.$providers[0])`
`468`	`468`	`}`
`469`	`469`
`470`	`470`	`this.hasConnectionIssue = false`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,9 @@ export function getDocumentState(ydoc) {`
`36`	`36`	`*`
`37`	`37`	`* @param {Doc} ydoc - apply state to this doc`
`38`	`38`	`* @param {string} documentState - base64 encoded doc state`
	`39`	`+ * @param {object} origin - initiator object e.g. WebsocketProvider`
`39`	`40`	`*/`
`40`		`-export function applyDocumentState(ydoc, documentState) {`
	`41`	`+export function applyDocumentState(ydoc, documentState, origin) {`
`41`	`42`	`const update = decodeArrayBuffer(documentState)`
`42`		`- applyUpdate(ydoc, update)`
	`43`	`+ applyUpdate(ydoc, update, origin)`
`43`	`44`	`}`