@netless/window-manager 0.4.0-canary.15 → 0.4.0-canary.19

package/src/constants.ts

@@ -10,7 +10,8 @@ export enum Events {
     SetMainViewScenePath = "SetMainViewScenePath",
     SetMainViewSceneIndex = "SetMainViewSceneIndex",
     SwitchViewsToFreedom = "SwitchViewsToFreedom",
-    MoveCameraToContain = "MoveCameraToContain"
+    MoveCameraToContain = "MoveCameraToContain",
+    CursorMove = "CursorMove",
 }
 
 export const MagixEventName = "__WindowManger";
@@ -37,7 +38,7 @@ export enum CursorState {
     Normal = "normal",
 }
 
-export const REQUIRE_VERSION = "2.16.0";
+export const REQUIRE_VERSION = "2.16.1";
 
 export const MIN_WIDTH = 340 / 720;
 export const MIN_HEIGHT = 340 / 720;

package/src/index.ts

@@ -32,7 +32,7 @@ import {
     ParamsInvalidError,
     WhiteWebSDKInvalidError,
 } from "./Utils/error";
-import type { Apps } from "./AttributesDelegate";
+import type { Apps, Position } from "./AttributesDelegate";
 import {
     InvisiblePlugin,
     isPlayer,
@@ -125,6 +125,8 @@ export type AppInitState = {
     zIndex?: number;
 };
 
+export type CursorMovePayload = { uid: string; state?: "leave"; position: Position };
+
 export type EmitterEvent = {
     onCreated: undefined;
     InitReplay: AppInitState;
@@ -139,6 +141,8 @@ export type EmitterEvent = {
     boxStateChange: string;
     playgroundSizeChange: DOMRect;
     onReconnected: void;
+    removeScenes: string;
+    cursorMove: CursorMovePayload;
 };
 
 export type EmitterType = Emittery<EmitterEvent>;
@@ -187,6 +191,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
     private static isCreated = false;
 
     public version = __APP_VERSION__;
+    public dependencies = __APP_DEPENDENCIES__;
 
     public appListeners?: AppListeners;
 
@@ -205,6 +210,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
     constructor(context: InvisiblePluginContext) {
         super(context);
         WindowManager.displayer = context.displayer;
+        (window as any).NETLESS_DEPS = __APP_DEPENDENCIES__;
     }
 
     public static async mount(params: MountParams): Promise<WindowManager> {
@@ -428,6 +434,12 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
                     const appScenePath = appManager.store.getAppScenePath(appId);
                     if (appScenePath && appScenePath === scenePath) {
                         console.warn(`[WindowManager]: ScenePath ${scenePath} Already opened`);
+                        if (this.boxManager) {
+                            const topBox = this.boxManager.getTopBox();
+                            if (topBox) {
+                                this.boxManager.setZIndex(appId, topBox.zIndex + 1, false);
+                            }
+                        }
                         return;
                     }
                 }
@@ -472,7 +484,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
     /**
      * 返回 mainView 的 ScenePath
      */
-    public getMainViewScenePath(): string {
+    public getMainViewScenePath(): string | undefined {
         return this.appManager?.store.getMainViewScenePath();
     }
 
@@ -520,6 +532,35 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
         this.viewMode = mode;
     }
 
+    public setBoxState(boxState: TeleBoxState): void {
+        if (!this.canOperate) return;
+        switch (boxState) {
+            case "normal":
+                this.setMaximized(false);
+                this.setMinimized(false);
+                break;
+            case "maximized":
+                this.setMaximized(true);
+                this.setMinimized(false);
+                break;
+            case "minimized":
+                this.setMinimized(true);
+                break;
+            default:
+                break;
+        }
+    }
+
+    public setMaximized(maximized: boolean): void {
+        if (!this.canOperate) return;
+        this.boxManager?.setMaximized(maximized, false);
+    }
+
+    public setMinimized(minimized: boolean): void {
+        if (!this.canOperate) return;
+        this.boxManager?.setMinimized(minimized, false);
+    }
+
     public get mainView(): View {
         if (this.appManager) {
             return this.appManager.mainViewProxy.view;
@@ -583,7 +624,11 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
         } else {
             throw new Error("[WindowManager]: mainViewSceneDir not found");
         }
-    }  
+    }
+
+    public get topApp(): string | undefined {
+        return this.boxManager?.getTopBox()?.id;
+    }
 
     /**
      * 查询所有的 App
@@ -725,6 +770,10 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
             }
         }
     }
+
+    private _removeScenes = (scenePath: string) => {
+        this.room.removeScenes(scenePath);
+    };
 }
 
 setupBuiltin();

package/src/shim.d.ts

@@ -7,4 +7,5 @@ declare module "*.svelte" {
 
 declare global {
     const __APP_VERSION__: string;
-  }
+    const __APP_DEPENDENCIES__: Record<string, string>;
+}

package/src/style.css

@@ -122,7 +122,7 @@
     left: 0;
     top: 0;
     will-change: transform;
-    transition: transform 0.05s;
+    transition: transform 0.1s;
     transform-origin: 0 0;
     user-select: none;
 }

package/vite.config.js

@@ -1,7 +1,7 @@
 import path from "path";
 import { defineConfig } from "vite";
 import { svelte } from "@sveltejs/vite-plugin-svelte";
-import { dependencies ,peerDependencies, version } from "./package.json"
+import { dependencies, peerDependencies, version, devDependencies } from "./package.json"
 
 
 export default defineConfig(({ mode }) => {
@@ -10,6 +10,9 @@ export default defineConfig(({ mode }) => {
     return {
         define: {
             __APP_VERSION__: JSON.stringify(version),
+            __APP_DEPENDENCIES__: JSON.stringify({
+                dependencies, peerDependencies, devDependencies
+            }),
         },
         plugins: [
             svelte({
@@ -23,7 +26,7 @@ export default defineConfig(({ mode }) => {
             lib: {
                 // eslint-disable-next-line no-undef
                 entry: path.resolve(__dirname, "src/index.ts"),
-                formats: ["es","umd"], // TODO cjs 版本待修复
+                formats: ["es", "umd"], // TODO cjs 版本待修复
                 name: "WindowManager",
                 fileName: "index"
             },

package/dist/Base/Context.d.ts

@@ -1,12 +0,0 @@
-import type { AppManager } from "../AppManager";
-export declare class Context {
-    private manager;
-    observerId: number;
-    constructor(manager: AppManager);
-    get uid(): string;
-    findMember: (memberId: number) => import("white-web-sdk").RoomMember | undefined;
-    findMemberByUid: (uid: string) => import("white-web-sdk").RoomMember | undefined;
-    updateManagerRect(): void;
-    blurFocusBox(): void;
-}
-export declare const createContext: (manager: AppManager) => Context;

package/dist/Base/index.d.ts

@@ -1,7 +0,0 @@
-import type { AppManager } from "../AppManager";
-export declare class Base {
-    manager: AppManager;
-    store: import("../AttributesDelegate").AttributesDelegate;
-    context: import("./Context").Context;
-    constructor(manager: AppManager);
-}

package/src/Base/Context.ts

@@ -1,45 +0,0 @@
-import { emitter } from "../index";
-import type { AppManager } from "../AppManager";
-
-export class Context {
-    public observerId: number;
-
-    constructor(private manager: AppManager) {
-        this.observerId = manager.displayer.observerId;
-
-        emitter.on("observerIdChange", id => {
-            this.observerId = id;
-        });
-    };
-
-    public get uid() {
-        return this.manager.room?.uid || "";
-    }
-
-    public findMember = (memberId: number) => {
-        const roomMembers = this.manager.room?.state.roomMembers;
-        return roomMembers?.find(member => member.memberId === memberId);
-    }
-
-    public findMemberByUid = (uid: string) => {
-        const roomMembers = this.manager.room?.state.roomMembers;
-        return roomMembers?.find(member => member.payload?.uid === uid);
-    }
-
-    public updateManagerRect() {
-        this.manager.boxManager?.updateManagerRect();
-    }
-
-    public blurFocusBox() {
-        this.manager.boxManager?.blurAllBox();
-    }
-}
-
-let context: Context;
-
-export const createContext = (manager: AppManager) => {
-    if (!context) {
-        context = new Context(manager);
-    }
-    return context;
-};

package/src/Base/index.ts

@@ -1,10 +0,0 @@
-import type { AppManager } from "../AppManager";
-import { store } from "../AttributesDelegate";
-import { createContext } from "./Context";
-
-export class Base {
-    public store = store;
-    public context = createContext(this.manager);
-
-    constructor(public manager: AppManager) {}
-}