refactor(whiteboard): change to selector once insert image (#1629)

netless-io · Aug 5, 2022 · c199564 · c199564
1 parent a2d3878
commit c199564
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/desktop/renderer-app/src/stores/whiteboard-store.ts b/desktop/renderer-app/src/stores/whiteboard-store.ts
@@ -10,6 +10,7 @@ import { makeAutoObservable, observable, runInAction } from "mobx";
 import { isMobile, isWindows } from "react-device-detect";
 import {
     AnimationMode,
+    ApplianceNames,
     DeviceType,
     Room,
     RoomPhase,
@@ -555,6 +556,8 @@ export class WhiteboardStore {
         //     width: width,
         //     height: height,
         // });
+
+        windowManager.mainView.setMemberState({ currentApplianceName: ApplianceNames.selector });
     };
 
     public insertMediaFile = async (file: CloudStorageFile): Promise<void> => {

diff --git a/desktop/renderer-app/src/utils/drag-and-drop/image.ts b/desktop/renderer-app/src/utils/drag-and-drop/image.ts
@@ -1,6 +1,6 @@
 import { message } from "antd";
 import { v4 as v4uuid } from "uuid";
-import type { Room, Size } from "white-web-sdk";
+import { ApplianceNames, Room, Size } from "white-web-sdk";
 import { listFiles } from "../../api-middleware/flatServer/storage";
 import { i18n } from "../i18n";
 import { UploadTask } from "../upload-task-manager/upload-task";
@@ -50,6 +50,7 @@ export async function onDropImage(file: File, x: number, y: number, room: Room):
     const { width, height } = await getSize;
     room.insertImage({ uuid, centerX: x, centerY: y, width, height, locked: false });
     room.completeImageUpload(uuid, cloudFile.fileURL);
+    room.setMemberState({ currentApplianceName: ApplianceNames.selector });
 }
 
 export function getImageSize(file: File): Promise<Size> {

diff --git a/web/flat-web/src/stores/whiteboard-store.ts b/web/flat-web/src/stores/whiteboard-store.ts
@@ -10,6 +10,7 @@ import { isMobile, isWindows } from "react-device-detect";
 import { v4 as v4uuid } from "uuid";
 import {
     AnimationMode,
+    ApplianceNames,
     DeviceType,
     Room,
     RoomPhase,
@@ -524,6 +525,8 @@ export class WhiteboardStore {
         //     width: width,
         //     height: height,
         // });
+
+        windowManager.mainView.setMemberState({ currentApplianceName: ApplianceNames.selector });
     };
 
     public insertMediaFile = async (file: CloudStorageFile): Promise<void> => {

diff --git a/web/flat-web/src/utils/drag-and-drop/image.ts b/web/flat-web/src/utils/drag-and-drop/image.ts
@@ -1,6 +1,6 @@
 import { message } from "antd";
 import { v4 as v4uuid } from "uuid";
-import type { Room, Size } from "white-web-sdk";
+import { ApplianceNames, Room, Size } from "white-web-sdk";
 import { listFiles } from "../../api-middleware/flatServer/storage";
 import { i18n } from "../i18n";
 import { UploadTask } from "../upload-task-manager/upload-task";
@@ -50,6 +50,7 @@ export async function onDropImage(file: File, x: number, y: number, room: Room):
     const { width, height } = await getSize;
     room.insertImage({ uuid, centerX: x, centerY: y, width, height, locked: false });
     room.completeImageUpload(uuid, cloudFile.fileURL);
+    room.setMemberState({ currentApplianceName: ApplianceNames.selector });
 }
 
 export function getImageSize(file: File): Promise<Size> {