@netless/telebox-insider 1.0.0-alpha.18 → 1.0.0-alpha.20

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,12 +51,12 @@ 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. */
+    /** Box content stage ratio. Follow manager stage ratio if null. Default null. */
     readonly stageRatio?: number | null;
     /** Classname Prefix. For CSS styling. Default "telebox". */
     readonly namespace?: string;
@@ -69,9 +69,13 @@ export interface TeleBoxConfig {
     /** Box footer element. */
     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;
+    readonly styles?: string;
+    /** Box content styles from end users. */
+    readonly userStyles?: string;
+    /** Custom styles for box content container. Inherit from manager container style if null. Default null. */
+    readonly bodyStyle?: string | null;
+    /** Custom styles for box content stage. Inherit from manager stage style if null. Default null. */
+    readonly stageStyle?: string | null;
     /** Actual Box Dark Mode */
     readonly darkMode$: ReadonlyVal<boolean, boolean>;
     /** Restrict box to always be within the stage area. Default false. */
@@ -83,17 +87,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>;
+    /** Default content styles for all boxes */
+    readonly defaultBoxBodyStyle$: ReadonlyVal<string | null>;
+    /** Default stage styles for all boxes */
+    readonly defaultBoxStageStyle$: ReadonlyVal<string | null>;
     /** 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,
+    };
+}

package/src/TeleBoxManager/index.ts

@@ -1,3 +1,5 @@
+import "./style.scss";
+
 import shallowequal from "shallowequal";
 import { ResizeObserver as ResizeObserverPolyfill } from "@juggle/resize-observer";
 import { SideEffectManager } from "side-effect-manager";
@@ -38,7 +40,7 @@ import type {
     TeleBoxManagerUpdateConfig,
 } from "./typings";
 import { MaxTitleBar } from "./MaxTitleBar";
-import { TeleStage } from "../TeleStage";
+import { calcStageRect } from "../TeleBox/utils";
 
 export * from "./typings";
 export * from "./constants";
@@ -60,7 +62,10 @@ type ValConfig = {
     maximized: Val<boolean, boolean>;
     fence: Val<boolean, boolean>;
     stageRatio: Val<number, boolean>;
-    highlightStage: Val<boolean, boolean>;
+    containerStyle: Val<string>;
+    stageStyle: Val<string>;
+    defaultBoxBodyStyle: Val<string | null>;
+    defaultBoxStageStyle: Val<string | null>;
 };
 
 type CombinedValEnhancedResult = ValEnhancedResult<ValConfig> &
@@ -74,12 +79,15 @@ export class TeleBoxManager {
         prefersColorScheme = TELE_BOX_COLOR_SCHEME.Light,
         minimized = false,
         maximized = false,
-        fence = false,
+        fence = true,
         collector,
         namespace = "telebox",
         readonly = false,
         stageRatio = -1,
-        highlightStage = true,
+        containerStyle = "",
+        stageStyle = "",
+        defaultBoxBodyStyle = null,
+        defaultBoxStageStyle = null,
     }: TeleBoxManagerConfig = {}) {
         this._sideEffect = new SideEffectManager();
 
@@ -93,8 +101,11 @@ export class TeleBoxManager {
         const minimized$ = new Val(minimized);
         const maximized$ = new Val(maximized);
         const fence$ = new Val(fence);
+        const containerStyle$ = new Val(containerStyle);
+        const stageStyle$ = new Val(stageStyle);
         const stageRatio$ = new Val(stageRatio);
-        const highlightStage$ = new Val(highlightStage);
+        const defaultBoxBodyStyle$ = new Val(defaultBoxBodyStyle);
+        const defaultBoxStageStyle$ = new Val(defaultBoxStageStyle);
 
         const rootRect$ = new Val<TeleBoxRect>(
             {
@@ -126,6 +137,10 @@ export class TeleBoxManager {
             })
         );
 
+        const stageRect$ = combine([rootRect$, stageRatio$], calcStageRect, {
+            compare: shallowequal,
+        });
+
         this.boxes$ = new Val<TeleBox[]>([]);
         this.topBox$ = new Val<TeleBox | undefined>(undefined);
         this._sideEffect.addDisposer(
@@ -197,25 +212,12 @@ export class TeleBoxManager {
                 root$,
             });
 
-        const teleStage = new TeleStage({
-            namespace,
-            rootRect$,
-            ratio$: stageRatio$,
-            root$,
-            highlightStage$: combine(
-                [highlightStage$, maximized$, minimized$],
-                ([highlightStage, maximized, minimized]) =>
-                    highlightStage && (minimized || !maximized)
-            ),
-        });
-        this._sideEffect.addDisposer(() => teleStage.destroy());
-
         const readonlyValConfig: ReadonlyValConfig = {
             darkMode: darkMode$,
             state: state$,
             root: root$,
             rootRect: rootRect$,
-            stageRect: teleStage.stageRect$,
+            stageRect: stageRect$,
         };
 
         withReadonlyValueEnhancer(this, readonlyValConfig, valManager);
@@ -227,7 +229,10 @@ export class TeleBoxManager {
             minimized: minimized$,
             maximized: maximized$,
             stageRatio: stageRatio$,
-            highlightStage: highlightStage$,
+            containerStyle: containerStyle$,
+            stageStyle: stageStyle$,
+            defaultBoxBodyStyle: defaultBoxBodyStyle$,
+            defaultBoxStageStyle: defaultBoxStageStyle$,
         };
 
         withValueEnhancer(this, valConfig, valManager);
@@ -336,8 +341,57 @@ export class TeleBoxManager {
                 }
             }),
         ]);
+
+        this.$container = document.createElement("div");
+        this.$container.className = this.wrapClassName("manager-container");
+
+        this.$stage = document.createElement("div");
+        this.$stage.className = this.wrapClassName("manager-stage");
+        this.$container.appendChild(this.$stage);
+
+        this._sideEffect.addDisposer([
+            darkMode$.subscribe((darkMode) => {
+                this.$container.classList.toggle(
+                    this.wrapClassName("color-scheme-dark"),
+                    darkMode
+                );
+                this.$container.classList.toggle(
+                    this.wrapClassName("color-scheme-light"),
+                    !darkMode
+                );
+            }),
+            maximized$.subscribe((maximized) => {
+                this.$container.classList.toggle("is-maximized", maximized);
+            }),
+            minimized$.subscribe((minimized) => {
+                this.$container.classList.toggle("is-minimized", minimized);
+            }),
+            containerStyle$.subscribe((containerStyle) => {
+                this.$container.style.cssText = containerStyle;
+            }),
+            stageStyle$.subscribe((stageStyle) => {
+                this.$stage.style.cssText = stageStyle;
+                this.$stage.style.width = stageRect$.value.width + "px";
+                this.$stage.style.height = stageRect$.value.height + "px";
+            }),
+            stageRect$.subscribe((stageRect) => {
+                this.$stage.style.width = stageRect.width + "px";
+                this.$stage.style.height = stageRect.height + "px";
+            }),
+            root$.subscribe((root) => {
+                if (root) {
+                    root.appendChild(this.$container);
+                } else if (this.$container.parentElement) {
+                    this.$container.remove();
+                }
+            }),
+        ]);
     }
 
+    public readonly $container: HTMLDivElement;
+
+    public readonly $stage: HTMLDivElement;
+
     public get boxes(): ReadonlyArray<TeleBox> {
         return this.boxes$.value;
     }
@@ -386,7 +440,7 @@ export class TeleBoxManager {
             ...config,
             ...(smartPosition ? this.smartPosition(config) : {}),
             namespace: this.namespace,
-            root$: this._root$,
+            root: this.$stage,
             darkMode$: this._darkMode$,
             maximized$: this._maximized$,
             minimized$: this._minimized$,
@@ -396,7 +450,8 @@ export class TeleBoxManager {
             managerStageRatio$: this._stageRatio$,
             readonly$: this._readonly$,
             collectorRect$: this.collector._rect$,
-            managerHighlightStage$: this._highlightStage$,
+            defaultBoxBodyStyle$: this._defaultBoxBodyStyle$,
+            defaultBoxStageStyle$: this._defaultBoxStageStyle$,
         });
 
         if (box.focus) {
@@ -663,8 +718,8 @@ export class TeleBoxManager {
         if (config.draggable != null) {
             box._draggable$.setValue(config.draggable, skipUpdate);
         }
-        if (config.ratio != null) {
-            box._ratio$.setValue(config.ratio, skipUpdate);
+        if (config.boxRatio != null) {
+            box._boxRatio$.setValue(config.boxRatio, skipUpdate);
         }
         if (config.zIndex != null) {
             box._zIndex$.setValue(config.zIndex, skipUpdate);
@@ -697,33 +752,27 @@ export class TeleBoxManager {
         const topBox = this.topBox;
 
         if (x == null) {
-            let pxX = stageRect.x + 20;
+            let pxX = 20;
             if (topBox) {
                 const pxPreferredX = topBox.pxIntrinsicCoord.x + 20;
                 const pxIntrinsicWidth = width * stageRect.width;
-                if (
-                    pxPreferredX + pxIntrinsicWidth <=
-                    stageRect.x + stageRect.width
-                ) {
+                if (pxPreferredX + pxIntrinsicWidth <= stageRect.width) {
                     pxX = pxPreferredX;
                 }
             }
-            x = (pxX - stageRect.x) / stageRect.width;
+            x = pxX / stageRect.width;
         }
 
         if (y == null) {
-            let pxY = stageRect.y + 20;
+            let pxY = 20;
             if (topBox) {
                 const pxPreferredY = topBox.pxIntrinsicCoord.y + 20;
                 const pxIntrinsicHeight = height * stageRect.height;
-                if (
-                    pxPreferredY + pxIntrinsicHeight <=
-                    stageRect.y + stageRect.height
-                ) {
+                if (pxPreferredY + pxIntrinsicHeight <= stageRect.height) {
                     pxY = pxPreferredY;
                 }
             }
-            y = (pxY - stageRect.y) / stageRect.height;
+            y = pxY / stageRect.height;
         }
 
         return { x, y, width, height };

package/src/TeleBoxManager/style.scss

@@ -0,0 +1,39 @@
+@import "../scss/variables.scss";
+
+.#{$namespace}-manager-container {
+    position: relative;
+    overflow: hidden;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: $color-container-background;
+
+    &.is-maximized,
+    &.is-minimized {
+        & > .#{$namespace}-manager-stage {
+            overflow: visible;
+        }
+    }
+}
+
+.#{$namespace}-manager-stage {
+    position: relative;
+    overflow: hidden;
+    background: $color-stage-background;
+    box-shadow: $color-stage-shadow;
+}
+
+.#{$namespace}-color-scheme-dark {
+    color-scheme: dark;
+
+    &.#{$namespace}-manager-container {
+        background: $color-container-background-dark;
+
+        & > .#{$namespace}-manager-stage {
+            background: $color-stage-background-dark;
+            box-shadow: $color-stage-shadow-dark;
+        }
+    }
+}

package/src/TeleBoxManager/typings.ts

@@ -21,8 +21,14 @@ export interface TeleBoxManagerConfig extends Pick<TeleBoxConfig, "namespace"> {
     readonly minimized?: boolean;
     /** Is box readonly */
     readonly readonly?: boolean;
-    /** Show stage frame and grey-out the non-stage area. Default true. */
-    readonly highlightStage?: boolean;
+    /** Custom styles for telebox manager container */
+    readonly containerStyle?: string;
+    /** Custom styles for telebox manager stage */
+    readonly stageStyle?: string;
+    /** Custom `style` attribute value for content area of all boxes. Can be overwritten by box. */
+    readonly defaultBoxBodyStyle?: string | null;
+    /** Custom `style` attribute value for stage area of all boxes. Can be overwritten by box. */
+    readonly defaultBoxStageStyle?: string | null;
 }
 
 type TeleBoxManagerBoxConfigBaseProps =
