@netless/appliance-plugin 1.1.36-beta.0 → 1.1.36-beta.2

package/dist/plugin/baseApplianceManager.d.ts

@@ -14,6 +14,7 @@ import { HotkeyManager } from "../hotkey";
 import { RenderCotrolImple } from "../core/renderCotrol";
 import { MiniMapManagerImpl } from "../component/miniMap/manager";
 import { PluginManager, Plugin } from "../core/plugin";
+import { SelectorApiManager } from "./selectorApi";
 export interface BaseApplianceManagerProps {
     displayer: Displayer<DisplayerCallbacks>;
     plugin?: AppliancePluginLike;
@@ -47,6 +48,12 @@ export declare abstract class BaseApplianceManager {
     readonly renderControl: RenderCotrolImple;
     readonly miniMapManager?: MiniMapManagerImpl;
     readonly pluginManager?: PluginManager;
+    /** WB-429: selector 公开 API / 事件实现入口 */
+    selectorApi?: SelectorApiManager;
+    /** WB-429: selector API 事件派发用，指向 BaseApplianceManager.PublicMsgEmitter */
+    get publicMsgEmitter(): EventEmitter2;
+    /** WB-429: selector API 监听内部 method emit 用 */
+    get internalMsgEmitter(): EventEmitter2;
     private _isPolyfill;
     constructor(params: BaseApplianceManagerProps);
     hasPolyfillMethod(methodName: "requestIdleCallback" | "cancelIdleCallback"): boolean;

package/dist/plugin/baseViewContainerManager.d.ts

@@ -1,11 +1,12 @@
 import type EventEmitter2 from "eventemitter2";
 import { ICameraOpt, ILayerOptionType, IMainMessageRenderData, IOffscreenCanvasOptionType, ViewWorkerOptions } from "../core/types";
 import { BaseSubWorkModuleProps, ApplianceManagerLike } from "./types";
-import type { CameraState, View } from "./types";
+import type { CameraState, SelectorViewOffset, View } from "./types";
 import type { DebouncedFunc, DebouncedFuncLeading } from "lodash";
 import { EToolsKey } from "../core/enum";
 import { ShowFloatBarMsgValue } from "../displayer/types";
 import { UndoRedoMethod } from "../undo";
+import type { ExpectedAcks } from "../undo/timing";
 import { BaseViewDisplayer } from "./displayerView";
 export interface ViewInfo {
     id: string;
@@ -31,9 +32,23 @@ export declare abstract class ViewContainerManager {
     get worker(): import("../core/mainEngine").MasterControlForWorker;
     abstract getViewInitData(viewId: string): ViewWorkerOptions | undefined;
     getUndoTickerId(viewId: string): number | undefined;
-    undoTickerStart: (id: number, viewId: string) => void;
-    undoTickerEnd: (id: number, viewId: string) => void;
+    undoTickerStart: (id: number, viewId: string, expectedAcks?: ExpectedAcks) => void;
     addExcludeIds: (ids: string[], viewId: string) => void;
+    /** worker 渲染链 None ack 路由：把 render 那只脚标记到对应 view 的 commiter */
+    onAckRenderUndoTicker: (id: number, viewId: string, scenePath?: string, meta?: {
+        requestId?: string;
+        emitEventType?: string;
+    }) => void;
+    /** collector storage 写入完成 ack 路由：把 storage 那只脚标记到对应 view 的 commiter */
+    onAckStorageUndoTicker: (id: number, viewId: string, scenePath?: string, workId?: string, meta?: {
+        requestId?: string;
+        emitEventType?: string;
+    }) => void;
+    /** 多元素入口给 ticker 预先登记期望集合：双脚里 storage 那只脚必须等 scope 全部到齐 */
+    onCollectExpectedWorkIds: (id: number, viewId: string, workIds: string[], scenePath?: string) => void;
+    onFinalizeRequested: (id: number, viewId: string, workIds: string[], scenePath?: string) => void;
+    onReopenStorageAck: (id: number, viewId: string, workIds: string[], scenePath?: string) => void;
+    onCancelUndoTicker: (id: number, viewId: string, scenePath?: string) => void;
     undo(): number;
     redo(): number;
     protected validator(target: ViewInfo, key: string, value: any): void;
@@ -43,6 +58,10 @@ export declare abstract class ViewContainerManager {
     createAppView(originAppView: ViewInfo): void;
     isAppView(viewId: string): boolean;
     getView(viewId: string): ViewInfo | undefined;
+    private resolveView;
+    private getViewElement;
+    getFloatbarContainer(viewId?: string): HTMLElement | undefined;
+    getViewOffsetToContainer(container: HTMLElement, viewId?: string): SelectorViewOffset | undefined;
     getCurScenePath(viewId: string): string | undefined;
     getAllViews(): (ViewInfo | undefined)[];
     setViewScenePath(viewId: string, scenePath: string): void;
@@ -87,6 +106,7 @@ export declare abstract class BaseViewDisplayerManager {
     abstract canvasBgRef: React.RefObject<HTMLCanvasElement>;
     abstract backgroundContainerRef?: React.RefObject<HTMLDivElement>;
     abstract floatBarRef: React.RefObject<HTMLDivElement>;
+    abstract customFloatbarContainerRef: React.RefObject<HTMLDivElement>;
     abstract containerOffset: {
         x: number;
         y: number;
@@ -137,12 +157,6 @@ export declare abstract class BaseViewDisplayerManager {
         y: any;
     };
     abstract get viewId(): string;
-    protected mousedown: (e: MouseEvent) => void;
-    protected mousemove: (e: MouseEvent) => void;
-    protected mouseup: (e: MouseEvent) => void;
-    protected touchstart: (e: TouchEvent) => void;
-    protected touchmove: (e: TouchEvent) => void;
-    protected touchend: (e: TouchEvent) => void;
     protected keydown: (e: KeyboardEvent) => void;
     protected pointerdown: (e: PointerEvent) => void;
     protected pointermove: (e: PointerEvent) => void;

package/dist/plugin/displayerView.d.ts

@@ -2,6 +2,7 @@ import React, { ReactNode } from "react";
 import { EmitEventType, ApplianceViewManagerLike } from "./types";
 import { TextEditorInfo } from "../component/textEditor";
 import { ShowFloatBarMsgValue } from "../displayer/types";
+import type { SelectorStyleOverrides } from "./types";
 export interface BaseDisplayerProps {
     viewId: string;
     mananger: ApplianceViewManagerLike;
@@ -16,6 +17,7 @@ export interface BaseDisplayerProps {
         canvasBgRef: React.RefObject<HTMLCanvasElement>;
         canvasTopRef?: React.RefObject<HTMLCanvasElement>;
         floatBarRef: React.RefObject<HTMLDivElement>;
+        customFloatbarContainerRef: React.RefObject<HTMLDivElement>;
     };
 }
 export interface BaseDisplayerState {
@@ -31,11 +33,12 @@ export interface BaseDisplayerState {
     activeMiniMapViewId?: string;
     activeTextEditor?: boolean;
 }
-export declare const DisplayerContext: React.Context<Pick<BaseDisplayerState, "scale" | "floatBarData" | "dpr" | "operationType" | "angle" | "activeTextId" | "activeTextEditor"> & {
+export declare const DisplayerContext: React.Context<Pick<BaseDisplayerState, "scale" | "dpr" | "angle" | "floatBarData" | "operationType" | "activeTextEditor" | "activeTextId"> & {
     viewId: string;
     isNoPointerEvents: boolean;
     mananger?: ApplianceViewManagerLike;
     floatBarColors: [number, number, number][];
+    overwriteSelectorStyles: SelectorStyleOverrides;
     setAngle: (angle: number) => void;
     setOperationType: (type: EmitEventType) => void;
     setFloatBarData: (data: Partial<ShowFloatBarMsgValue>) => void;

package/dist/plugin/elementCapability.d.ts

@@ -0,0 +1,29 @@
+import { ElayerType, EToolsKey } from "../core/enum";
+import type { FontStyleType, FontWeightType } from "../component/textEditor/types";
+import { ElementPropertyField, EStrokeType, SpeechBalloonPlacement } from "./types";
+export type NormalizedUpdateElementFields = {
+    strokeColor?: string;
+    fillColor?: string;
+    thickness?: number;
+    strokeType?: EStrokeType;
+    fontColor?: string;
+    fontBgColor?: string;
+    fontSize?: number;
+    bold?: FontWeightType;
+    italic?: FontStyleType;
+    underline?: boolean;
+    lineThrough?: boolean;
+    isLocked?: boolean;
+    zIndexLayer?: ElayerType;
+    shape?: {
+        vertices?: number;
+        innerVerticeStep?: number;
+        innerRatio?: number;
+        placement?: SpeechBalloonPlacement;
+    };
+};
+export declare function isValidStrokeTypeValue(strokeType: EStrokeType | undefined): boolean;
+export declare function isElementPropertySupported(toolsType: EToolsKey | undefined, field: ElementPropertyField): boolean;
+export declare function listSupportedElementProperties(toolsType: EToolsKey | undefined): ElementPropertyField[];
+export declare function enumeratePresentFields(changes: NormalizedUpdateElementFields): ElementPropertyField[];
+export declare function isStrokeTypeForToolsTypeSupported(toolsType: EToolsKey | undefined, strokeType: EStrokeType | undefined): boolean;

package/dist/plugin/multi/displayer/appViewDisplayerManager.d.ts

@@ -17,6 +17,7 @@ export declare class AppViewDisplayerManagerImpl extends AppViewDisplayerManager
     canvasBgRef: React.RefObject<HTMLCanvasElement>;
     backgroundContainerRef?: React.RefObject<HTMLDivElement>;
     floatBarRef: React.RefObject<HTMLDivElement>;
+    customFloatbarContainerRef: React.RefObject<HTMLDivElement>;
     containerOffset: {
         x: number;
         y: number;

package/dist/plugin/multi/displayer/mainViewDisplayerManager.d.ts

@@ -19,6 +19,7 @@ export declare class MainViewMultiDisplayerManager extends MainViewDisplayerMana
     canvasBgRef: React.RefObject<HTMLCanvasElement>;
     backgroundContainerRef?: React.RefObject<HTMLDivElement>;
     floatBarRef: React.RefObject<HTMLDivElement>;
+    customFloatbarContainerRef: React.RefObject<HTMLDivElement>;
     containerOffset: {
         x: number;
         y: number;

package/dist/plugin/selectorApi.d.ts

@@ -0,0 +1,141 @@
+import type { BaseApplianceManager } from "./baseApplianceManager";
+import { EmitEventType, type SelectorInfo, type SelectedElementsSnapshot, type SelectorTransformChangeInfo, type UpdateSelectedElementChanges, type UpdateElementInfo, type UpdateSelectedElementsResult, type ClearSelectedElementsResult, type CopySelectedElementsResult, type DeleteSelectedElementsResult } from "./types";
+import { EToolsKey } from "../core/enum";
+/**
+ * WB-429: selector 公开能力的实现入口。
+ *
+ * - 由 BaseApplianceManager 持有，单白板 / 多窗口共享同一套实现。
+ * - 通过 control.publicMsgEmitter 派发 selectedElementsChange / selectorGeometryChange / selectorTransformChange / remoteSelectorChange。
+ * - 通过 control.logger (即 room.logger) 写入可上报日志。
+ * - requestId 串联 API 调用、事件和日志。
+ */
+export declare class SelectorApiManager {
+    private control;
+    private logger;
+    private lastSelectedIdsByView;
+    private lastViewRectByView;
+    /** updateSelectedElements 的 requestId → resolver */
+    private updateResolveMap;
+    /** blurSelector 的 requestId → resolver */
+    private clearResolveMap;
+    /** copySelectedElements 的 requestId → resolver */
+    private copyResolveMap;
+    /** deleteSelectedElements 的 requestId → resolver */
+    private deleteResolveMap;
+    /** 远端 selector 上次同步快照：viewId → (uid → {selectedIds, viewRect?}) */
+    private lastRemoteSelectorByView;
+    /** camera-change 几何事件节流：每个 view 最多每 60ms 派发一次 */
+    private cameraEmitThrottleByView;
+    /** camera-change 挂起窗口：等待 selector rect 真正重算后，把随后的 rect 变化归因为 cameraTransform */
+    private pendingCameraChangeByView;
+    /** 同一次属性更新导致的几何变化做尾部合并，只派发最后一次 */
+    private pendingPropertyGeometryByKey;
+    constructor(control: BaseApplianceManager);
+    private stringifyLogValue;
+    private formatFieldsFromChanges;
+    private formatMethods;
+    private hasShapeChanges;
+    private resolveShapeDispatchToolsTypes;
+    private getStorageShapeSnapshot;
+    private cancelUndoTicker;
+    private resolveCancelableUndoTickerId;
+    private captureUndoTickerDuringDispatch;
+    destroy(): void;
+    /** 解析 viewId：未传时取 focuedView / mainView */
+    resolveViewId(viewId?: string): string | undefined;
+    /** 当前 selector 选中态快照 */
+    getSelectedElements(viewId?: string): SelectedElementsSnapshot | undefined;
+    isElementPropertySupported(toolsType: EToolsKey, field: import("./types").ElementPropertyField): boolean;
+    /** 主动清空当前 selector 选中态 */
+    blurSelector(viewId?: string): Promise<ClearSelectedElementsResult>;
+    /** 更新当前 selector 选中的元素集合属性 */
+    updateSelectedElements(viewId: string | undefined, changes: UpdateSelectedElementChanges): Promise<UpdateSelectedElementsResult>;
+    /** 复制当前 selector 选中的元素 */
+    copySelectedElements(viewId?: string): Promise<CopySelectedElementsResult>;
+    /** 删除当前 selector 选中的元素 */
+    deleteSelectedElements(viewId?: string): Promise<DeleteSelectedElementsResult>;
+    updateElement(elementId: string, scenePath: string, viewId: string, updateElementInfo: UpdateElementInfo, useUndoRedoStack?: boolean): Promise<boolean>;
+    onSelectorTransform(params: SelectorTransformChangeInfo): void;
+    /**
+     * 在 mainEngine.collectorSyncData 的 Select 分支调用。
+     * 负责派发 selectedElementsChange（仅 selectedIds 变化时）和 selectorGeometryChange。
+     */
+    onSelectorSync(params: {
+        viewId: string;
+        scenePath?: string;
+        selectIds?: string[];
+        selectRect?: {
+            x: number;
+            y: number;
+            w: number;
+            h: number;
+        };
+        selectorInfo?: SelectorInfo;
+    }): void;
+    /** selector 因清空而消失时（来自 collectorSyncData Clear 或主动 blurSelector） */
+    onSelectorCleared(params: {
+        viewId: string;
+        scenePath?: string;
+        requestId?: string;
+    }): void;
+    /**
+     * camera 变化导致 selector viewRect 变化时调用。
+     * 节流派发 selectorGeometryChange，source=camera-change。
+     */
+    onCameraChange(viewId: string): void;
+    private emitCameraGeometry;
+    private publicStorageHandler?;
+    private bindPublicStorageListener;
+    private unbindPublicStorageListener;
+    private tryResolveUpdateElements;
+    onRemoveNodeApplied(params: {
+        viewId: string;
+        requestId?: string;
+        removeIds?: string[];
+    }): void;
+    private onSyncStorageChange;
+    private handleRemoteSelectorState;
+    private logRemoteSelector;
+    private genRequestId;
+    private setPendingCameraChange;
+    private clearPendingCameraChange;
+    private getDebounceLogger;
+    private detectSelectorTransforming;
+    private isArrayEqual;
+    private isRectEqual;
+    onPropertyApplied(params: {
+        type: EmitEventType;
+        viewId: string;
+        scenePath?: string;
+        requestId?: string;
+        data: any;
+    }): void;
+    private schedulePropertyGeometryEmit;
+    /** 查询某个 workId 的 toolsType，用于 strokeType / zIndex 能力判断 */
+    private lookupToolsType;
+    /**
+     * 校验 changes.strokeType 是否被该 toolsType 支持。
+     * 不支持时移除 strokeType 字段，并写入 warnings。
+     */
+    private validateStrokeTypeForChanges;
+    private flushUpdateSelectedElementsWarnings;
+    /** snapshot collector.storage 的 key 集合，用于 copy 后确认新增元素 */
+    /** 找出本次 copy 之后新增到 storage 的 local ids */
+    onUndoAckApplied: (params: {
+        viewId: string;
+        scenePath?: string;
+        requestId?: string;
+        emitEventType?: EmitEventType;
+    }) => void;
+    /** 收集本次 selector 更新需要等待的内部 method ack */
+    private collectPendingMethods;
+    private hasApplicableChangesForToolsType;
+    private buildUpdatedElementValue;
+    private normalizeUpdateElementInfo;
+    /** 把 UpdateSelectedElementChanges 分发到对应的内部 method emit */
+    private dispatchUpdate;
+    /** 根据 collector storage + floatBarData 组装单条元素信息 */
+    private buildSelectedElementInfo;
+    private buildRemoteSelectedElements;
+    private logGeometry;
+}

package/dist/plugin/single/displayer/mainViewDisplayerManager.d.ts

@@ -19,6 +19,7 @@ export declare class MainViewSingleDisplayerManager extends MainViewDisplayerMan
     canvasFloatRef: React.RefObject<HTMLCanvasElement>;
     canvasBgRef: React.RefObject<HTMLCanvasElement>;
     floatBarRef: React.RefObject<HTMLDivElement>;
+    customFloatbarContainerRef: React.RefObject<HTMLDivElement>;
     containerOffset: {
         x: number;
         y: number;