@netless/window-manager 0.4.0-canary.14 → 0.4.0-canary.18

package/.vscode/settings.json

@@ -16,6 +16,7 @@
         "SCENEPATH",
         "sveltejs",
         "telebox",
+        "titlebar",
         "vite"
     ]
 }

package/CHANGELOG.md

@@ -1,9 +1,37 @@
-## 0.4.0
+## 0.4.0（canary）
 
 1. 废弃 `WindowManager.mount` 的多参数类型
 2. 添加 `bindContainer` 接口，`mount` 时 `container` 参数不再是必选
+3. 关闭 `App` 会移除相关的 `Scenes`
+4. 添加 `ScenePath` 相同的 `App` 会把这个 `App` 置为最上层
+5. 代理 `room.putScenes` 和 `room.removeScenes`
 
 
+## 0.3.25
+
+1. 修复创建 APP 之后没有设置默认 `zIndex` 的问题
+
+## 0.3.24
+
+1. 修复重连之后光标不见的问题(注意: 新的光标同步方式会跟 0.3.24 之前的版本不兼容)
+2. 修改打包方式, 内部依赖会默认打包
+3. 确保重复 mount 之后 `WindowManger` 内部状态正确
+
+## 0.3.23
+
+1. 修复 ios 上 `boxState` 没有正确回调的问题
+2. 添加了 `setBoxState` `setMaximized` `setMinimized` 接口
+
+## 0.3.22
+
+1. 升级 `@netless/app-docs-viewer` 优化移动端显存占用
+2. 升级 `@netless/telebox-insider` 优化移动端显存占用
+
+## 0.3.19-0.3.21
+
+1. 更新 `@netless/app-docs-viewer`
+2. 修复 box `zIndex` 同步的问题
+
 ## 0.3.18
 
 1. 修复最小化时刷新页面 box 位置错误的问题

package/README.md

@@ -1,6 +1,7 @@
 # WindowManager
 
 - 目录
+  - [概念](docs/concept.md)
   - [references](docs/api.md)
   - [从白板迁移](docs/migrate.md)
 ## MainView

package/dist/AppListener.d.ts

@@ -12,4 +12,5 @@ export declare class AppListeners {
     private boxStateChangeHandler;
     private setMainViewScenePathHandler;
     private moveCameraToContainHandler;
+    private cursorMoveHandler;
 }

package/dist/AppManager.d.ts

