@netless/appliance-plugin 1.1.17-beta.9 → 1.1.18-beta.0

package/dist/appliance-plugin.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-DDtbIS6S.js");exports.ActiveContainerType=e.ActiveContainerType;exports.ApplianceMultiPlugin=e.ApplianceMultiPlugin;exports.ApplianceNames=e.ApplianceNames;exports.ApplianceSigleWrapper=e.ApplianceSigleWrapper;exports.ApplianceSinglePlugin=e.ApplianceSinglePlugin;exports.AutoDrawPlugin=e.AutoDrawPlugin;exports.ECanvasShowType=e.ECanvasShowType;exports.EDataType=e.EDataType;exports.EForceStopReason=e.EForceStopReason;exports.EImageType=e.EImageType;exports.EMatrixrRelationType=e.EMatrixrRelationType;exports.EOperationType=e.EOperationType;exports.EPostMessageType=e.EPostMessageType;exports.ERenderFilterType=e.ERenderFilterType;exports.EScaleType=e.EScaleType;exports.EStrokeType=e.EStrokeType;exports.EToolsKey=e.EToolsKey;exports.ElayerType=e.ElayerType;exports.EmitEventType=e.EmitEventType;exports.EventMessageType=e.EventMessageType;exports.EvevtWorkState=e.EvevtWorkState;exports.EvevtWorkType=e.EvevtWorkType;exports.InternalMsgEmitterType=e.InternalMsgEmitterType;exports.Plugin=e.Plugin;exports.ShapeType=e.ShapeType;exports.fullWorkerUrl=e.fullWorker;exports.subWorkerUrl=e.subWorker;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-DNughIC2.js");exports.ActiveContainerType=e.ActiveContainerType;exports.ApplianceMultiPlugin=e.ApplianceMultiPlugin;exports.ApplianceNames=e.ApplianceNames;exports.ApplianceSigleWrapper=e.ApplianceSigleWrapper;exports.ApplianceSinglePlugin=e.ApplianceSinglePlugin;exports.AutoDrawPlugin=e.AutoDrawPlugin;exports.ECanvasShowType=e.ECanvasShowType;exports.EDataType=e.EDataType;exports.EForceStopReason=e.EForceStopReason;exports.EImageType=e.EImageType;exports.EMatrixrRelationType=e.EMatrixrRelationType;exports.EOperationType=e.EOperationType;exports.EPostMessageType=e.EPostMessageType;exports.ERenderFilterType=e.ERenderFilterType;exports.EScaleType=e.EScaleType;exports.EStrokeType=e.EStrokeType;exports.EToolsKey=e.EToolsKey;exports.ElayerType=e.ElayerType;exports.EmitEventType=e.EmitEventType;exports.EventMessageType=e.EventMessageType;exports.EvevtWorkState=e.EvevtWorkState;exports.EvevtWorkType=e.EvevtWorkType;exports.InternalMsgEmitterType=e.InternalMsgEmitterType;exports.Plugin=e.Plugin;exports.ShapeType=e.ShapeType;exports.fullWorkerUrl=e.fullWorker;exports.subWorkerUrl=e.subWorker;

package/dist/appliance-plugin.mjs

