@netless/window-manager 1.0.0-canary.26 → 1.0.0-canary.29

package/src/App/AppContext.ts

@@ -107,7 +107,7 @@ export class AppContext<TAttributes = any, TMagixEventPayloads = any, TAppOption
         const viewWrapper = document.createElement("div");
         this._viewWrapper = viewWrapper;
         viewWrapper.className = "window-manager-view-wrapper";
-        this.box.$content.parentElement?.appendChild(viewWrapper);
+        this.box.$main.appendChild(viewWrapper);
         view.divElement = viewWrapper;
         this.appProxy.fireMemberStateChange();
         if (this.isAddApp) {
@@ -115,7 +115,7 @@ export class AppContext<TAttributes = any, TMagixEventPayloads = any, TAppOption
         }
         this.whiteBoardView = new WhiteBoardView(view, this, this.appProxy, this.ensurePageSize);
         this.appProxy.sideEffectManager.add(() => [
-            this.box._contentStageRect$.subscribe(rect => {
+            this.box._stageRect$.subscribe(rect => {
                 viewWrapper.style.left = `${rect.x}px`;
                 viewWrapper.style.top = `${rect.y}px`;
                 viewWrapper.style.width = `${rect.width}px`;

package/src/App/AppProxy.ts

@@ -32,9 +32,10 @@ import type {
 import type { SceneState, View, SceneDefinition,  MemberState} from "white-web-sdk";
 import type { AppManager } from "../AppManager";
 import type { NetlessApp } from "../typings";
-import type { ReadonlyTeleBox, TeleBoxRect } from "@netless/telebox-insider";
+import type { ReadonlyTeleBox, TeleBox, TeleBoxRect } from "@netless/telebox-insider";
 import type { PageRemoveService, PageState } from "../Page";
 import type { AppState } from "./type";
+import { callbacks } from "../callback";
 
 export type AppEmitter = Emittery<AppEmitterEvent>;
 
@@ -142,10 +143,10 @@ export class AppProxy implements PageRemoveService {
                                 });
                                 this.camera$.setValue(toJS(this.appAttributes.camera));
                             }
-                            if (!this.size$.value && box.contentStageRect) {
-                                const initialRect = this.computedInitialRect(box.contentStageRect);
-                                const width = initialRect?.width || box.contentStageRect.width;
-                                const height = initialRect?.height || box.contentStageRect.height;
+                            if (!this.size$.value && box.stageRect) {
+                                const initialRect = this.computedInitialRect(box.stageRect);
+                                const width = initialRect?.width || box.stageRect.width;
+                                const height = initialRect?.height || box.stageRect.height;
                                 this.storeSize({
                                     id: this.uid,
                                     width,
@@ -158,7 +159,7 @@ export class AppProxy implements PageRemoveService {
                                 view$: this.view$,
                                 camera$: this.camera$,
                                 size$: this.size$,
-                                stageRect$: box._contentStageRect$,
+                                stageRect$: box._stageRect$,
                                 storeCamera: this.storeCamera,
                                 storeSize: this.storeSize
                             });
@@ -341,7 +342,11 @@ export class AppProxy implements PageRemoveService {
                 options,
                 canOperate: this.manager.canOperate,
                 smartPosition: this.isAddApp,
-            });
+            }) as TeleBox;
+            const registerParams = appRegister.registered.get(this.kind);
+            if (registerParams?.contentStyles) {
+                box?.mountUserStyles(registerParams.contentStyles);
+            }
             this.box$.setValue(box);
             if (this.isAddApp && this.box) {
                 this.store.updateAppState(appId, AppAttributes.ZIndex, this.box.zIndex);
@@ -526,6 +531,7 @@ export class AppProxy implements PageRemoveService {
     }
 
     public setViewFocusScenePath() {
+        if (this.status === "destroyed") return;
         const fullPath = this.getFullScenePath();
         if (fullPath && this.view) {
             setViewFocusScenePath(this.view, fullPath);
@@ -626,6 +632,7 @@ export class AppProxy implements PageRemoveService {
         this.status = "destroyed";
         try {
             await appRegister.notifyApp(this.kind, "destroy", { appId: this.id });
+            callbacks.emit("appClose", { appId: this.id, kind: this.kind, error });
             await this.appEmitter.emit("destroy", { error });
         } catch (error) {
             console.error("[WindowManager]: notifyApp error", error.message, error.stack);

package/src/App/WhiteboardView.ts

@@ -6,15 +6,17 @@ import type { ReadonlyVal } from "value-enhancer";
 import type { AddPageParams, PageController, PageState } from "../Page";
 import type { AppProxy } from "./AppProxy";
 import type { AppContext } from "./AppContext";
-import type { View } from "white-web-sdk";
+import type { Camera, View } from "white-web-sdk";
 import type { TeleBoxRect } from "@netless/telebox-insider";
-import type { ICamera } from "../AttributesDelegate";
+import type { ICamera, ISize } from "../AttributesDelegate";
 
 export type WhiteBoardViewCamera = Omit<ICamera, "id">;
+export type WhiteBoardViewRect = Omit<ISize, "id">;
 
 export class WhiteBoardView implements PageController {
     public readonly pageState$: ReadonlyVal<PageState>;
     public readonly baseCamera$: ReadonlyVal<WhiteBoardViewCamera>;
+    public readonly baseRect$: ReadonlyVal<WhiteBoardViewRect | undefined>;
 
     constructor(
         public view: View,
@@ -23,23 +25,26 @@ export class WhiteBoardView implements PageController {
         public ensureSize: (size: number) => void
     ) {
         const pageState$ = new Val<PageState>(appProxy.pageState);
+        const baseRect$ = new Val<WhiteBoardViewRect | undefined>(appProxy.size$.value);
+        const pickCamera = (camera: Camera | ICamera) =>
+            pick(camera, ["centerX", "centerY", "scale"]);
+        const camera$ = new Val<WhiteBoardViewCamera>(pickCamera(this.view.camera));
+        this.baseRect$ = baseRect$;
         this.pageState$ = pageState$;
-        this.appProxy.sideEffectManager.add(() =>
-            appProxy.appEmitter.on("pageStateChange", pageState => {
-                pageState$.setValue(pageState);
-            })
-        );
-        const camera$ = new Val<WhiteBoardViewCamera>(
-            pick(this.view.camera, ["centerX", "centerY", "scale"])
-        );
         this.baseCamera$ = camera$;
-        this.appProxy.sideEffectManager.add(() =>
+        this.appProxy.sideEffectManager.add(() => [
+            appProxy.appEmitter.on("pageStateChange", pageState => pageState$.setValue(pageState)),
             appProxy.camera$.subscribe(camera => {
                 if (camera) {
-                    camera$.setValue(pick(camera, ["centerX", "centerY", "scale"]));
+                    camera$.setValue(pickCamera(camera));
                 }
-            })
-        );
+            }),
+            appProxy.size$.subscribe(size => {
+                if (size) {
+                    baseRect$.setValue(pick(size, ["width", "height"]));
+                }
+            }),
+        ]);
         view.disableCameraTransform = true;
     }
 

package/src/BoxManager.ts

@@ -3,6 +3,7 @@ import { debounce } from "lodash";
 import { SideEffectManager } from "side-effect-manager";
 import { TELE_BOX_STATE, TeleBoxManager } from "@netless/telebox-insider";
 import { WindowManager } from "./index";
+import type { Writeable } from "./typings";
 import type { BoxEmitterType } from "./BoxEmitter";
 import type { AddAppOptions } from "./index";
 import type {
@@ -20,7 +21,6 @@ import type { View } from "white-web-sdk";
 import type { CallbacksType } from "./callback";
 import type { EmitterType } from "./InternalEmitter";
 import type { AppState } from "./App/type";
-import { Val } from "value-enhancer";
 
 export { TELE_BOX_STATE };
 
@@ -49,7 +49,8 @@ export type CreateTeleBoxManagerConfig = {
     collectorStyles?: Partial<CSSStyleDeclaration>;
     prefersColorScheme?: TeleBoxColorScheme;
     stageRatio?: number;
-    highlightStage?: boolean;
+    containerStyle?: string;
+    stageStyle?: string;
 };
 
 export type BoxManagerContext = {
@@ -92,8 +93,6 @@ export class BoxManager {
     public teleBoxManager: TeleBoxManager;
     protected sideEffectManager: SideEffectManager;
 
-    public mainViewElement$ = new Val<HTMLElement | undefined>(undefined);
-
     constructor(
         private context: BoxManagerContext,
         createTeleBoxManagerConfig?: CreateTeleBoxManagerConfig
@@ -172,28 +171,12 @@ export class BoxManager {
             this.teleBoxManager.events.on("z_index", box => {
                 this.context.updateAppState(box.id, AppAttributes.ZIndex, box.zIndex);
             }),
-            this.teleBoxManager._stageRect$.subscribe(stage => {
-                this.updateStyle(this.mainViewElement$.value, stage);
-                emitter.emit("playgroundSizeChange", stage);
-                this.context.notifyContainerRectUpdate(stage);
-            }),
-            emitter.on("writableChange", isWritable => {
-                this.teleBoxManager.setHighlightStage(isWritable);
-            }),
             emitter.on("containerSizeRatioUpdate", ratio => {
                 this.teleBoxManager._stageRatio$.setValue(ratio);
             }),
         ]);
     }
 
-    private updateStyle = (element: HTMLElement | undefined, rect: TeleBoxRect) => {
-        if (!element) return;
-        element.style.width = rect.width + "px";
-        element.style.height = rect.height + "px";
-        element.style.left = rect.x + "px";
-        element.style.top = rect.y + "px";
-    }
-
     private get canOperate() {
         return this.context.canOperate();
     }
@@ -232,7 +215,8 @@ export class BoxManager {
 
     public createBox(params: CreateBoxParams): ReadonlyTeleBox | undefined {
         if (!this.teleBoxManager) return;
-        let { minwidth = MIN_WIDTH, minheight = MIN_HEIGHT } = params.app.config ?? {};
+        // eslint-disable-next-line prefer-const
+        let { minwidth = MIN_WIDTH, minheight = MIN_HEIGHT, enableShadowDOM = true } = params.app.config ?? {};
         const { width, height } = params.app.config ?? {};
         const title = params.options?.title || params.appId;
         const rect = this.teleBoxManager.rootRect;
@@ -252,6 +236,7 @@ export class BoxManager {
             width,
             height,
             id: params.appId,
+            enableShadowDOM,
         };
         const box = this.teleBoxManager.create(createBoxConfig, params.smartPosition);
         this.context.emitter.emit(`${params.appId}${Events.WindowCreated}` as any);
@@ -262,14 +247,21 @@ export class BoxManager {
         createTeleBoxManagerConfig?: CreateTeleBoxManagerConfig
     ): TeleBoxManager {
         const root = WindowManager.playground;
-        const initManagerState: TeleBoxManagerConfig = {
+        const initManagerState: Writeable<TeleBoxManagerConfig> = {
             stageRatio: createTeleBoxManagerConfig?.stageRatio,
             root: root,
             fence: false,
             prefersColorScheme: createTeleBoxManagerConfig?.prefersColorScheme,
-            highlightStage: createTeleBoxManagerConfig?.highlightStage,
         };
 
+        if (createTeleBoxManagerConfig?.containerStyle) {
+            initManagerState.containerStyle = createTeleBoxManagerConfig.containerStyle;
+        }
+
+        if (createTeleBoxManagerConfig?.stageStyle) {
+            initManagerState.stageStyle = createTeleBoxManagerConfig.stageStyle;
+        }
+
         const manager = new TeleBoxManager(initManagerState);
         if (this.teleBoxManager) {
             this.teleBoxManager.destroy();
@@ -311,17 +303,15 @@ export class BoxManager {
         if (!state) return;
         const box = this.getBox(state.id);
         if (box) {
-            this.teleBoxManager.update(
-                box.id,
-                {
-                    x: state.position?.x,
-                    y: state.position?.y,
-                    width: state.size?.width || 0.5,
-                    height: state.size?.height || 0.5,
-                    zIndex: state.zIndex,
-                },
-                true
-            );
+            if (state.size) {
+                box._intrinsicSize$.setValue(state.size, true);
+            }
+            if (state.position) {
+                box._intrinsicCoord$.setValue(state.position, true);
+            }
+            if (state.zIndex) {
+                box._zIndex$.setValue(state.zIndex, true);
+            }
             setTimeout(() => {
                 if (state.focus) {
                     this.teleBoxManager.focusBox(box.id, true);
@@ -338,7 +328,10 @@ export class BoxManager {
     }
 
     public moveBox({ appId, x, y }: MoveBoxParams): void {
-        this.teleBoxManager.update(appId, { x, y }, true);
+        const box = this.getBox(appId);
+        if (box) {
+            box._intrinsicCoord$.setValue({ x, y}, true);
+        }
     }
 
     public focusBox({ appId }: AppId, skipUpdate = true): void {
@@ -346,7 +339,10 @@ export class BoxManager {
     }
 
     public resizeBox({ appId, width, height, skipUpdate }: ResizeBoxParams): void {
-        this.teleBoxManager.update(appId, { width, height }, skipUpdate);
+        const box = this.getBox(appId);
+        if (box) {
+            box._intrinsicSize$.setValue({ width, height }, skipUpdate);
+        }
     }
 
     public setBoxMinSize(params: SetBoxMinSizeParams): void {

package/src/BuiltinApps.ts

@@ -21,3 +21,8 @@ export const BuiltinApps = {
     DocsViewer: AppDocsViewer.kind as string,
     MediaPlayer: AppMediaPlayer.kind as string,
 };
+
+export const BuiltinAppsMap = {
+    [BuiltinApps.DocsViewer]: AppDocsViewer,
+    [BuiltinApps.MediaPlayer]: AppMediaPlayer,
+}

package/src/Helper.ts

@@ -7,7 +7,8 @@ import { WindowManager } from "./index";
 import type { Room, RoomMember } from "white-web-sdk";
 
 export const setupWrapper = (
-    root: HTMLElement
+    root: HTMLElement,
+    target: HTMLElement
 ): {
     playground: HTMLDivElement;
     mainViewElement: HTMLDivElement;
@@ -17,7 +18,7 @@ export const setupWrapper = (
 
     const mainViewElement = document.createElement("div");
     mainViewElement.className = "netless-window-manager-main-view";
-    playground.appendChild(mainViewElement);
+    target.appendChild(mainViewElement);
     root.appendChild(playground);
 
     return { playground, mainViewElement };

package/src/Utils/Common.ts

@@ -17,6 +17,9 @@ export const genAppId = async (kind: string) => {
 };
 
 export const setViewFocusScenePath = (view: View, focusScenePath: string) => {
+    if ((view as any).didRelease) {
+        return;
+    }
     if (view.focusScenePath !== focusScenePath) {
         view.focusScenePath = focusScenePath;
         return view;

package/src/View/CameraSynchronizer.ts

@@ -30,13 +30,9 @@ export class CameraSynchronizer {
         this.remoteCamera = camera;
         this.remoteSize = size;
         if (this.remoteSize && this.rect) {
-            let scale: number;
-            if (size.width < size.height) {
-                scale = this.rect.width / size.width;
-            } else {
-                scale = this.rect.height / size.height;
-            }
-            const nextScale = camera.scale * scale;
+            const wScale = this.rect.width / size.width;
+            const hScale = this.rect.height / size.height;
+            const nextScale = camera.scale * Math.min(wScale, hScale);
             const config: Partial<Camera> & { animationMode: AnimationMode } = {
                 scale: nextScale,
                 animationMode: AnimationMode.Continuous,

package/src/callback.ts

@@ -20,6 +20,7 @@ export type PublicEvent = {
     ready: undefined; // 所有 APP 创建完毕时触发
     sceneStateChange: SceneState;
     pageStateChange: PageState;
+    appClose: { appId: string; kind: string, error?: Error };
 };
 
 export type CallbacksType = Emittery<PublicEvent>;

package/src/index.ts

@@ -140,6 +140,8 @@ export type MountParams = {
     collectorContainer?: HTMLElement;
     collectorStyles?: Partial<CSSStyleDeclaration>;
     overwriteStyles?: string;
+    containerStyle?: string;
+    stageStyle?: string;
     cursor?: boolean;
     debug?: boolean;
     disableCameraTransform?: boolean;
@@ -247,7 +249,8 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> imple
             collectorStyles: params.collectorStyles,
             prefersColorScheme: params.prefersColorScheme,
             stageRatio: WindowManager.containerSizeRatio,
-            highlightStage: params.highlightStage
+            containerStyle: params.containerStyle,
+            stageStyle: params.stageStyle,
         });
         manager.appManager?.setBoxManager(manager.boxManager);
         if (params.container) {
@@ -290,12 +293,13 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> imple
 
     private static initContainer(
         container: HTMLElement,
+        target: HTMLElement,
         overwriteStyles: string | undefined
     ) {
         if (!WindowManager.container) {
             WindowManager.container = container;
         }
-        const { playground, mainViewElement } = setupWrapper(container);
+        const { playground, mainViewElement } = setupWrapper(container, target);
         WindowManager.playground = playground;
         if (overwriteStyles) {
             const style = document.createElement("style");
@@ -318,15 +322,16 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> imple
                 container.appendChild(WindowManager.container.firstChild);
             }
         } else {
-            if (WindowManager.params) {
+            const teleboxContainer = this.boxManager?.teleBoxManager.$stage;
+            if (WindowManager.params && teleboxContainer) {
                 const params = WindowManager.params;
                 const mainViewElement = WindowManager.initContainer(
                     container,
+                    teleboxContainer,
                     params.overwriteStyles
                 );
                 if (this.boxManager && WindowManager.playground) {
                     this.boxManager.setRoot(WindowManager.playground);
-                    this.boxManager.mainViewElement$.setValue(mainViewElement);
                 }
                 this.bindMainView(mainViewElement, params.disableCameraTransform);
                 if (WindowManager.playground) {
@@ -941,6 +946,14 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> imple
         emitter.emit("containerSizeRatioUpdate", ratio);
     }
 
+    public setContainerStyle(style: string) {
+        this.boxManager?.teleBoxManager.setContainerStyle(style);
+    }
+
+    public setStageStyle(style: string) {
+        this.boxManager?.teleBoxManager.setStageStyle(style);
+    }
+
     public createPPTHandler() {
         return {
             onPageJumpTo: (_pptUUID: string, index: number) => {
@@ -992,5 +1005,5 @@ setupBuiltin();
 
 export * from "./typings";
 
-export { BuiltinApps } from "./BuiltinApps";
+export { BuiltinApps, BuiltinAppsMap } from "./BuiltinApps";
 export type { PublicEvent } from "./callback";

package/src/style.css

@@ -7,49 +7,11 @@
     user-select: none;
 }
 
-.netless-window-manager-sizer {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    z-index: 1;
-    overflow: hidden;
-    display: flex;
-}
-
-.netless-window-manager-sizer-horizontal {
-    flex-direction: column;
-}
-
-.netless-window-manager-sizer::before,
-.netless-window-manager-sizer::after {
-    flex: 1;
-    content: "";
-    display: block;
-}
-
-.netless-window-manager-chess-sizer::before,
-.netless-window-manager-chess-sizer::after {
-    background-image: linear-gradient(45deg, #b0b0b0 25%, transparent 25%),
-        linear-gradient(-45deg, #b0b0b0 25%, transparent 25%),
-        linear-gradient(45deg, transparent 75%, #b0b0b0 75%),
-        linear-gradient(-45deg, transparent 75%, #b0b0b0 75%);
-    background-color: #fff;
-    background-size: 20px 20px;
-    background-position: 0 0, 0 10px, 10px -10px, -10px 0px;
-}
-
-.netless-window-manager-wrapper {
-    position: relative;
-    z-index: 1;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-}
 
 .netless-window-manager-main-view {
     position: absolute;
+    width: 100%;
+    height: 100%;
 }
 
 
@@ -180,5 +142,5 @@
 
 .window-manager-view-wrapper {
     position: absolute;
-    z-index: 1;
+    z-index: 10;
 }

package/src/typings.ts

@@ -30,6 +30,9 @@ export interface NetlessApp<Attributes = any, MagixEventPayloads = any, AppOptio
 
         /** App only single instance. */
         singleton?: boolean;
+
+        /** App box enableShadowDom. Default true */
+        enableShadowDOM?: boolean;
     };
     setup: (context: AppContext<Attributes, MagixEventPayloads, AppOptions>) => SetupResult;
 }
@@ -74,12 +77,15 @@ export type RegisterParams<AppOptions = any, SetupResult = any, Attributes = any
     addHooks?: (emitter: Emittery<RegisterEvents<SetupResult>>) => void;
     /** dynamic load app package name */
     name?: string;
+    contentStyles?: string;
 };
 
 export type AppListenerKeys = keyof AppEmitterEvent;
 
 export type ApplianceIcons = Partial<Record<ApplianceNames, string>>;
 
+export type Writeable<T> = { -readonly [P in keyof T]: T[P] };
+
 export type { AppContext } from "./App/AppContext";
 export type { WhiteBoardView } from "./App";
 export type { ReadonlyTeleBox, TeleBoxRect };

package/vite.config.js

@@ -1,4 +1,5 @@
 import path from "path";
+import dts from 'vite-plugin-dts'
 import { defineConfig } from 'vitest/config'
 import { svelte } from "@sveltejs/vite-plugin-svelte";
 import { dependencies, peerDependencies, version, devDependencies } from "./package.json"
@@ -28,7 +29,8 @@ export default defineConfig(({ mode }) => {
                 experimental: {
                     useVitePreprocess: true,
                 },
-            })
+            }),
+            dts()
         ],
         build: {
             lib: {
@@ -45,7 +47,7 @@ export default defineConfig(({ mode }) => {
                     ...peerDependencies,
                 }),
             },
-            minify: isProd,
+            minify: isProd
         },
     };
-});
+})