@@ -36,7 +42,7 @@ type TeleBoxManagerBoxConfigBaseProps =
     | "y"
     | "resizable"
     | "draggable"
-    | "ratio"
+    | "boxRatio"
     | "zIndex"
     | "stageRatio";
 
@@ -56,7 +62,7 @@ export type TeleBoxManagerQueryConfig = Pick<
     | "visible"
     | "resizable"
     | "draggable"
-    | "ratio"
+    | "boxRatio"
     | "stageRatio"
     | "zIndex"
     | "id"

package/src/scss/variables.scss

@@ -1,5 +1,14 @@
 $namespace: "telebox";
+
 $base-z-index: 100;
 $max-titlebar-z-index: $base-z-index + 5000;
 $stage-z-index: $max-titlebar-z-index + 10;
 $collector-z-index: $stage-z-index + 10;
+
+$color-container-background: #f9f9f9;
+$color-stage-background: #fff;
+$color-stage-shadow: 0px 0px 16px rgba(0, 0, 0, 0.08);
+
+$color-container-background-dark: #25282e;
+$color-stage-background-dark: #272a30;
+$color-stage-shadow-dark: 0px 0px 16px rgba(0, 0, 0, 0.24);

package/dist/TeleStage/index.d.ts

@@ -1,21 +0,0 @@
-import "./style.scss";
-import type { ReadonlyVal } from "value-enhancer";
-import type { TeleBoxRect } from "../TeleBox/typings";
-export interface TeleStageConfig {
-    namespace: string;
-    root$: ReadonlyVal<HTMLElement | null>;
-    rootRect$: ReadonlyVal<TeleBoxRect>;
-    ratio$: ReadonlyVal<number>;
-    highlightStage$: ReadonlyVal<boolean>;
-}
-export declare class TeleStage {
-    private readonly _sideEffect;
-    readonly namespace: string;
-    readonly stageRect$: ReadonlyVal<TeleBoxRect>;
-    readonly highlightStage$: ReadonlyVal<boolean>;
-    $boxStage?: HTMLDivElement;
-    constructor({ namespace, rootRect$, ratio$, highlightStage$, root$, }: TeleStageConfig);
-    private render;
-    destroy(): void;
-    wrapClassName(className: string): string;
-}

