@netless/forge-whiteboard 0.1.11 → 0.1.13

package/dist/whiteboard.js

@@ -30710,12 +30710,12 @@ var WhiteboardApplication = class extends import_forge_room3.AbstractApplication
     _defineProperty40(this, "resizeObserver", void 0);
     _defineProperty40(this, "option", void 0);
     _defineProperty40(this, "permissions", void 0);
-    _defineProperty40(this, "linkTarget", null);
     _defineProperty40(this, "inputType", "any");
     _defineProperty40(this, "isPenEvent", false);
     _defineProperty40(this, "hasPenInput", null);
     _defineProperty40(this, "disableViewModelUpdate", false);
     _defineProperty40(this, "internalResizeObserver", true);
+    _defineProperty40(this, "linkTarget", null);
     _defineProperty40(this, "enableToolEvent", () => {
       return !(this.inputType === "pen" && !this.isPenEvent);
     });
@@ -30897,20 +30897,20 @@ var WhiteboardApplication = class extends import_forge_room3.AbstractApplication
         this.emitter.emit("elementDeselected", userId);
       }
     });
-    _defineProperty40(this, "onLinkTargetToolbarChange", (style) => {
-      this.toolbarModel.currentTool = style.tool;
-      this.toolbarModel.strokeColor = style.strokeColor;
-      this.toolbarModel.fillColor = style.fillColor;
-      this.toolbarModel.fontSize = style.fontSize;
-      this.toolbarModel.fontFamily = style.fontFamily;
-      this.toolbarModel.strokeWidth = style.strokeWidth;
-      this.toolbarModel.dashArray = style.dashArray;
-    });
-    _defineProperty40(this, "onLinkTargetPermissionChange", (userId, flags) => {
-      if (userId == this.userId) {
-        flags.forEach((flag) => {
-          this.permissions.addPermission(flag, this.userId);
-        });
+    _defineProperty40(this, "handleLinkedMapChange", (evt) => {
+      for (const [key, value] of evt.changes.keys.entries()) {
+        if (Object.keys(TOOLBAR_KEYS).indexOf(key) >= 0 && (value.action === "add" || value.action === "update")) {
+          this.toolbarModel.currentTool = evt.target.get(TOOLBAR_KEYS.tool);
+          this.toolbarModel.strokeColor = evt.target.get(TOOLBAR_KEYS.strokeColor);
+          this.toolbarModel.fillColor = evt.target.get(TOOLBAR_KEYS.fillColor);
+          this.toolbarModel.fontSize = evt.target.get(TOOLBAR_KEYS.fontSize);
+          this.toolbarModel.fontFamily = evt.target.get(TOOLBAR_KEYS.fontFamily);
+          this.toolbarModel.strokeWidth = evt.target.get(TOOLBAR_KEYS.strokeWidth);
+          this.toolbarModel.dashArray = evt.target.get(TOOLBAR_KEYS.dashArray);
+        }
+        if (key === "permission" && (value.action === "add" || value.action === "update")) {
+          this.permissions.addPermission(evt.target.get("permission"), this.userId);
+        }
       }
     });
     _defineProperty40(this, "adjustByOutFrame", (frameWidth, frameHeight) => {
@@ -31500,22 +31500,26 @@ var WhiteboardApplication = class extends import_forge_room3.AbstractApplication
     this.disableViewModelUpdate = true;
   }
   linkToWhiteboard(targetId) {
-    console.log("linkToWhiteboard, linkToWhiteboard, linkToWhiteboard");
     if (this.linkTarget) {
       this.unlink();
     }
-    this.linkTarget = this.applicationManager.getInstances(targetId);
+    this.userMap(this.userId);
+    this.linkTarget = this.roomDoc.getMap(`@app/${this.name}/${targetId}/user/${this.userId}`);
     if (this.linkTarget) {
-      this.linkTarget.toolbarModel.on("update", this.onLinkTargetToolbarChange);
-      this.linkTarget.permissions.on("change", this.onLinkTargetPermissionChange);
-    } else {
-      throw new Error(`[@netless/forge-whiteboard] link target ${targetId} not found`);
+      this.toolbarModel.currentTool = this.linkTarget.get(TOOLBAR_KEYS.tool);
+      this.toolbarModel.strokeColor = this.linkTarget.get(TOOLBAR_KEYS.strokeColor);
+      this.toolbarModel.fillColor = this.linkTarget.get(TOOLBAR_KEYS.fillColor);
+      this.toolbarModel.fontSize = this.linkTarget.get(TOOLBAR_KEYS.fontSize);
+      this.toolbarModel.fontFamily = this.linkTarget.get(TOOLBAR_KEYS.fontFamily);
+      this.toolbarModel.strokeWidth = this.linkTarget.get(TOOLBAR_KEYS.strokeWidth);
+      this.toolbarModel.dashArray = this.linkTarget.get(TOOLBAR_KEYS.dashArray);
+      this.permissions.addPermission(this.linkTarget.get("permission"), this.userId);
+      this.linkTarget.observe(this.handleLinkedMapChange);
     }
   }
   unlink() {
     if (this.linkTarget) {
-      this.linkTarget.toolbarModel.off("update", this.onLinkTargetToolbarChange);
-      this.linkTarget.permissions.off("change", this.onLinkTargetPermissionChange);
+      this.linkTarget.unobserve(this.handleLinkedMapChange);
     }
   }
   setViewSize(width, height) {
@@ -31537,9 +31541,6 @@ var WhiteboardApplication = class extends import_forge_room3.AbstractApplication
   async dispose() {
     this.selectElementsModel.dispose();
     this.trashedElementsModel.dispose();
-    for (const key of this.layers.keys()) {
-      this.layers.get(key)?.dispose();
-    }
     this.paperScope.view.remove();
     this.shadowScope.view.remove();
     this.rootElement.removeChild(this.canvasElement);