@netless/telebox-insider 1.0.0-alpha.16 → 1.0.0-alpha.19

package/src/TeleBox/index.ts

@@ -43,7 +43,7 @@ import type {
     TeleBoxDelegateEventConfig,
     TeleBoxRect,
 } from "./typings";
-import { TeleStage } from "../TeleStage";
+import { calcStageRect } from "./utils";
 
 export * from "./constants";
 export * from "./typings";
@@ -57,8 +57,10 @@ type ValConfig = {
     visible: Val<RequiredTeleBoxConfig["visible"], boolean>;
     resizable: Val<RequiredTeleBoxConfig["resizable"], boolean>;
     draggable: Val<RequiredTeleBoxConfig["draggable"], boolean>;
-    ratio: Val<RequiredTeleBoxConfig["ratio"], boolean>;
-    stageRatio: Val<number | null>;
+    boxRatio: Val<RequiredTeleBoxConfig["boxRatio"], boolean>;
+    contentStageRatio: Val<number | null>;
+    contentStageStyle: Val<string | null>;
+    contentStyle: Val<string | null>;
 };
 
 type PropsValConfig = {
@@ -69,6 +71,8 @@ type PropsValConfig = {
     readonly: RequiredTeleBoxConfig["readonly$"];
     rootRect: RequiredTeleBoxConfig["rootRect$"];
     managerStageRect: RequiredTeleBoxConfig["managerStageRect$"];
+    managerStageStyle: RequiredTeleBoxConfig["managerStageStyle$"];
+    managerContainerStyle: RequiredTeleBoxConfig["managerContainerStyle$"];
     collectorRect: RequiredTeleBoxConfig["collectorRect$"];
 };
 
@@ -77,7 +81,7 @@ type MyReadonlyValConfig = {
     focus: Val<RequiredTeleBoxConfig["focus"], boolean>;
 
     $userContent: Val<TeleBoxConfig["content"], boolean>;
-    $userStage: Val<TeleBoxConfig["content"], boolean>;
+    $userStage: Val<TeleBoxConfig["stage"], boolean>;
     $userFooter: Val<TeleBoxConfig["footer"], boolean>;
     $userStyles: Val<TeleBoxConfig["styles"], boolean>;
 
@@ -88,10 +92,8 @@ type MyReadonlyValConfig = {
     pxIntrinsicSize: ReadonlyVal<TeleBoxSize, boolean>;
     pxIntrinsicCoord: ReadonlyVal<TeleBoxCoord, boolean>;
     state: ReadonlyVal<TeleBoxState, boolean>;
-    highlightStage: ReadonlyVal<boolean, boolean>;
-    boxHighlightStage: Val<boolean | null, boolean>;
     contentRect: Val<TeleBoxRect>;
-    contentStageRect: ReadonlyVal<TeleBoxRect | null>;
+    contentStageRect: ReadonlyVal<TeleBoxRect>;
 };
 
 type CombinedValEnhancedResult = ReadonlyValEnhancedResult<
@@ -115,27 +117,29 @@ export class TeleBox {
         y = 0.1,
         resizable = true,
         draggable = true,
-        ratio = -1,
+        boxRatio = -1,
         focus = false,
         zIndex = 100,
-        stageRatio = null,
+        contentStageRatio = null,
         titleBar,
         content,
         stage,
         footer,
         styles,
-        highlightStage = null,
+        contentStyle = null,
+        contentStageStyle = null,
         darkMode$,
         fence$,
         minimized$,
         maximized$,
         readonly$,
-        root$,
+        root,
         rootRect$,
         managerStageRect$,
         managerStageRatio$,
+        managerContainerStyle$,
+        managerStageStyle$,
         collectorRect$,
-        managerHighlightStage$,
     }: TeleBoxConfig) {
         this._sideEffect = new SideEffectManager();
 
@@ -149,7 +153,7 @@ export class TeleBox {
         const visible$ = new Val(visible);
         const resizable$ = new Val(resizable);
         const draggable$ = new Val(draggable);
-        const ratio$ = new Val(ratio);
+        const boxRatio$ = new Val(boxRatio);
         const zIndex$ = new Val(zIndex);
         const focus$ = new Val(focus);
         const $userContent$ = new Val(content);
@@ -216,46 +220,30 @@ export class TeleBox {
         const pxIntrinsicCoord$ = combine(
             [intrinsicCoord$, managerStageRect$],
             ([intrinsicCoord, managerStageRect]) => ({
-                x:
-                    intrinsicCoord.x * managerStageRect.width +
-                    managerStageRect.x,
-                y:
-                    intrinsicCoord.y * managerStageRect.height +
-                    managerStageRect.y,
+                x: intrinsicCoord.x * managerStageRect.width,
+                y: intrinsicCoord.y * managerStageRect.height,
             }),
             { compare: shallowequal }
         );
 
-        const boxHighlightStage$ = new Val<boolean | null, boolean>(
-            highlightStage
-        );
-
-        const highlightStage$ = combine(
-            [boxHighlightStage$, managerHighlightStage$],
-            ([boxHighlightStage, managerHighlightStage]) =>
-                boxHighlightStage ?? managerHighlightStage
-        );
+        const contentStyle$ = new Val<string | null>(contentStyle);
+        const contentStageStyle$ = new Val<string | null>(contentStageStyle);
 
         const contentRoot$ = new Val<HTMLElement | null>(null);
-
-        const contentRect$ = new Val<TeleBoxRect>(rootRect$.value, {
+        const contentRect$ = new Val<TeleBoxRect>(managerStageRect$.value, {
             compare: shallowequal,
         });
-
-        const stageRatio$ = new Val(stageRatio);
-
-        const teleStage = new TeleStage({
-            namespace,
-            root$: contentRoot$,
-            rootRect$: contentRect$,
-            ratio$: combine(
-                [stageRatio$, managerStageRatio$],
-                ([stageRatio, managerStageRatio]) =>
-                    stageRatio ?? managerStageRatio
-            ),
-            highlightStage$,
-        });
-        this._sideEffect.addDisposer(() => teleStage.destroy());
+        const contentStageRatio$ = new Val(contentStageRatio);
+        const finalStageRatio$ = combine(
+            [contentStageRatio$, managerStageRatio$],
+            ([contentStageRatio, managerStageRatio]) =>
+                contentStageRatio ?? managerStageRatio
+        );
+        const contentStageRect$ = combine(
+            [contentRect$, finalStageRatio$],
+            calcStageRect,
+            { compare: shallowequal }
+        );
 
         const propsValConfig: PropsValConfig = {
             darkMode: darkMode$,
@@ -265,6 +253,8 @@ export class TeleBox {
             readonly: readonly$,
             rootRect: rootRect$,
             managerStageRect: managerStageRect$,
+            managerContainerStyle: managerContainerStyle$,
+            managerStageStyle: managerStageStyle$,
             collectorRect: collectorRect$,
         };
 
@@ -286,10 +276,8 @@ export class TeleBox {
             intrinsicCoord: intrinsicCoord$,
             pxIntrinsicSize: pxIntrinsicSize$,
             pxIntrinsicCoord: pxIntrinsicCoord$,
-            highlightStage: highlightStage$,
-            boxHighlightStage: boxHighlightStage$,
             contentRect: contentRect$,
-            contentStageRect: teleStage.stageRect$,
+            contentStageRect: contentStageRect$,
         };
 
         withReadonlyValueEnhancer(this, myReadonlyValConfig, valManager);
@@ -299,8 +287,10 @@ export class TeleBox {
             visible: visible$,
             resizable: resizable$,
             draggable: draggable$,
-            ratio: ratio$,
-            stageRatio: stageRatio$,
+            boxRatio: boxRatio$,
+            contentStageRatio: contentStageRatio$,
+            contentStyle: contentStyle$,
+            contentStageStyle: contentStageStyle$,
         };
 
         withValueEnhancer(this, valConfig, valManager);
@@ -317,14 +307,13 @@ export class TeleBox {
             });
 
         this._sideEffect.addDisposer(
-            ratio$.subscribe((ratio) => {
-                if (ratio > 0) {
+            boxRatio$.subscribe((boxRatio) => {
+                if (boxRatio > 0) {
                     this.transform(
                         pxIntrinsicCoord$.value.x,
                         pxIntrinsicCoord$.value.y,
                         pxIntrinsicSize$.value.width,
-                        pxIntrinsicSize$.value.height,
-                        true
+                        pxIntrinsicSize$.value.height
                     );
                 }
             })
@@ -335,15 +324,15 @@ export class TeleBox {
                 if (fence) {
                     this.move(
                         pxIntrinsicCoord$.value.x,
-                        pxIntrinsicCoord$.value.y,
-                        true
+                        pxIntrinsicCoord$.value.y
                     );
                 }
             })
         );
 
-        this.$box = this.render();
+        this.$box = this._render();
         contentRoot$.setValue(this.$content.parentElement);
+        root.appendChild(this.$box);
 
         const watchValEvent = <E extends TeleBoxEvent>(
             val: ReadonlyVal<TeleBoxEventConfig[E], boolean>,
@@ -380,13 +369,6 @@ export class TeleBox {
                     );
                 }
             }),
-            root$.subscribe((root) => {
-                if (root) {
-                    root.appendChild(this.$box);
-                } else if (this.$box.parentNode) {
-                    this.$box.remove();
-                }
-            }),
         ]);
     }
 
@@ -492,34 +474,25 @@ export class TeleBox {
         const pxIntrinsicSize = this.pxIntrinsicSize;
 
         if (this.fence) {
-            safeX = clamp(
-                x,
-                managerStageRect.x,
-                managerStageRect.x +
-                    managerStageRect.width -
-                    pxIntrinsicSize.width
-            );
+            safeX = clamp(x, 0, managerStageRect.width - pxIntrinsicSize.width);
             safeY = clamp(
                 y,
-                managerStageRect.y,
-                managerStageRect.y +
-                    managerStageRect.height -
-                    pxIntrinsicSize.height
+                0,
+                managerStageRect.height - pxIntrinsicSize.height
             );
         } else {
-            const rootRect = this.rootRect;
             safeX = clamp(
                 x,
-                0 - pxIntrinsicSize.width + 20,
-                0 + rootRect.width - 20
+                -(pxIntrinsicSize.width - 120),
+                0 + managerStageRect.width - 20
             );
-            safeY = clamp(y, 0, 0 + rootRect.height - 20);
+            safeY = clamp(y, 0, 0 + managerStageRect.height - 20);
         }
 
         this._intrinsicCoord$.setValue(
             {
-                x: (safeX - managerStageRect.x) / managerStageRect.width,
-                y: (safeY - managerStageRect.y) / managerStageRect.height,
+                x: safeX / managerStageRect.width,
+                y: safeY / managerStageRect.height,
             },
             skipUpdate
         );
@@ -542,21 +515,20 @@ export class TeleBox {
         skipUpdate = false
     ): void {
         const managerStageRect = this.managerStageRect;
-        const rootRect = this.rootRect;
 
         width = Math.max(width, this.pxMinSize.width);
         height = Math.max(height, this.pxMinSize.height);
 
-        if (this.ratio > 0) {
-            const newHeight = this.ratio * width;
+        if (this.boxRatio > 0) {
+            const newHeight = this.boxRatio * width;
             if (y !== this.pxIntrinsicCoord.y) {
                 y -= newHeight - height;
             }
             height = newHeight;
         }
 
-        if (y < rootRect.y) {
-            y = rootRect.y;
+        if (y < 0) {
+            y = 0;
             height = this.pxIntrinsicSize.height;
         }
 
@@ -628,11 +600,6 @@ export class TeleBox {
         this._$userStyles$.setValue(undefined);
     }
 
-    /** Show stage frame and grey-out the non-stage area. Inherit setting from manager if null. */
-    setHighlightStage(highlightStage: boolean | null): void {
-        this._boxHighlightStage$.setValue(highlightStage);
-    }
-
     /** DOM of the box */
     public $box: HTMLElement;
 
@@ -648,7 +615,7 @@ export class TeleBox {
     /** DOM of the box footer */
     public $footer!: HTMLElement;
 
-    protected render(): HTMLElement {
+    private _render(): HTMLElement {
         if (this.$box) {
             return this.$box;
         }
@@ -736,6 +703,8 @@ export class TeleBox {
                 this._pxIntrinsicSize$,
                 this._pxIntrinsicCoord$,
                 this._collectorRect$,
+                this._rootRect$,
+                this._managerStageRect$,
             ],
             ([
                 maximized,
@@ -743,28 +712,30 @@ export class TeleBox {
                 pxIntrinsicSize,
                 pxIntrinsicCoord,
                 collectorRect,
+                rootRect,
+                managerStageRect,
             ]) => {
                 const styles: {
                     x: number;
                     y: number;
-                    width: string;
-                    height: string;
+                    width: number;
+                    height: number;
                     scaleX: number;
                     scaleY: number;
                 } = maximized
                     ? {
-                          x: 0,
-                          y: 0,
-                          width: "100%",
-                          height: "100%",
+                          x: -managerStageRect.x,
+                          y: -managerStageRect.y,
+                          width: rootRect.width,
+                          height: rootRect.height,
                           scaleX: 1,
                           scaleY: 1,
                       }
                     : {
                           x: pxIntrinsicCoord.x,
                           y: pxIntrinsicCoord.y,
-                          width: pxIntrinsicSize.width + "px",
-                          height: pxIntrinsicSize.height + "px",
+                          width: pxIntrinsicSize.width,
+                          height: pxIntrinsicSize.height,
                           scaleX: 1,
                           scaleY: 1,
                       };
@@ -775,11 +746,13 @@ export class TeleBox {
                     styles.x =
                         collectorRect.x -
                         boxWidth / 2 +
-                        collectorRect.width / 2;
+                        collectorRect.width / 2 -
+                        managerStageRect.x;
                     styles.y =
                         collectorRect.y -
                         boxHeight / 2 +
-                        collectorRect.height / 2;
+                        collectorRect.height / 2 -
+                        managerStageRect.y;
                     styles.scaleX = collectorRect.width / boxWidth;
                     styles.scaleY = collectorRect.height / boxHeight;
                 }
@@ -789,8 +762,8 @@ export class TeleBox {
         );
 
         const boxStyles = boxStyles$.value;
-        this.$box.style.width = boxStyles.width;
-        this.$box.style.height = boxStyles.height;
+        this.$box.style.width = boxStyles.width + "px";
+        this.$box.style.height = boxStyles.height + "px";
         // Add 10px offset on first frame
         // which creates a subtle moving effect
         this.$box.style.transform = `translate(${boxStyles.x - 10}px,${
@@ -819,20 +792,44 @@ export class TeleBox {
         $content.className =
             this.wrapClassName("content") + " tele-fancy-scrollbar";
         this.$content = $content;
+        this._sideEffect.addDisposer(
+            combine(
+                [this._contentStyle$, this._managerContainerStyle$],
+                ([contentStyle, managerContainerStyle]) =>
+                    contentStyle ?? managerContainerStyle
+            ).subscribe((style) => ($content.style.cssText = style))
+        );
 
+        const updateContentRect = (): void => {
+            const rect = $content.getBoundingClientRect();
+            this._contentRect$.setValue({
+                x: 0,
+                y: 0,
+                width: rect.width,
+                height: rect.height,
+            });
+        };
         this._sideEffect.add(() => {
             const observer = new ResizeObserver(() => {
-                const rect = $content.getBoundingClientRect();
-                this._contentRect$.setValue({
-                    x: 0,
-                    y: 0,
-                    width: rect.width,
-                    height: rect.height,
-                });
+                if (!this.minimized) {
+                    updateContentRect();
+                }
             });
             observer.observe($content);
             return () => observer.disconnect();
         });
+        this._sideEffect.addDisposer(
+            this._minimized$.reaction((minimized) => {
+                // correct content size when restoring from minimized
+                if (!minimized) {
+                    this._sideEffect.setTimeout(
+                        updateContentRect,
+                        400,
+                        "minimized-content-rect-fix"
+                    );
+                }
+            })
+        );
 
         this._sideEffect.add(() => {
             let last$userStyles: HTMLStyleElement | undefined;
@@ -869,21 +866,8 @@ export class TeleBox {
                 last$userStage = $userStage;
                 if ($userStage) {
                     if (!this.$stage) {
-                        const $stage = document.createElement("div");
-                        this.$stage = $stage;
-                        $stage.className = this.wrapClassName("content-stage");
-                        this._sideEffect.addDisposer(
-                            this._contentStageRect$.subscribe((rect) => {
-                                if (rect) {
-                                    $stage.style.top = rect.y + "px";
-                                    $stage.style.left = rect.x + "px";
-                                    $stage.style.width = rect.width + "px";
-                                    $stage.style.height = rect.height + "px";
-                                }
-                            }),
-                            "content-stage-rect"
-                        );
-                        $content.appendChild($stage);
+                        this.$stage = this._renderStage();
+                        $content.appendChild(this.$stage);
                     }
                     if (!this.$stage.parentElement) {
                         $content.appendChild(this.$stage);
@@ -923,13 +907,42 @@ export class TeleBox {
         return this.$box;
     }
 
-    protected _handleTrackStart?: (ev: MouseEvent | TouchEvent) => void;
+    private _renderStage(): HTMLDivElement {
+        const $stage = document.createElement("div");
+
+        $stage.className = this.wrapClassName("content-stage");
+        const updateContentStageRect = (
+            contentStageRect: TeleBoxRect
+        ): void => {
+            $stage.style.top = contentStageRect.y + "px";
+            $stage.style.left = contentStageRect.x + "px";
+            $stage.style.width = contentStageRect.width + "px";
+            $stage.style.height = contentStageRect.height + "px";
+        };
+        this._sideEffect.addDisposer(
+            [
+                combine(
+                    [this._contentStageStyle$, this._managerStageStyle$],
+                    ([contentStageStyle, managerStageStyle]) =>
+                        contentStageStyle ?? managerStageStyle
+                ).subscribe((styles) => {
+                    $stage.style.cssText = styles;
+                    updateContentStageRect(this._contentStageRect$.value);
+                }),
+                this._contentStageRect$.subscribe(updateContentStageRect),
+            ],
+            "content-stage-styles"
+        );
+        return $stage;
+    }
+
+    private _handleTrackStart?: (ev: MouseEvent | TouchEvent) => void;
 
     public handleTrackStart: (ev: MouseEvent | TouchEvent) => void = (ev) => {
         return this._handleTrackStart?.(ev);
     };
 
-    protected _renderResizeHandlers(): void {
+    private _renderResizeHandlers(): void {
         const $resizeHandles = document.createElement("div");
         $resizeHandles.className = this.wrapClassName("resize-handles");
 
@@ -970,8 +983,8 @@ export class TeleBox {
             preventEvent(ev);
 
             let { pageX, pageY } = flattenEvent(ev);
-            if (pageY < this.rootRect.y) {
-                pageY = this.rootRect.y;
+            if (pageY < 0) {
+                pageY = 0;
             }
 
             const offsetX = pageX - trackStartPageX;
@@ -1183,12 +1196,13 @@ export type ReadonlyTeleBox = Pick<
     | "unmountStage"
     | "mountStyles"
     | "unmountStyles"
-    | "setStageRatio"
+    | "setContentStageRatio"
+    | "setContentStageStyle"
+    | "setContentStyle"
     | "setDraggable"
     | "setResizable"
-    | "setHighlightStage"
     | "setTitle"
-    | "setRatio"
+    | "setBoxRatio"
     | "setVisible"
     | "handleTrackStart"
     | "onValChanged"

package/src/TeleBox/style.scss

@@ -18,7 +18,6 @@
     display: flex;
     flex-direction: column;
     overflow: hidden;
-    background: #f9f9fc;
     box-shadow: 0px 4px 10px 0px rgba(47, 65, 146, 0.15);
     border-radius: 6px;
     border: 1px solid #e3e3ec;
@@ -44,10 +43,15 @@
     width: 100%;
     height: 100%;
     position: relative;
+    background: $color-container-background;
 }
 
 .#{$namespace}-content-stage {
     position: absolute;
+    z-index: 1;
+    overflow: hidden;
+    background: $color-stage-background;
+    box-shadow: $color-stage-shadow;
 }
 
 .#{$namespace}-footer-wrap {
@@ -216,7 +220,15 @@
 
     .#{$namespace}-box-main {
         color: #e9e9e9;
-        background: #212126;
         border-color: #43434d;
     }
+
+    .#{$namespace}-content {
+        background: $color-container-background-dark;
+    }
+
+    .#{$namespace}-content-stage {
+        background: $color-stage-background-dark;
+        box-shadow: $color-stage-shadow-dark;
+    }
 }

package/src/TeleBox/typings.ts

@@ -51,13 +51,13 @@ export interface TeleBoxConfig {
     /** Able to drag box window Default true. */
     readonly draggable?: boolean;
     /** Fixed height/width ratio for box window. No ratio limit if <= 0. Default -1. */
-    readonly ratio?: number;
+    readonly boxRatio?: number;
     /** Box focused. */
     readonly focus?: boolean;
     /** Base z-index for box. */
     readonly zIndex?: number;
-    /** Box stage ratio. Follow manager stage ratio if null. Default null. */
-    readonly stageRatio?: number | null;
+    /** Box content stage ratio. Follow manager stage ratio if null. Default null. */
+    readonly contentStageRatio?: number | null;
     /** Classname Prefix. For CSS styling. Default "telebox". */
     readonly namespace?: string;
     /** TeleTitleBar Instance. */
@@ -70,8 +70,10 @@ export interface TeleBoxConfig {
     readonly footer?: HTMLElement;
     /** Box content styles. */
     readonly styles?: HTMLStyleElement;
-    /** Show stage frame and grey-out the non-stage area. Inherit setting from manager if null. Default null. */
-    readonly highlightStage?: boolean | null;
+    /** Custom styles for box content container. Inherit from manager container style if null. Default null. */
+    readonly contentStyle?: string | null;
+    /** Custom styles for box content stage. Inherit from manager stage style if null. Default null. */
+    readonly contentStageStyle?: string | null;
     /** Actual Box Dark Mode */
     readonly darkMode$: ReadonlyVal<boolean, boolean>;
     /** Restrict box to always be within the stage area. Default false. */
@@ -83,17 +85,19 @@ export interface TeleBoxConfig {
     /** Is box readonly */
     readonly readonly$: ReadonlyVal<boolean, boolean>;
     /** Root element to mount boxes */
-    readonly root$: ReadonlyVal<HTMLElement | null>;
+    readonly root: HTMLElement;
     /** Position and dimension of root element */
     readonly rootRect$: ReadonlyVal<TeleBoxRect>;
     /** Position and dimension of stage area */
     readonly managerStageRect$: ReadonlyVal<TeleBoxRect>;
     /** Stage area height/with ratio. No ratio if <= 0. */
     readonly managerStageRatio$: ReadonlyVal<number, boolean>;
+    /** Custom container styles from manager */
+    readonly managerContainerStyle$: ReadonlyVal<string>;
+    /** Custom stage styles from manager */
+    readonly managerStageStyle$: ReadonlyVal<string>;
     /** Position and dimension of collector */
     readonly collectorRect$: ReadonlyVal<TeleBoxRect | undefined>;
-    /** highlight stage settings from manager */
-    readonly managerHighlightStage$: ReadonlyVal<boolean>;
 }
 
 type CheckTeleBoxConfig<T extends Record<`${TELE_BOX_EVENT}`, any>> = T;

package/src/TeleBox/utils.ts

@@ -0,0 +1,32 @@
+import type { TeleBoxRect } from "./typings";
+
+export function calcStageRect([rootRect, ratio]: [
+    TeleBoxRect,
+    number
+]): TeleBoxRect {
+    if (ratio <= 0 || rootRect.width <= 0 || rootRect.height <= 0) {
+        return rootRect;
+    }
+
+    const preferredHeight = rootRect.width * ratio;
+    if (preferredHeight === rootRect.height) {
+        return rootRect;
+    }
+
+    if (preferredHeight < rootRect.height) {
+        return {
+            x: 0,
+            y: (rootRect.height - preferredHeight) / 2,
+            width: rootRect.width,
+            height: preferredHeight,
+        };
+    }
+
+    const preferredWidth = rootRect.height / ratio;
+    return {
+        x: (rootRect.width - preferredWidth) / 2,
+        y: 0,
+        width: preferredWidth,
+        height: rootRect.height,
+    };
+}