package/src/TeleStage/index.ts

@@ -1,174 +0,0 @@
-import "./style.scss";
-
-import shallowequal from "shallowequal";
-import { SideEffectManager } from "side-effect-manager";
-import type { ReadonlyVal } from "value-enhancer";
-import { combine } from "value-enhancer";
-import type { TeleBoxRect } from "../TeleBox/typings";
-
-export interface TeleStageConfig {
-    namespace: string;
-    root$: ReadonlyVal<HTMLElement | null>;
-    rootRect$: ReadonlyVal<TeleBoxRect>;
-    ratio$: ReadonlyVal<number>;
-    highlightStage$: ReadonlyVal<boolean>;
-}
-
-export class TeleStage {
-    private readonly _sideEffect = new SideEffectManager();
-
-    public readonly namespace: string;
-    public readonly stageRect$: ReadonlyVal<TeleBoxRect>;
-    public readonly highlightStage$: ReadonlyVal<boolean>;
-
-    public $boxStage?: HTMLDivElement;
-
-    constructor({
-        namespace,
-        rootRect$,
-        ratio$,
-        highlightStage$,
-        root$,
-    }: TeleStageConfig) {
-        this.namespace = namespace;
-        this.highlightStage$ = highlightStage$;
-
-        this.stageRect$ = combine(
-            [rootRect$, ratio$],
-            ([rootRect, ratio]) => {
-                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,
-                };
-            },
-            { compare: shallowequal }
-        );
-
-        this._sideEffect.addDisposer(
-            combine([root$, highlightStage$]).subscribe(
-                ([root, highlightStage]) => {
-                    if (root && highlightStage) {
-                        root.appendChild(this.render());
-                    } else if (this.$boxStage?.parentNode) {
-                        this.$boxStage.remove();
-                    }
-                }
-            )
-        );
-    }
-
-    private render(): HTMLDivElement {
-        if (this.$boxStage) {
-            return this.$boxStage;
-        }
-
-        const $boxStage = document.createElement("div");
-        $boxStage.className = this.wrapClassName("box-stage-container");
-        const $boxStageMask1 = document.createElement("div");
-        $boxStageMask1.className = this.wrapClassName("box-stage-mask");
-        const $boxStageMask2 = document.createElement("div");
-        $boxStageMask2.className = this.wrapClassName("box-stage-mask");
-        const $boxStageFrame = document.createElement("div");
-        $boxStageFrame.className = this.wrapClassName("box-stage-frame");
-
-        const [
-            $topLeftCorner,
-            $topRightCorner,
-            $bottomLeftCorner,
-            $bottomRightCorner,
-        ] = [
-            "M0 8V0h8v2H2v6H0Z",
-            "M8 8V0H0v2h6v6h2Z",
-            "M0 0v8h8V6H2V0H0Z",
-            "M8 0v8H0V6h6V0h2Z",
-        ].map((path, i) => {
-            const $svg = document.createElementNS(
-                "http://www.w3.org/2000/svg",
-                "svg"
-            );
-            $svg.setAttribute("viewBox", "0 0 8 8");
-            $svg.setAttribute(
-                "class",
-                `${this.wrapClassName("box-stage-frame-corner")} is-${i}`
-            );
-            const $path = document.createElementNS(
-                "http://www.w3.org/2000/svg",
-                "path"
-            );
-            $path.setAttribute("d", path);
-            $path.setAttribute("fill", "#3381FF");
-            $svg.appendChild($path);
-            return $svg;
-        });
-
-        $boxStageFrame.appendChild($topLeftCorner);
-        $boxStageFrame.appendChild($bottomLeftCorner);
-        $boxStageFrame.appendChild($topRightCorner);
-        $boxStageFrame.appendChild($bottomRightCorner);
-
-        $boxStage.appendChild($boxStageMask1);
-        $boxStage.appendChild($boxStageFrame);
-        $boxStage.appendChild($boxStageMask2);
-
-        this._sideEffect.addDisposer(
-            this.highlightStage$.subscribe((highlightStage) => {
-                $boxStage.classList.toggle("is-active", highlightStage);
-            })
-        );
-
-        this._sideEffect.addDisposer(
-            combine([this.highlightStage$, this.stageRect$]).subscribe(
-                ([highlightStage, stageRect]) => {
-                    if (!highlightStage) {
-                        return;
-                    }
-                    if (stageRect.x > 0) {
-                        $boxStage.style.flexDirection = "row";
-                        $boxStageMask1.style.width = `${stageRect.x}px`;
-                        $boxStageMask1.style.height = "";
-                        $boxStageMask2.style.width = `${stageRect.x}px`;
-                        $boxStageMask2.style.height = "";
-                    } else if (stageRect.y > 0) {
-                        $boxStage.style.flexDirection = "column";
-                        $boxStageMask1.style.width = "";
-                        $boxStageMask1.style.height = `${stageRect.y}px`;
-                        $boxStageMask2.style.width = "";
-                        $boxStageMask2.style.height = `${stageRect.y}px`;
-                    }
-                }
-            )
-        );
-
-        this.$boxStage = $boxStage;
-        return $boxStage;
-    }
-
-    public destroy(): void {
-        this._sideEffect.flushAll();
-    }
-
-    public wrapClassName(className: string): string {
-        return `${this.namespace}-${className}`;
-    }
-}