@netless/forge-whiteboard 0.1.12 → 0.1.14

package/changelog.md

@@ -36,4 +36,12 @@
 
 ### 0.1.11
 
-- 支持低版本浏览器 > 0.25%
+- 支持低版本浏览器 > 0.25%
+
+### 0.1.13
+
+- whiteboard terminate 时不清理 ydoc 数据
+
+### 0.1.14
+
+- 添加 linkToWhiteboard api, 多窗口场景下使用

package/dist/WhiteboardApplication.d.ts

@@ -50,12 +50,12 @@ export declare class WhiteboardApplication extends AbstractApplication<Whiteboar
     private resizeObserver;
     private option;
     private permissions;
-    private linkTarget;
     private inputType;
     private isPenEvent;
     private hasPenInput;
     private disableViewModelUpdate;
     private internalResizeObserver;
+    private linkTarget;
     private get undoManager();
     constructor();
     private userMap;
@@ -81,8 +81,7 @@ export declare class WhiteboardApplication extends AbstractApplication<Whiteboar
     disableViewModel(): void;
     linkToWhiteboard(targetId: string): void;
     unlink(): void;
-    private onLinkTargetToolbarChange;
-    private onLinkTargetPermissionChange;
+    private handleLinkedMapChange;
     adjustByOutFrame: (frameWidth: number, frameHeight: number) => void;
     setViewSize(width: number, height: number): void;
     getViewSize(): [number, number];

package/dist/WhiteboardApplication.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WhiteboardApplication.d.ts","sourceRoot":"","sources":["../src/WhiteboardApplication.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"WhiteboardApplication.d.ts","sourceRoot":"","sources":["../src/WhiteboardApplication.ts"],"names":[],"mappings":"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"}

package/dist/whiteboard.esm.js

@@ -30700,12 +30700,12 @@ var WhiteboardApplication = class extends 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);
     });
@@ -30887,20 +30887,21 @@ var WhiteboardApplication = class extends 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.removePermission(WhiteboardPermissionFlag.all);
+          this.permissions.addPermission(evt.target.get("permission"), this.userId);
+        }
       }
     });
     _defineProperty40(this, "adjustByOutFrame", (frameWidth, frameHeight) => {
@@ -31490,22 +31491,27 @@ var WhiteboardApplication = class extends 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.removePermission(WhiteboardPermissionFlag.all);
+      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) {
@@ -31527,9 +31533,6 @@ var WhiteboardApplication = class extends 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);