fix(whiteboard): don't set state when not writable (#1607)

- errorTips: improve error log
netless-io · Jul 14, 2022 · cb6becb · cb6becb
1 parent 5bee5af
commit cb6becb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/desktop/renderer-app/src/components/Tips/ErrorTips.tsx b/desktop/renderer-app/src/components/Tips/ErrorTips.tsx
@@ -1,10 +1,9 @@
 import { message } from "antd";
 import { ServerRequestError } from "../../utils/error/server-request-error";
-import { NODE_ENV } from "../../constants/process";
 import { i18n } from "../../utils/i18n";
 
 export const errorTips = (e: unknown): void => {
-    if (NODE_ENV === "development") {
+    if (process.env.NODE_ENV === "development") {
         console.error(e);
     }
 

diff --git a/desktop/renderer-app/src/stores/whiteboard-store.ts b/desktop/renderer-app/src/stores/whiteboard-store.ts
@@ -391,6 +391,9 @@ export class WhiteboardStore {
         if (!room || !windowManager) {
             return;
         }
+        if (!room.isWritable) {
+            return;
+        }
         if (!room.state.globalState || !(room.state.globalState as any).scrollToTop) {
             room.setGlobalState({ scrollToTop: true });
             windowManager.moveCamera({ centerY: -950, animationMode: AnimationMode.Immediately });

diff --git a/web/flat-web/src/components/Tips/ErrorTips.tsx b/web/flat-web/src/components/Tips/ErrorTips.tsx
@@ -1,10 +1,9 @@
 import { message } from "antd";
 import { ServerRequestError } from "../../utils/error/server-request-error";
-import { NODE_ENV } from "../../constants/process";
 import { i18n } from "../../utils/i18n";
 
 export const errorTips = (e: unknown): void => {
-    if (NODE_ENV === "development") {
+    if (process.env.NODE_ENV === "development") {
         console.error(e);
     }
 

diff --git a/web/flat-web/src/stores/whiteboard-store.ts b/web/flat-web/src/stores/whiteboard-store.ts
@@ -359,6 +359,9 @@ export class WhiteboardStore {
         if (!room || !windowManager) {
             return;
         }
+        if (!room.isWritable) {
+            return;
+        }
         if (!room.state.globalState || !(room.state.globalState as any).scrollToTop) {
             room.setGlobalState({ scrollToTop: true });
             windowManager.moveCamera({ centerY: -950, animationMode: AnimationMode.Immediately });