@netless/forge-whiteboard 1.0.7 → 1.1.0-beta.1

package/dist/whiteboard.js

@@ -27733,11 +27733,17 @@ var ImageModel = class extends ElementModel {
   }
   styleKeys() {
     return {
-      include: [],
+      include: ["src"],
       exclude: ["dashArray", "strokeColor", "fillColor", "strokeWidth"]
     };
   }
-  onStyleKeyUpdate(_key) {
+  onStyleKeyUpdate(key) {
+    if (key === "src") {
+      const imgElement = this.imageSets.querySelector(`[id='${this.uuid}']`);
+      if (imgElement) {
+        imgElement.src = this.src;
+      }
+    }
   }
   editorConfig() {
     const cfg = new EditorConfig();
@@ -28839,6 +28845,9 @@ var SelectElementsModel = class extends import_eventemitter33.default {
     _defineProperty23(this, "hasPermission", void 0);
     _defineProperty23(this, "observers", /* @__PURE__ */ new Map());
     _defineProperty23(this, "handleUserLeave", (user) => {
+      if (user.id === this.userManager.selfId) {
+        return;
+      }
       const cb = this.observers.get(user.id);
       if (cb) {
         (0, import_forge_room6.removeDeepObserver)(this.requestUserMap(user.id), cb);
@@ -28851,6 +28860,7 @@ var SelectElementsModel = class extends import_eventemitter33.default {
       };
       if (this.observers.has(user.id)) {
         (0, import_forge_room6.removeDeepObserver)(this.requestUserMap(user.id), this.observers.get(user.id));
+        this.observers.delete(user.id);
       }
       this.requestUserMap(user.id).observeDeep(observer);
       this.observers.set(user.id, observer);
@@ -29923,18 +29933,25 @@ var Camera = class extends import_eventemitter37.default {
       }
     });
     _defineProperty28(this, "handleUserLeave", (user) => {
+      if (user.id === this.userManager.selfId) {
+        return;
+      }
       const cb = this.observers.get(user.id);
       if (cb) {
         (0, import_forge_room7.removeObserver)(this.requestUserMap(user.id), cb);
       }
     });
     _defineProperty28(this, "handleUserJoin", (user) => {
+      if (this.observers.has(user.id)) {
+        const cb = this.observers.get(user.id);
+        if (cb) {
+          (0, import_forge_room7.removeObserver)(this.requestUserMap(user.id), cb);
+          this.observers.delete(user.id);
+        }
+      }
       const observer = (evt) => {
         this.handleViewMatrixUpdate(user.id, evt);
       };
-      if (this.observers.has(user.id)) {
-        (0, import_forge_room7.removeObserver)(this.requestUserMap(user.id), observer);
-      }
       this.requestUserMap(user.id).observe(observer);
       this.observers.set(user.id, observer);
     });
@@ -30563,12 +30580,22 @@ var TrashedElementsModel = class extends import_eventemitter39.default {
     _defineProperty33(this, "hasPermission", void 0);
     _defineProperty33(this, "observers", /* @__PURE__ */ new Map());
     _defineProperty33(this, "handleUserLeave", (user) => {
+      if (user.id === this.userManager.selfId) {
+        return;
+      }
       const cb = this.observers.get(user.id);
       if (cb) {
         (0, import_forge_room8.removeDeepObserver)(this.requestUserMap(user.id), cb);
       }
     });
     _defineProperty33(this, "handleUserJoin", (user) => {
+      if (this.observers.has(user.id)) {
+        const cb = this.observers.get(user.id);
+        if (cb) {
+          (0, import_forge_room8.removeDeepObserver)(this.requestUserMap(user.id), cb);
+          this.observers.delete(user.id);
+        }
+      }
       const observer = (evts) => {
         this.handleUserTrashElementsChange(user.id, evts);
       };
@@ -30741,6 +30768,9 @@ var PageModel = class extends import_eventemitter310.default {
     _defineProperty35(this, "observers", /* @__PURE__ */ new Map());
     _defineProperty35(this, "hasPermission", void 0);
     _defineProperty35(this, "handleUserLeave", (user) => {
+      if (this.userManager.selfId === user.id) {
+        return;
+      }
       const cb = this.observers.get(user.id);
       if (cb) {
         (0, import_forge_room9.removeObserver)(this.requestUserMap(user.id), cb);
@@ -30792,7 +30822,7 @@ var PageModel = class extends import_eventemitter310.default {
     this.userManager = userManager;
     this.requestUserMap = requestUserMap;
     this.whiteboardAttrsMap = whiteboardAttrsMap;
-    this.userManager.userIdList().forEach((userId) => {
+    new Set(this.userManager.userIdList().concat(this.userManager.selfId)).forEach((userId) => {
       this.createCurrentPageObserver(userId);
     });
     this.userManager.on("join", this.handleUserJoin);
@@ -30801,6 +30831,13 @@ var PageModel = class extends import_eventemitter310.default {
     this.pageMap.observe(this.handlePageMapChange);
   }
   createCurrentPageObserver(userId) {
+    if (this.observers.has(userId)) {
+      const cb = this.observers.get(userId);
+      if (cb) {
+        (0, import_forge_room9.removeObserver)(this.requestUserMap(userId), cb);
+        this.observers.delete(userId);
+      }
+    }
     const observer = (evt) => {
       this.handleUserCurrentPageChange(userId, evt);
     };
@@ -30836,7 +30873,8 @@ var PageModel = class extends import_eventemitter310.default {
     return true;
   }
   addPage(id) {
-    if (!this.modifyDetect(id)) {
+    let focus = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
+    if (!focus && !this.modifyDetect(id)) {
       return false;
     }
     if (this.pageMap.has(id)) {
@@ -31703,6 +31741,11 @@ var WhiteboardApplication = class _WhiteboardApplication extends import_forge_ro
     _defineProperty43(this, "enableToolEvent", () => {
       return !(this.inputType === "pen" && !this.isPenEvent);
     });
+    _defineProperty43(this, "handleWritableChanged", (userId, writable) => {
+      if (userId === this.userId && writable && this.linkWhiteboardId) {
+        this.linkToWhiteboard(this.linkWhiteboardId);
+      }
+    });
     _defineProperty43(this, "handleViewportUpdate", (evt) => {
       if (evt.keysChanged.has("viewportWidth") || evt.keysChanged.has("viewportHeight")) {
         const rect = this.rootElement.getBoundingClientRect();
@@ -32139,6 +32182,9 @@ var WhiteboardApplication = class _WhiteboardApplication extends import_forge_ro
       }
     };
     this.emitter.clearPage = () => {
+      if (!this.writableManager().isWritable()) {
+        return;
+      }
       this.getCurrentRendererModel().then((model) => {
         if (model) {
           if (model.elements.doc) {
@@ -32152,9 +32198,15 @@ var WhiteboardApplication = class _WhiteboardApplication extends import_forge_ro
       });
     };
     this.emitter.undo = () => {
+      if (!this.writableManager().isWritable()) {
+        return;
+      }
       this.undoManager?.undo();
     };
     this.emitter.redo = () => {
+      if (!this.writableManager().isWritable()) {
+        return;
+      }
       this.undoManager?.redo();
     };
     this.emitter.rasterizeViewport = (scale, page) => {
@@ -32296,6 +32348,10 @@ var WhiteboardApplication = class _WhiteboardApplication extends import_forge_ro
     });
     window.addEventListener("forge-whiteboard-synced-status", this.addWhiteboardStatus);
   }
+  addPage(id) {
+    let focus = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
+    return this.pageModel.addPage(id, focus);
+  }
   userMap(userId) {
     return this.getMap(`user/${userId}`);
   }
@@ -32303,7 +32359,7 @@ var WhiteboardApplication = class _WhiteboardApplication extends import_forge_ro
     _WhiteboardApplication.instanceCount.set(this.appId, (_WhiteboardApplication.instanceCount.get(this.appId) ?? 0) + 1);
     (0, import_forge_room12.log)(`whiteboard ${this.appId} initialize. instance count: ${_WhiteboardApplication.instanceCount.get(this.appId) ?? 0}`, {}, "info");
     this.appDoc.transact(() => {
-      this.permissions = new WhiteboardPermissions(this.userManager, (userId) => {
+      this.permissions = new WhiteboardPermissions(this.writableManager, this.userManager, (userId) => {
         return this.userMap(userId);
       });
       this.permissions.setPermission(WhiteboardPermissionFlag.all);
@@ -32499,6 +32555,7 @@ var WhiteboardApplication = class _WhiteboardApplication extends import_forge_ro
       }
       this.rootElement.appendChild(this.liveCursor.container);
       this.getMap("attrs").observe(this.handleViewportUpdate);
+      this.writableManager().on("writableChanged", this.handleWritableChanged);
     }, "whiteboard-initialize");
   }
   clearElements() {