@@ -22,6 +22,13 @@ export declare class AppManager {
     private _prevSceneIndex;
     private _prevFocused;
     constructor(windowManger: WindowManager);
+    private get eventName();
+    get attributes(): import("./index").WindowMangerAttributes;
+    get canOperate(): boolean;
+    get room(): Room | undefined;
+    get mainView(): import("white-web-sdk").View;
+    get focusApp(): AppProxy | undefined;
+    get uid(): string;
     private onCreated;
     /**
      * 插件更新 attributes 时的回调
@@ -36,7 +43,7 @@ export declare class AppManager {
     resetMinimized(): void;
     private onAppDelete;
     bindMainView(divElement: HTMLDivElement, disableCameraTransform: boolean): void;
-    setMainViewFocusPath(): void;
+    setMainViewFocusPath(scenePath?: string): boolean | undefined;
     addApp(params: AddAppParams, isDynamicPPT: boolean): Promise<string | undefined>;
     private beforeAddApp;
     private afterAddApp;
@@ -44,16 +51,11 @@ export declare class AppManager {
     private baseInsertApp;
     private displayerStateListener;
     displayerWritableListener: (isReadonly: boolean) => void;
-    private get eventName();
-    get attributes(): import("./index").WindowMangerAttributes;
-    get canOperate(): boolean;
-    get room(): Room | undefined;
-    get mainView(): import("white-web-sdk").View;
-    get focusApp(): AppProxy | undefined;
     safeSetAttributes(attributes: any): void;
     safeUpdateAttributes(keys: string[], value: any): void;
     setMainViewScenePath(scenePath: string): Promise<void>;
     private _setMainViewScenePath;
+    private updateSceneIndex;
     setMainViewSceneIndex(index: number): Promise<void>;
     getAppInitPath(appId: string): string | undefined;
     safeDispatchMagixEvent(event: string, payload: any): void;
@@ -62,5 +64,6 @@ export declare class AppManager {
     onReconnected(): Promise<void>;
     notifyContainerRectUpdate(rect: TeleBoxRect): void;
     dispatchInternalEvent(event: Events, payload: any): void;
+    findMemberByUid: (uid: string) => import("white-web-sdk").RoomMember | undefined;
     destroy(): void;
 }

package/dist/AppProxy.d.ts

@@ -4,9 +4,9 @@ import type { SceneState, View, SceneDefinition } from "white-web-sdk";
 import type { AppManager } from "./AppManager";
 import type { NetlessApp } from "./typings";
 import type { ReadonlyTeleBox } from "@netless/telebox-insider";
-import { Base } from "./Base";
-export declare class AppProxy extends Base {
+export declare class AppProxy {
     private params;
+    private manager;
     id: string;
     scenePath?: string;
     appEmitter: Emittery<AppEmitterEvent>;
@@ -15,6 +15,7 @@ export declare class AppProxy extends Base {
     private boxManager;
     private appProxies;
     private viewManager;
+    private store;
     private kind;
     isAddApp: boolean;
     private status;

package/dist/AttributesDelegate.d.ts

@@ -47,7 +47,7 @@ export declare class AttributesDelegate {
     cleanFocus(): void;
     getAppSceneIndex(id: string): any;
     getAppScenePath(id: string): any;
-    getMainViewScenePath(): any;
+    getMainViewScenePath(): string | undefined;
     getMainViewSceneIndex(): any;
     getBoxState(): any;
     setMainViewScenePath(scenePath: string): void;
@@ -60,7 +60,7 @@ export declare class AttributesDelegate {
     setMainViewSize(size: (Size & {
         id: string;
     }) | undefined): void;
-    setAppFocus(appId: string, focus: boolean): void;
+    setAppFocus: (appId: string, focus: boolean) => void;
     updateCursor(uid: string, position: Position): void;
     updateCursorState(uid: string, cursorState: string | undefined): void;
     getCursorState(uid: string): any;

package/dist/BoxManager.d.ts

@@ -1,8 +1,8 @@
 import { AppAttributes } from "./constants";
-import { TELE_BOX_STATE, TeleBoxManager } from "@netless/telebox-insider";
 import { WindowManager } from "./index";
+import { TELE_BOX_STATE, TeleBoxManager } from "@netless/telebox-insider";
 import type { AddAppOptions, AppInitState, EmitterType, CallbacksType } from "./index";
-import type { TeleBoxManagerUpdateConfig, ReadonlyTeleBox, TeleBoxColorScheme, TeleBoxRect } from "@netless/telebox-insider";
+import type { TeleBoxManagerUpdateConfig, ReadonlyTeleBox, TeleBoxColorScheme, TeleBoxRect, TeleBoxConfig } from "@netless/telebox-insider";
 import type Emittery from "emittery";
 import type { NetlessApp } from "./typings";
 import type { View } from "white-web-sdk";
@@ -49,6 +49,7 @@ export declare type BoxManagerContext = {
     canOperate: () => boolean;
     notifyContainerRectUpdate: (rect: TeleBoxRect) => void;
     cleanFocus: () => void;
+    setAppFocus: (appId: string) => void;
 };
 export declare const createBoxManager: (manager: WindowManager, callbacks: CallbacksType, emitter: EmitterType, options: CreateTeleBoxManagerConfig) => BoxManager;
 export declare class BoxManager {
@@ -83,9 +84,10 @@ export declare class BoxManager {
     setBoxTitle(params: SetBoxTitleParams): void;
     blurAllBox(): void;
     updateAll(config: TeleBoxManagerUpdateConfig): void;
-    setMaximized(maximized: boolean): void;
+    setMaximized(maximized: boolean, skipUpdate?: boolean): void;
     setMinimized(minimized: boolean, skipUpdate?: boolean): void;
     focusTopBox(): void;
+    updateBox(id: string, payload: TeleBoxConfig, skipUpdate?: boolean): void;
     setReadonly(readonly: boolean): void;
     setPrefersColorScheme(colorScheme: TeleBoxColorScheme): void;
     setZIndex(id: string, zIndex: number, skipUpdate?: boolean): void;

package/dist/BuiltinApps.d.ts

@@ -1,4 +1,3 @@
-import "@netless/app-docs-viewer/dist/style.css";
 export declare const setupBuiltin: () => void;
 export declare const BuiltinApps: {
     DocsViewer: string;

package/dist/Cursor/Cursor.d.ts

@@ -1,22 +1,21 @@
-import { ApplianceNames } from 'white-web-sdk';
-import { CursorState } from '../constants';
-import type { Position } from '../AttributesDelegate';
+import { ApplianceNames } from "white-web-sdk";
+import type { Position } from "../AttributesDelegate";
 import type { CursorManager } from "./index";
-import { Base } from '../Base';
-import type { AppManager } from '../AppManager';
+import type { AppManager } from "../AppManager";
 export declare type Payload = {
     [key: string]: any;
 };
-export declare class Cursor extends Base {
-    private cursors;
+export declare class Cursor {
+    private manager;
     private memberId;
     private cursorManager;
     private wrapper?;
     private member?;
     private timer?;
     private component?;
-    constructor(manager: AppManager, addCursorChangeListener: (uid: string, callback: (position: Position, state: CursorState) => void) => void, cursors: any, memberId: string, cursorManager: CursorManager, wrapper?: HTMLElement | undefined);
-    private onCursorChange;
+    constructor(manager: AppManager, memberId: string, cursorManager: CursorManager, wrapper?: HTMLElement | undefined);
+    move: (position: Position) => void;
+    leave: () => void;
     private moveCursor;
     get memberApplianceName(): ApplianceNames | undefined;
     get memberColor(): string;
@@ -27,8 +26,6 @@ export declare class Cursor extends Base {
     private get memberCursorTagBackgroundColor();
     private get memberAvatar();
     private get memberOpacity();
-    get cursorState(): CursorState | undefined;
-    get cursorPosition(): Position | undefined;
     private autoHidden;
     private createCursor;
     private initProps;

package/dist/Cursor/index.d.ts

@@ -1,7 +1,5 @@
-import { Base } from "../Base";
 import { Cursor } from "./Cursor";
-import { CursorState } from "../constants";
-import type { PositionType, Position } from "../AttributesDelegate";
+import type { PositionType } from "../AttributesDelegate";
 import type { RoomMember, View } from "white-web-sdk";
 import type { AppManager } from "../AppManager";
 export declare type EventType = {
@@ -13,21 +11,19 @@ export declare type MoveCursorParams = {
     x: number;
     y: number;
 };
-export declare class CursorManager extends Base {
-    private appManager;
+export declare class CursorManager {
+    private manager;
     containerRect?: DOMRect;
     wrapperRect?: DOMRect;
     cursorInstances: Map<string, Cursor>;
     roomMembers?: readonly RoomMember[];
     private mainViewElement?;
     private sideEffectManager;
-    constructor(appManager: AppManager);
+    private store;
+    constructor(manager: AppManager);
     setupWrapper(wrapper: HTMLElement): void;
     setMainViewDivElement(div: HTMLDivElement): void;
-    private startReaction;
     private getUids;
-    private handleRoomMembersChange;
-    get cursors(): any;
     get boxState(): any;
     get focusView(): View | undefined;
     private mouseMoveListener;
@@ -37,15 +33,9 @@ export declare class CursorManager extends Base {
      *  因为窗口内框在不同分辨率下的大小不一样，所以这里通过来鼠标事件的 target 来判断是在主白板还是在 APP 中
      */
     private getType;
-    private initCursorAttributes;
-    private setNormalCursorState;
     private mouseLeaveListener;
     updateContainerRect(): void;
-    setRoomMembers(members: readonly RoomMember[]): void;
     deleteCursor(uid: string): void;
     hideCursor(uid: string): void;
-    cleanMemberAttributes(members: readonly RoomMember[]): void;
-    onReconnect(): void;
-    addCursorChangeListener: (uid: string, callback: (position: Position, state: CursorState) => void) => void;
     destroy(): void;
 }

