@netless/window-manager 0.4.52 → 0.4.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "0.4.52",
+  "version": "0.4.54",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",

package/src/Cursor/index.ts

@@ -3,7 +3,6 @@ import { Cursor } from "./Cursor";
 import { CursorState, Events } from "../constants";
 import { emitter } from "../InternalEmitter";
 import { SideEffectManager } from "side-effect-manager";
-import { throttle } from "lodash";
 import { WindowManager } from "../index";
 import type { CursorMovePayload, ApplianceIcons } from "../index";
 import type { PositionType } from "../AttributesDelegate";
@@ -106,15 +105,27 @@ export class CursorManager {
         return this.manager.focusApp?.view;
     }
 
-    private mouseMoveListener = throttle((event: PointerEvent) => {
-        const isTouch = event.pointerType === "touch";
-        if (isTouch) {
-            if (!event.isPrimary) return;
-        }
+    private mouseMoveListener_ = (event: PointerEvent, isTouch: boolean) => {
         const type = this.getType(event);
         this.updateCursor(type, event.clientX, event.clientY);
         isTouch && this.showPencilEraserIfNeeded(type, event.clientX, event.clientY);
-    }, 48);
+    }
+
+    private mouseMoveTimer = 0;
+    private mouseMoveListener = (event: PointerEvent) => {
+        const isTouch = event.pointerType === "touch";
+        if (isTouch && !event.isPrimary) return;
+
+        const now = Date.now()
+        if (now - this.mouseMoveTimer > 48) {
+            this.mouseMoveTimer = now;
+            this.mouseMoveListener_(event, isTouch);
+        }
+    }
+
+    private mouseLeaveListener = () => {
+        this.hideCursor(this.manager.uid);
+    }
 
     private showPencilEraserIfNeeded(event: EventType, clientX: number, clientY: number) {
         const self = findMemberByUid(this.manager.room, this.manager.uid);
@@ -187,10 +198,6 @@ export class CursorManager {
         }
     };
 
-    private mouseLeaveListener = () => {
-        this.hideCursor(this.manager.uid);
-    };
-
     public updateContainerRect() {
         this.containerRect = WindowManager.container?.getBoundingClientRect();
         this.wrapperRect = WindowManager.wrapper?.getBoundingClientRect();

package/src/Helper.ts

@@ -1,10 +1,10 @@
 import { getVersionNumber, wait } from "./Utils/Common";
 import { log } from "./Utils/log";
 import { REQUIRE_VERSION } from "./constants";
+import type { Room, RoomMember } from "white-web-sdk";
 import { WhiteVersion } from "white-web-sdk";
 import { WhiteWebSDKInvalidError } from "./Utils/error";
 import { WindowManager } from "./index";
-import type { Room } from "white-web-sdk";
 
 export const setupWrapper = (
     root: HTMLElement
@@ -43,9 +43,17 @@ export const checkVersion = () => {
 };
 
 export const findMemberByUid = (room: Room | undefined, uid: string) => {
-    const roomMembers = room?.state.roomMembers;
-    return roomMembers?.find(member => member.payload?.uid === uid);
-};
+    const roomMembers = room?.state.roomMembers || [];
+    let maxMemberId = 0;
+    let result: RoomMember | undefined = undefined;
+    for (const member of roomMembers) {
+        if (member.payload?.uid === uid && maxMemberId < member.memberId) {
+            maxMemberId = member.memberId;
+            result = member;
+        }
+    }
+    return result;
+}
 
 export const createInvisiblePlugin = async (room: Room) => {
     try {