@tldraw/editor 3.13.0-canary.a2884bb1bab2 → 3.13.0-canary.b133066477f2

package/dist-cjs/lib/editor/Editor.js

@@ -1347,8 +1347,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     return this.getCurrentPageState().selectedShapeIds;
   }
   getSelectedShapes() {
-    const { selectedShapeIds } = this.getCurrentPageState();
-    return (0, import_utils.compact)(selectedShapeIds.map((id) => this.store.get(id)));
+    return (0, import_utils.compact)(this.getSelectedShapeIds().map((id) => this.store.get(id)));
   }
   /**
    * Select one or more shapes.
@@ -1950,12 +1949,22 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     }
     return baseCamera;
   }
+  _getFollowingPresence(targetUserId) {
+    const visited = [this.user.getId()];
+    const collaborators = this.getCollaborators();
+    let leaderPresence = null;
+    while (targetUserId && !visited.includes(targetUserId)) {
+      leaderPresence = collaborators.find((c) => c.userId === targetUserId) ?? null;
+      targetUserId = leaderPresence?.followingUserId ?? null;
+      if (leaderPresence) {
+        visited.push(leaderPresence.userId);
+      }
+    }
+    return leaderPresence;
+  }
   getViewportPageBoundsForFollowing() {
-    const followingUserId = this.getInstanceState().followingUserId;
-    if (!followingUserId) return null;
-    const leaderPresence = this.getCollaborators().find((c) => c.userId === followingUserId);
-    if (!leaderPresence) return null;
-    if (!leaderPresence.camera || !leaderPresence.screenBounds) return null;
+    const leaderPresence = this._getFollowingPresence(this.getInstanceState().followingUserId);
+    if (!leaderPresence?.camera || !leaderPresence?.screenBounds) return null;
     const { w: lw, h: lh } = leaderPresence.screenBounds;
     const { x: lx, y: ly, z: lz } = leaderPresence.camera;
     const theirViewport = new import_Box.Box(-lx, -ly, lw / lz, lh / lz);
@@ -2862,34 +2871,30 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
    */
   startFollowingUser(userId) {
     this.stopFollowingUser();
-    const leaderPresences = this._getCollaboratorsQuery().get().filter((p) => p.userId === userId);
-    if (!leaderPresences.length) {
-      console.warn("User not found");
-      return this;
-    }
     const thisUserId = this.user.getId();
     if (!thisUserId) {
       console.warn("You should set the userId for the current instance before following a user");
     }
-    if (leaderPresences.some((p) => p.followingUserId === thisUserId)) {
+    const leaderPresence = this._getFollowingPresence(userId);
+    if (!leaderPresence) {
       return this;
     }
     const latestLeaderPresence = (0, import_state.computed)("latestLeaderPresence", () => {
-      return this.getCollaborators().find((p) => p.userId === userId);
+      return this._getFollowingPresence(userId);
     });
     (0, import_state.transact)(() => {
       this.updateInstanceState({ followingUserId: userId }, { history: "ignore" });
       const dispose = (0, import_state.react)("update current page", () => {
-        const leaderPresence = latestLeaderPresence.get();
-        if (!leaderPresence) {
+        const leaderPresence2 = latestLeaderPresence.get();
+        if (!leaderPresence2) {
           this.stopFollowingUser();
           return;
         }
-        if (leaderPresence.currentPageId !== this.getCurrentPageId() && this.getPage(leaderPresence.currentPageId)) {
+        if (leaderPresence2.currentPageId !== this.getCurrentPageId() && this.getPage(leaderPresence2.currentPageId)) {
           this.run(
             () => {
               this.store.put([
-                { ...this.getInstanceState(), currentPageId: leaderPresence.currentPageId }
+                { ...this.getInstanceState(), currentPageId: leaderPresence2.currentPageId }
               ]);
               this._isLockedOnFollowingUser.set(true);
             },
@@ -2904,8 +2909,8 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
         this.off("stop-following", cancel);
       };
       const moveTowardsUser = () => {
-        const leaderPresence = latestLeaderPresence.get();
-        if (!leaderPresence) {
+        const leaderPresence2 = latestLeaderPresence.get();
+        if (!leaderPresence2) {
           this.stopFollowingUser();
           return;
         }