@liveblocks/yjs 1.1.0-yjs3 → 1.1.0-yjs5

package/dist/index.d.ts

@@ -32,6 +32,7 @@ declare class LiveblocksProvider<P extends JsonObject, S extends LsonObject, U e
     private unsubscribers;
     awareness: Awareness;
     constructor(room: Room<P, S, U, E>, doc: Y.Doc, config?: LiveblocksYjsOptions);
+    private syncDoc;
     private updateHandler;
     private resyncHttp;
     destroy(): void;

package/dist/index.js

@@ -158,11 +158,19 @@ var Awareness = class extends Observable {
     return presence["__yjs"];
   }
   setLocalState(state) {
-    this.room.updatePresence({ __yjs: __spreadValues({}, state || {}) });
+    var _a;
+    const presence = (_a = this.room.getSelf()) == null ? void 0 : _a.presence["__yjs"];
+    this.room.updatePresence({
+      __yjs: __spreadValues(__spreadValues({}, presence || {}), state || {})
+    });
   }
   setLocalStateField(field, value) {
+    var _a;
+    const presence = (_a = this.room.getSelf()) == null ? void 0 : _a.presence["__yjs"];
     const update = { [field]: value };
-    this.room.updatePresence({ __yjs: update });
+    this.room.updatePresence({
+      __yjs: __spreadValues(__spreadValues({}, presence || {}), update)
+    });
   }
   // Translate liveblocks presence to yjs awareness
   getStates() {
@@ -183,10 +191,17 @@ var LiveblocksProvider = class {
   constructor(room, doc, config) {
     this.lastUpdateDate = null;
     this.unsubscribers = [];
+    this.syncDoc = () => {
+      var _a;
+      this.doc.clientID = ((_a = this.room.getSelf()) == null ? void 0 : _a.connectionId) || this.doc.clientID;
+      this.awareness.clientID = this.doc.clientID;
+      const encodedVector = _jsbase64.Base64.fromUint8Array(Y.encodeStateVector(this.doc));
+      this.room.getYDoc(encodedVector);
+    };
     this.updateHandler = (update, origin) => __async(this, null, function* () {
       if (origin !== "backend") {
         const encodedUpdate = _jsbase64.Base64.fromUint8Array(update);
-        this.room.updateDoc(encodedUpdate);
+        this.room.updateYDoc(encodedUpdate);
         if (this.httpEndpoint) {
           yield fetch(this.httpEndpoint, {
             method: "POST",
@@ -206,22 +221,14 @@ var LiveblocksProvider = class {
     this.doc.on("update", this.updateHandler);
     this.unsubscribers.push(
       this.room.events.connection.subscribe((e) => {
-        var _a2;
         if (e === "open") {
-          this.doc.clientID = ((_a2 = this.room.getSelf()) == null ? void 0 : _a2.connectionId) || this.doc.clientID;
-          this.awareness.clientID = this.doc.clientID;
-          const encodedVector = _jsbase64.Base64.fromUint8Array(
-            Y.encodeStateVector(this.doc)
-          );
-          this.room.getDoc(encodedVector);
+          this.syncDoc();
         }
       })
     );
     this.unsubscribers.push(
-      this.room.events.docUpdated.subscribe((updates) => {
-        const decodedUpdates = updates.map(_jsbase64.Base64.toUint8Array);
-        const update = Y.mergeUpdates(decodedUpdates);
-        Y.applyUpdate(this.doc, update, "backend");
+      this.room.events.docUpdated.subscribe((update) => {
+        Y.applyUpdate(this.doc, _jsbase64.Base64.toUint8Array(update), "backend");
       })
     );
     if (config == null ? void 0 : config.httpEndpoint) {
@@ -235,7 +242,7 @@ var LiveblocksProvider = class {
       );
       void this.resyncHttp();
     }
-    this.room.getDoc();
+    this.syncDoc();
   }
   resyncHttp() {
     return __async(this, null, function* () {

package/dist/index.mjs

@@ -158,11 +158,19 @@ var Awareness = class extends Observable {
     return presence["__yjs"];
   }
   setLocalState(state) {
-    this.room.updatePresence({ __yjs: __spreadValues({}, state || {}) });
+    var _a;
+    const presence = (_a = this.room.getSelf()) == null ? void 0 : _a.presence["__yjs"];
+    this.room.updatePresence({
+      __yjs: __spreadValues(__spreadValues({}, presence || {}), state || {})
+    });
   }
   setLocalStateField(field, value) {
+    var _a;
+    const presence = (_a = this.room.getSelf()) == null ? void 0 : _a.presence["__yjs"];
     const update = { [field]: value };
-    this.room.updatePresence({ __yjs: update });
+    this.room.updatePresence({
+      __yjs: __spreadValues(__spreadValues({}, presence || {}), update)
+    });
   }
   // Translate liveblocks presence to yjs awareness
   getStates() {
@@ -183,10 +191,17 @@ var LiveblocksProvider = class {
   constructor(room, doc, config) {
     this.lastUpdateDate = null;
     this.unsubscribers = [];
+    this.syncDoc = () => {
+      var _a;
+      this.doc.clientID = ((_a = this.room.getSelf()) == null ? void 0 : _a.connectionId) || this.doc.clientID;
+      this.awareness.clientID = this.doc.clientID;
+      const encodedVector = Base64.fromUint8Array(Y.encodeStateVector(this.doc));
+      this.room.getYDoc(encodedVector);
+    };
     this.updateHandler = (update, origin) => __async(this, null, function* () {
       if (origin !== "backend") {
         const encodedUpdate = Base64.fromUint8Array(update);
-        this.room.updateDoc(encodedUpdate);
+        this.room.updateYDoc(encodedUpdate);
         if (this.httpEndpoint) {
           yield fetch(this.httpEndpoint, {
             method: "POST",
@@ -206,22 +221,14 @@ var LiveblocksProvider = class {
     this.doc.on("update", this.updateHandler);
     this.unsubscribers.push(
       this.room.events.connection.subscribe((e) => {
-        var _a2;
         if (e === "open") {
-          this.doc.clientID = ((_a2 = this.room.getSelf()) == null ? void 0 : _a2.connectionId) || this.doc.clientID;
-          this.awareness.clientID = this.doc.clientID;
-          const encodedVector = Base64.fromUint8Array(
-            Y.encodeStateVector(this.doc)
-          );
-          this.room.getDoc(encodedVector);
+          this.syncDoc();
         }
       })
     );
     this.unsubscribers.push(
-      this.room.events.docUpdated.subscribe((updates) => {
-        const decodedUpdates = updates.map(Base64.toUint8Array);
-        const update = Y.mergeUpdates(decodedUpdates);
-        Y.applyUpdate(this.doc, update, "backend");
+      this.room.events.docUpdated.subscribe((update) => {
+        Y.applyUpdate(this.doc, Base64.toUint8Array(update), "backend");
       })
     );
     if (config == null ? void 0 : config.httpEndpoint) {
@@ -235,7 +242,7 @@ var LiveblocksProvider = class {
       );
       void this.resyncHttp();
     }
-    this.room.getDoc();
+    this.syncDoc();
   }
   resyncHttp() {
     return __async(this, null, function* () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liveblocks/yjs",
-  "version": "1.1.0-yjs3",
+  "version": "1.1.0-yjs5",
   "description": "An integration with . Liveblocks is the all-in-one toolkit to build collaborative products like Figma, Notion, and more.",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
@@ -26,8 +26,8 @@
     }
   },
   "dependencies": {
-    "@liveblocks/client": "1.1.0-yjs3",
-    "@liveblocks/core": "1.1.0-yjs3",
+    "@liveblocks/client": "1.1.0-yjs5",
+    "@liveblocks/core": "1.1.0-yjs5",
     "js-base64": "^3.7.5"
   },
   "peerDependencies": {