@netless/window-manager 0.4.1-canary.0 → 0.4.4

package/docs/api.md

@@ -14,6 +14,15 @@
     - [`cleanCurrentScene`](#cleanCurrentScene)
     - [`redo`](#redo)
     - [`undo`](#undo)
+    - [`copy`](#copy)
+    - [`paste`](#paste)
+    - [`delete`](#delete)
+    - [`duplicate`](#duplicate)
+    - [`insertText`](#insertText)
+    - [`insertImage`](#insertImage)
+    - [`completeImageUpload`](#completeImageUpload)
+    - [`lockImage`](#lockImage)
+    - [`lockImages`](#lockImages)
   - [实例属性](#prototypes)
   - [事件回调](#events)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "0.4.1-canary.0",
+  "version": "0.4.4",
   "description": "",
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",
@@ -27,12 +27,12 @@
     "p-retry": "^4.6.1",
     "side-effect-manager": "^0.1.5",
     "uuid": "^7.0.3",
-    "video.js": ">=7"
+    "video.js": ">=7",
+    "@netless/telebox-insider": "0.2.22"
   },
   "devDependencies": {
     "@netless/app-docs-viewer": "^0.2.6",
     "@netless/app-media-player": "0.1.0-beta.5",
-    "@netless/telebox-insider": "0.2.22",
     "@rollup/plugin-commonjs": "^20.0.0",
     "@rollup/plugin-node-resolve": "^13.0.4",
     "@rollup/plugin-url": "^6.1.0",

package/src/App/Storage/index.ts

@@ -201,7 +201,7 @@ export class Storage<TState extends Record<string, any> = any> implements Storag
   private _getRawState(defaultValue: TState): TState
   private _getRawState(defaultValue?: TState): TState | undefined {
     if (this.id === null) {
-      return get(this._context.getAttributes(), [], defaultValue);
+      return this._context.getAttributes() ?? defaultValue;
     } else {
       return get(this._context.getAttributes(), [STORAGE_NS, this.id], defaultValue);
     }

package/src/Utils/RoomHacker.ts

@@ -44,6 +44,10 @@ export const replaceRoomFunction = (room: Room | Player, manager: WindowManager)
         room.redo = () => manager.redo();
         room.undo = () => manager.undo();
         room.cleanCurrentScene = () => manager.cleanCurrentScene();
+        room.delete = () => manager.delete();
+        room.copy = () => manager.copy();
+        room.paste = () => manager.paste();
+        room.duplicate = () => manager.duplicate();
         delegateRemoveScenes(room);
     }
 };

package/src/View/ViewManager.ts

@@ -18,7 +18,11 @@ export class ViewManager {
     public destroyView(id: string): void {
         const view = this.views.get(id);
         if (view) {
-            view.release();
+            try {
+                view.release();
+            } catch {
+                // ignore
+            }
             this.views.delete(id);
         }
     }
@@ -32,7 +36,11 @@ export class ViewManager {
 
     public destroy() {
         this.views.forEach(view => {
-            view.release();
+            try {
+                view.release();
+            } catch {
+                // ignore
+            }
         });
         this.views.clear();
     }

package/src/index.ts

@@ -47,6 +47,7 @@ import type {
     ViewVisionMode,
     CameraState,
     Player,
+    ImageInformation,
 } from "white-web-sdk";
 import type { AppListeners } from "./AppListener";
 import type { NetlessApp, RegisterParams } from "./typings";
@@ -614,6 +615,10 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
         return this.attributes.focus;
     }
 
+    public get focusedView(): View | undefined {
+        return this.appManager?.focusApp?.view || this.mainView;
+    }
+
     public get mainViewSceneIndex(): number {
         return this.appManager?.store.getMainViewSceneIndex();
     }
@@ -683,7 +688,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
         this.appManager?.dispatchInternalEvent(Events.MoveCamera, camera);
         setTimeout(() => {
             this.appManager?.mainViewProxy.setCameraAndSize();
-        }, 100);
+        }, 500);
     }
 
     public moveCameraToContain(
@@ -696,7 +701,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
         this.appManager?.dispatchInternalEvent(Events.MoveCameraToContain, rectangle);
         setTimeout(() => {
             this.appManager?.mainViewProxy.setCameraAndSize();
-        }, 100);
+        }, 500);
     }
 
     public convertToPointInWorld(point: Point): Point {
@@ -768,30 +773,51 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
     }
 
     public cleanCurrentScene(): void {
-        const focused = this.focused;
-        if (focused) {
-            this.appManager?.focusApp?.view?.cleanCurrentScene();
-        } else {
-            this.mainView.cleanCurrentScene();
-        }
+        this.focusedView?.cleanCurrentScene();
     }
 
     public redo(): number {
-        const focused = this.focused;
-        if (focused) {
-            return this.appManager?.focusApp?.view?.redo() || 0;
-        } else {
-            return this.mainView.redo();
-        }
+        return this.focusedView?.redo() || 0;
     }
 
     public undo(): number {
-        const focused = this.focused;
-        if (focused) {
-            return this.appManager?.focusApp?.view?.undo() || 0;
-        } else {
-            return this.mainView.undo();
-        }
+        return this.focusedView?.undo() || 0;
+    }
+
+    public delete(): void {
+        this.focusedView?.delete();
+    }
+
+    public copy(): void {
+        this.focusedView?.copy();
+    }
+
+    public paste(): void {
+        this.focusedView?.paste();
+    }
+
+    public duplicate(): void {
+        this.focusedView?.duplicate();
+    }
+
+    public insertText(x: number, y: number, text: string): string {
+        return this.focusedView?.insertText(x, y, text) || "";
+    }
+
+    public insertImage(info: ImageInformation): void {
+        return this.focusedView?.insertImage(info);
+    }
+
+    public completeImageUpload(uuid: string, url: string): void {
+        return this.focusedView?.completeImageUpload(uuid, url);
+    }
+
+    public lockImage(uuid: string, locked: boolean): void {
+        return this.focusedView?.lockImage(uuid, locked);
+    }
+
+    public lockImages(locked: boolean): void {
+        return this.focusedView?.lockImages(locked);
     }
 
     private isDynamicPPT(scenes: SceneDefinition[]) {

package/vite.config.js

@@ -2,7 +2,7 @@ import path from "path";
 import { defineConfig } from "vite";
 import { svelte } from "@sveltejs/vite-plugin-svelte";
 import { dependencies, peerDependencies, version, devDependencies } from "./package.json"
-
+import { omit } from "lodash";
 
 export default defineConfig(({ mode }) => {
     const isProd = mode === "production";
@@ -34,7 +34,7 @@ export default defineConfig(({ mode }) => {
             sourcemap: true,
             rollupOptions: {
                 external: Object.keys({
-                    ...dependencies,
+                    ...omit(dependencies, ["@netless/telebox-insider"]),
                     ...peerDependencies,
                 }),
             },