package/dist/Register/storage.d.ts

@@ -1,4 +1,8 @@
+export declare type Item = {
+    kind: string;
+    sourceCode: string;
+};
 export declare const initDb: () => Promise<void>;
 export declare const setItem: (key: string, val: any) => Promise<void> | undefined;
-export declare const getItem: (key: string) => Promise<string | null>;
+export declare const getItem: (key: string) => Promise<Item | null>;
 export declare const removeItem: (key: string) => Promise<void> | undefined;

package/dist/Utils/Common.d.ts

@@ -2,9 +2,11 @@ import type { PublicEvent } from "../index";
 import type { Displayer, ViewVisionMode, Room, View } from "white-web-sdk";
 import type Emittery from "emittery";
 export declare const genAppId: (kind: string) => Promise<string>;
-export declare const setViewFocusScenePath: (view: View, focusScenePath: string) => void;
+export declare const setViewFocusScenePath: (view: View, focusScenePath: string) => View | undefined;
+export declare const setViewSceneIndex: (view: View, index: number) => View | undefined;
 export declare const setScenePath: (room: Room | undefined, scenePath: string) => void;
 export declare const getScenePath: (room: Room | undefined, dir: string | undefined, index: number) => string | undefined;
+export declare const removeScenes: (room: Room | undefined, scenePath: string) => void;
 export declare const setViewMode: (view: View, mode: ViewVisionMode) => void;
 export declare const emitError: (error: Error) => void;
 export declare const addEmitterOnceListener: (event: any, listener: any) => void;
