Skip to content

Commit ef012df

Browse files
BlackHole1hyrious
andauthored
fix(whiteboard): don't set state when not writable (#1607) (#1616)
- errorTips: improve error log Co-authored-by: hyrious <hyrious@outlook.com>
1 parent a83b77b commit ef012df

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

desktop/renderer-app/src/components/Tips/ErrorTips.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import { message } from "antd";
22
import { ServerRequestError } from "../../utils/error/server-request-error";
3-
import { NODE_ENV } from "../../constants/process";
43
import { i18n } from "../../utils/i18n";
54

65
export const errorTips = (e: unknown): void => {
7-
if (NODE_ENV === "development") {
6+
if (process.env.NODE_ENV === "development") {
87
console.error(e);
98
}
109

desktop/renderer-app/src/stores/whiteboard-store.ts

+3
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,9 @@ export class WhiteboardStore {
391391
if (!room || !windowManager) {
392392
return;
393393
}
394+
if (!room.isWritable) {
395+
return;
396+
}
394397
if (!room.state.globalState || !(room.state.globalState as any).scrollToTop) {
395398
room.setGlobalState({ scrollToTop: true });
396399
windowManager.moveCamera({ centerY: -950, animationMode: AnimationMode.Immediately });

web/flat-web/src/components/Tips/ErrorTips.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import { message } from "antd";
22
import { ServerRequestError } from "../../utils/error/server-request-error";
3-
import { NODE_ENV } from "../../constants/process";
43
import { i18n } from "../../utils/i18n";
54

65
export const errorTips = (e: unknown): void => {
7-
if (NODE_ENV === "development") {
6+
if (process.env.NODE_ENV === "development") {
87
console.error(e);
98
}
109

web/flat-web/src/stores/whiteboard-store.ts

+3
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,9 @@ export class WhiteboardStore {
359359
if (!room || !windowManager) {
360360
return;
361361
}
362+
if (!room.isWritable) {
363+
return;
364+
}
362365
if (!room.state.globalState || !(room.state.globalState as any).scrollToTop) {
363366
room.setGlobalState({ scrollToTop: true });
364367
windowManager.moveCamera({ centerY: -950, animationMode: AnimationMode.Immediately });

0 commit comments

Comments
 (0)