@@ -1,4 +1,4 @@
-import { B as s, A as p, x as r, w as t, v as l, Q as n, G as i, b as y, F as E, j as o, l as T, N as g, c as u, O as v, K as c, y as S, a as A, J as P, h as k, H as m, E as M, L as W, I as h, P as w, z as x, s as F, u as I } from "./index-CZ7SSEYU.mjs";
+import { B as s, A as p, x as r, w as t, v as l, Q as n, G as i, b as y, F as E, j as o, l as T, N as g, c as u, O as v, K as c, y as S, a as A, J as P, h as k, H as m, E as M, L as W, I as h, P as w, z as x, s as F, u as I } from "./index-CR2nlCh1.mjs";
 export {
   s as ActiveContainerType,
   p as ApplianceMultiPlugin,

package/dist/collector/collector.d.ts

@@ -27,6 +27,7 @@ export declare class Collector extends BaseCollector<ISerializableStorageViewDat
     getScenePathData(scenePath: string): ISerializableStorageData | undefined;
     getStorageData(viewId: string, scenePath: string): ISerializableStorageData | undefined;
     hasSelector(viewId: string, scenePath: string): boolean;
+    hasIncludeSelector(targetKey: string, targetViewId?: string, targetScenePath?: string): boolean;
     addStorageStateListener(callBack: (diff: Diff) => void): void;
     removeStorageStateListener(): void;
     private diffFunByView;

package/dist/component/textEditor/manager.d.ts

@@ -3,11 +3,13 @@ import { BaseSubWorkModuleProps } from "../../plugin/types";
 import { ICameraOpt, IWorkerMessage } from "../../core";
 import type EventEmitter2 from "eventemitter2";
 import { BaseApplianceManager } from "../../plugin/baseApplianceManager";
+import { WorkId } from "../../collector/types";
 export interface TextEditorManager {
     readonly internalMsgEmitter: EventEmitter2;
     readonly publicMsgEmitter: EventEmitter2;
     readonly control: BaseApplianceManager;
     editors: Map<string, TextEditorInfo>;
+    /** 当前激活的文本编辑器 */
     activeId?: string;
     /** 通过view组建中更新文本 */
     updateForViewEdited(activeId?: string, info?: TextEditorInfo): void;
@@ -65,6 +67,10 @@ export interface TextEditorManager {
     onServiceDerive(data: IWorkerMessage): void;
     /** 监听camera变化 */
     onCameraChange(cameraOpt: ICameraOpt, viewId: string): void;
+    /** 插入文本 */
+    insertText(viewId: string, x: number, y: number, textContent: string): WorkId | undefined;
+    /** 更新指定文本 */
+    updateText(workId: WorkId, textContent: string): void;
 }
 export declare class TextEditorManagerImpl implements TextEditorManager {
     readonly internalMsgEmitter: EventEmitter2;
@@ -116,4 +122,6 @@ export declare class TextEditorManagerImpl implements TextEditorManager {
     deleteBatch(workIds: string[], canSync?: boolean | undefined, canWorker?: boolean | undefined): void;
     clear(viewId: string, justLocal?: boolean): void;
     destory(): void;
+    insertText(viewId: string, x: number, y: number, textContent: string): WorkId | undefined;
+    updateText(workId: WorkId, textContent: string): void;
 }

package/dist/component/textEditor/view.d.ts

@@ -1,73 +1,53 @@
-import React, { FocusEventHandler, KeyboardEventHandler } from "react";
+import React from "react";
 import { TextEditorInfo, TextOptions } from "./types";
-import { ApplianceViewManagerLike, EmitEventType } from "../../plugin/types";
-export declare const Max_Font_Size = 80;
-export interface TextSelectorManagerProps {
-    selectIds: string[];
+import { EmitEventType } from "../../plugin/types";
+export interface TextManagerProps {
     className?: string;
     editors?: Map<string, TextEditorInfo>;
-    activeTextId?: string;
+    selectIds?: string[];
     box?: {
         x: number;
         y: number;
         w: number;
         h: number;
     };
-    manager: ApplianceViewManagerLike;
     showFloatBtns?: boolean;
     operationType?: EmitEventType;
+    rightBoundBreak?: boolean;
+}
+export interface TextSelectorManagerProps extends TextManagerProps {
+    handleTextEditorPointerDown: (workId: string) => void;
+    handleTextEditorPointerUp: () => void;
 }
 export interface TextViewProps {
     workId: string;
     data: TextEditorInfo;
-    isSelect?: boolean;
-    isActive?: boolean;
-    manager: ApplianceViewManagerLike;
 }
 export interface TextSelectorViewProps extends TextViewProps {
-    left: string;
-    top: string;
-    selectIds?: string[];
     updateOptInfo: (param: {
         activeTextId: string;
         update: Partial<TextOptions>;
         syncData?: Pick<TextEditorInfo, 'canSync' | 'canWorker'>;
     }) => void;
+    handlePointerDown: (workId: string) => void;
+    handlePointerUp: () => void;
 }
 export interface TextEditorProps extends TextViewProps {
     showFloatBtns: boolean;
-    handleKeyUp: KeyboardEventHandler<HTMLDivElement>;
-    handleFocus: FocusEventHandler<HTMLDivElement>;
-    runAnimation: () => void;
-    updateOptInfo: (param: {
-        activeTextId: string;
-        update: Partial<TextOptions>;
-        syncData?: Pick<TextEditorInfo, 'canSync' | 'canWorker'>;
-    }) => void;
-}
-export declare const TextView: (props: TextViewProps) => React.JSX.Element;
-export declare const TextSelectorView: React.MemoExoticComponent<(props: TextSelectorViewProps) => React.JSX.Element>;
-export declare const TextEditor: (props: TextEditorProps) => React.JSX.Element;
-export declare class TextViewInSelector extends React.Component<TextSelectorManagerProps, {
-    hasEditor: boolean;
-}> {
-    constructor(props: TextSelectorManagerProps);
-    getInnerText(target: HTMLDivElement): string[];
-    updateOptInfo(param: {
-        activeTextId: string;
-        update: Partial<TextOptions>;
-        syncData?: Pick<TextEditorInfo, 'canSync' | 'canWorker'>;
-    }): void;
-    get editorUI(): JSX.Element[] | null;
-    render(): React.JSX.Element;
-}
-export declare class TextEditorContainer extends TextViewInSelector {
-    ref: React.RefObject<HTMLDivElement> | undefined;
-    isRunAnimation?: number;
-    constructor(props: TextSelectorManagerProps);
-    runAnimation(): void;
-    handleKeyUp(e: any): void;
-    handleFocus(e: any): void;
-    get editorUI(): JSX.Element[] | null;
-    render(): React.JSX.Element;
+    rightBoundBreak: boolean;
+    handleKeyUp: (div: HTMLDivElement) => void;
+    handleFocus: (div: HTMLDivElement) => void;
+    runAnimation: (callback?: () => void) => void;
+    updateSize: (updateId: string, boxSize: [number, number]) => void;
 }
+/**
+ * 文本编辑器类型
+ * hover: 当前文本被当前用户获焦中
+ * editing: 当前文本编辑中(被其他用户编辑中)
+ * active: 当前文本可编辑状态被激活(暂无用户编辑)
+ * none: 无状态
+ */
+export type TextEditorType = "hover" | "editing" | "active" | "none";
+export declare const TextSelectorView: (props: TextSelectorViewProps) => React.JSX.Element;
+export declare const TextViewInSelector: (props: TextSelectorManagerProps) => React.JSX.Element;
+export declare const TextEditorContainer: (props: TextManagerProps) => React.JSX.Element;

package/dist/core/mainEngine.d.ts

@@ -10,6 +10,8 @@ import { BaseShapeOptions } from "./tools";
 export declare abstract class MasterController {
     /** 异步同步时间间隔 */
     maxLastSyncTime: number;
+    /** 合并绘制时间间隔 */
+    combineUnitTime: number;
     /** 插件管理器 */
     readonly abstract control: BaseApplianceManager;
     readonly abstract internalMsgEmitter: EventEmitter2;
@@ -40,7 +42,7 @@ export declare abstract class MasterController {
     /** 获取当前激活的工作任务id */
     protected getWorkId(): IworkId | undefined;
     /** 获取当前work的工作状态 */
-    getWorkState(): EvevtWorkState;
+    get workState(): EvevtWorkState;
     /** 用于接收服务端同步的数据 */
     abstract onServiceDerive(key: string, data: DiffOneData<BaseCollectorReducerAction | undefined>): void;
     /** 消费批处理池数据 */

package/dist/core/tools/selector.d.ts

@@ -41,6 +41,7 @@ export declare class SelectorShape extends BaseShapeTool {
     getChildrenPoints(): [number, number][] | undefined;
     consume(props: {
         data: IWorkerMessage;
+        isSubWorker?: boolean;
     }): {
         type: EPostMessageType;
     } | {
@@ -98,6 +99,34 @@ export declare class SelectorShape extends BaseShapeTool {
         type: EPostMessageType;
     };
     consumeService(): undefined;
+    private updateTempPointsForSubWorker;
+    private computDrawPoints;
+    private drawForSubWorker;
+    private transformData;
+    subWorkerConsume(props: {
+        data: IWorkerMessage;
+        isFullWork?: boolean;
+    }): {
+        type: EPostMessageType;
+    } | {
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        rect: IRectType | undefined;
+        type: EPostMessageType;
+        dataType: EDataType;
+    };
+    subWorkerConsumeAll(props: {
+        data: IWorkerMessage;
+        isFullWork?: boolean;
+    }): {
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        rect: IRectType | undefined;
+        type: EPostMessageType;
+        dataType: EDataType;
+    };
     clearTmpPoints(): void;
     clearSelectData(): void;
     private selectSingleTool;

package/dist/core/types.d.ts

@@ -244,6 +244,7 @@ export interface IUpdateSelectorCallbackPropsType {
 export interface IActiveToolsDataType {
     toolsType: EToolsKey;
     toolsOpt: ShapeOptions;
+    combineUnitTime?: number;
 }
 export interface IActiveWorkDataType {
     workState: EvevtWorkState;

package/dist/core/worker/base.d.ts

@@ -12,6 +12,8 @@ export interface IWorkerInitOption {
     dpr: number;
     offscreenCanvasOpt: IOffscreenCanvasOptionType;
     layerOpt: ILayerOptionType;
+    combineUnitTime?: number;
+    syncUnitTime?: number;
 }
 export interface ISubWorkerInitOption {
     thread: WorkThreadEngineForFullWorker | WorkThreadEngineForSubWorker;
@@ -101,6 +103,9 @@ export declare abstract class LocalWork {
     protected drawCount: number;
     protected consumeCount: number;
     protected syncUnitTime: number;
+    protected combineUnitTime: number;
+    setCombineUnitTime(combineUnitTime: number): void;
+    setSyncUnitTime(syncUnitTime: number): void;
     constructor(opt: ISubWorkerInitOption);
     destroy(): void;
     getWorkShapes(): Map<string, BaseShapeTool>;

package/dist/core/worker/fullWorkerLocal.d.ts

@@ -4,7 +4,6 @@ import { ISubWorkerInitOption, LocalWork } from "./base";
 import { ServiceWorkForFullWorker } from "./fullWorkerService";
 import { WorkThreadEngineForFullWorker } from "./workerManager";
 export declare class LocalWorkForFullWorker extends LocalWork {
-    private combineUnitTime;
     private combineTimerId?;
     private combineDrawResolve?;
     private combineDrawActiveId?;

package/dist/core/worker/subWorkerLocal.d.ts

@@ -13,4 +13,5 @@ export declare class LocalWorkForSubWorker extends LocalWork {
     private removeNode;
     private drawPencil;
     private drawShape;
+    private drawSelector;
 }

package/dist/cursors/index.d.ts

@@ -1,5 +1,4 @@
 import { EventMessageType, EvevtWorkState, IMainMessage } from "../core";
-import { EventCollector } from "../collector/eventCollector";
 import { BaseSubWorkModuleProps, Displayer, RoomMember } from "../plugin/types";
 import { MemberDiff, RoomMemberManager } from "../members";
 import type { BaseApplianceManager } from "../plugin/baseApplianceManager";
@@ -39,8 +38,6 @@ export declare abstract class CursorManager {
     abstract readonly internalMsgEmitter: EventEmitter2;
     /** 插件管理器 */
     abstract readonly control: BaseApplianceManager;
-    /** 事件收集器 */
-    abstract eventCollector?: EventCollector;
     /** 房间成员管理器 */
     abstract readonly roomMember: RoomMemberManager;
     /** 激活事件收集器 */
@@ -79,7 +76,6 @@ export declare class CursorManagerImpl implements CursorManager {
     private cursorInfoMap;
     private doneRenderCursorInfoMap;
     constructor(props: BaseSubWorkModuleProps);
-    eventCollector?: EventCollector | undefined;
     activeCollector(): void;
     private mainMagixEventListener;
     onFocusViewChange(): void;

package/dist/displayer/const.d.ts

@@ -9,3 +9,4 @@ export declare const BarPadding: Margin;
 export declare const BarMargin: Margin;
 export declare const FontSizeList: readonly number[];
 export declare const SpeechBalloonPlacements: SpeechBalloonPlacement[];
+export declare const DefaultCursorIconMap: Map<string, string>;

package/dist/displayer/floatBar/dragBox/index.d.ts

@@ -1,4 +1,10 @@
 import React from "react";
+import { TextEditorInfo } from "../../../component/textEditor/types";
+export type PositionType = {
+    x: number;
+    y: number;
+};
 export declare const DraggableBox: (props: {
-    onClickHandle: (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
+    editors?: Map<string, TextEditorInfo>;
+    canSelectorSwitch: boolean;
 }) => React.JSX.Element;

package/dist/displayer/floatBar/index.d.ts

@@ -3,5 +3,5 @@ import { TextEditorInfo } from "../../component/textEditor";
 export declare const FloatBar: React.MemoExoticComponent<React.ForwardRefExoticComponent<{
     isHide: boolean;
     editors?: Map<string, TextEditorInfo>;
-    activeTextId?: string;
+    canSelectorSwitch: boolean;
 } & React.RefAttributes<HTMLDivElement>>>;

package/dist/displayer/utils.d.ts

@@ -0,0 +1 @@
+export declare const stopPropagationFunc: (e: React.PointerEvent<HTMLDivElement> | React.TouchEvent<HTMLDivElement>) => void;