@@ -12,6 +14,7 @@ export declare const notifyMainViewModeChange: import("lodash").DebouncedFunc<(c
 export declare const makeValidScenePath: (displayer: Displayer, scenePath: string, index?: number) => string | undefined;
 export declare const entireScenes: (displayer: Displayer) => import("white-web-sdk").SceneMap;
 export declare const isValidScenePath: (scenePath: string) => boolean;
+export declare const parseSceneDir: (scenePath: string) => string;
 export declare const ensureValidScenePath: (scenePath: string) => string;
 export declare const getVersionNumber: (version: string) => number;
 export declare const wait: (time: number) => Promise<unknown>;

package/dist/Utils/RoomHacker.d.ts

@@ -1,3 +1,3 @@
-import type { WindowManager } from '../index';
+import type { WindowManager } from "../index";
 import type { Room } from "white-web-sdk";
 export declare const replaceRoomFunction: (room: Room, manager: WindowManager) => void;

package/dist/View/MainView.d.ts

@@ -1,12 +1,13 @@
-import { Base } from "../Base";
 import type { Camera, Size, View } from "white-web-sdk";
 import type { AppManager } from "../AppManager";
-export declare class MainViewProxy extends Base {
+export declare class MainViewProxy {
+    private manager;
     private scale?;
     private started;
     private mainViewIsAddListener;
     private mainView;
     private viewId;
+    private store;
     private sideEffectManager;
     constructor(manager: AppManager);
     private get mainViewCamera();

package/dist/constants.d.ts

@@ -10,7 +10,8 @@ export declare enum Events {
     SetMainViewScenePath = "SetMainViewScenePath",
     SetMainViewSceneIndex = "SetMainViewSceneIndex",
     SwitchViewsToFreedom = "SwitchViewsToFreedom",
-    MoveCameraToContain = "MoveCameraToContain"
+    MoveCameraToContain = "MoveCameraToContain",
+    CursorMove = "CursorMove"
 }
 export declare const MagixEventName = "__WindowManger";
 export declare enum AppAttributes {
@@ -31,7 +32,7 @@ export declare enum CursorState {
     Leave = "leave",
     Normal = "normal"
 }
-export declare const REQUIRE_VERSION = "2.16.0";
+export declare const REQUIRE_VERSION = "2.16.1";
 export declare const MIN_WIDTH: number;
 export declare const MIN_HEIGHT: number;
 export declare const SET_SCENEPATH_DELAY = 100;

package/dist/index.d.ts

@@ -5,7 +5,7 @@ import { ReconnectRefresher } from "./ReconnectRefresher";
 import "./style.css";
 import "@netless/telebox-insider/dist/style.css";
 import type { TELE_BOX_STATE } from "./BoxManager";
-import type { Apps } from "./AttributesDelegate";
+import type { Apps, Position } from "./AttributesDelegate";
 import { InvisiblePlugin, ViewMode } from "white-web-sdk";
 import type { Displayer, SceneDefinition, View, Room, InvisiblePluginContext, Camera, AnimationMode, CameraBound, Point, Rectangle, ViewVisionMode, CameraState } from "white-web-sdk";
 import type { AppListeners } from "./AppListener";
@@ -65,6 +65,11 @@ export declare type AppInitState = {
     boxState?: TeleBoxState;
     zIndex?: number;
 };
+export declare type CursorMovePayload = {
+    uid: string;
+    state?: "leave";
+    position: Position;
+};
 export declare type EmitterEvent = {
     onCreated: undefined;
     InitReplay: AppInitState;
@@ -93,6 +98,8 @@ export declare type EmitterEvent = {
     boxStateChange: string;
     playgroundSizeChange: DOMRect;
     onReconnected: void;
+    removeScenes: string;
+    cursorMove: CursorMovePayload;
 };
 export declare type EmitterType = Emittery<EmitterEvent>;
 export declare const emitter: EmitterType;
@@ -134,6 +141,7 @@ export declare class WindowManager extends InvisiblePlugin<WindowMangerAttribute
     static containerSizeRatio: number;
     private static isCreated;
     version: string;
+    dependencies: Record<string, string>;
     appListeners?: AppListeners;
     readonly?: boolean;
     emitter: Emittery<PublicEvent>;
@@ -170,7 +178,7 @@ export declare class WindowManager extends InvisiblePlugin<WindowMangerAttribute
     /**
      * 返回 mainView 的 ScenePath
      */
-    getMainViewScenePath(): string;
+    getMainViewScenePath(): string | undefined;
     /**
      * 返回 mainView 的 SceneIndex
      */
@@ -191,6 +199,9 @@ export declare class WindowManager extends InvisiblePlugin<WindowMangerAttribute
      * 设置 ViewMode
      */
     setViewMode(mode: ViewMode): void;
+    setBoxState(boxState: TeleBoxState): void;
+    setMaximized(maximized: boolean): void;
+    setMinimized(minimized: boolean): void;
     get mainView(): View;
     get camera(): Camera;
     get cameraState(): CameraState;
@@ -200,6 +211,8 @@ export declare class WindowManager extends InvisiblePlugin<WindowMangerAttribute
     get prefersColorScheme(): TeleBoxColorScheme | undefined;
     get focused(): string | undefined;
     get mainViewSceneIndex(): number;
+    get mainViewSceneDir(): string;
+    get topApp(): string | undefined;
     /**
      * 查询所有的 App
      */
@@ -232,6 +245,7 @@ export declare class WindowManager extends InvisiblePlugin<WindowMangerAttribute
     private isDynamicPPT;
     private static checkVersion;
     private ensureAttributes;
+    private _removeScenes;
 }
 export * from "./typings";
 export { BuiltinApps } from "./BuiltinApps";