@hufe921/canvas-editor 0.9.96 → 0.9.97

package/dist/src/editor/core/command/Command.d.ts

@@ -73,6 +73,8 @@ export declare class Command {
     executePaperDirection: CommandAdapt['paperDirection'];
     executeSetPaperMargin: CommandAdapt['setPaperMargin'];
     executeInsertElementList: CommandAdapt['insertElementList'];
+    executeInsertArea: CommandAdapt['insertArea'];
+    executeSetAreaProperties: CommandAdapt['setAreaProperties'];
     executeAppendElementList: CommandAdapt['appendElementList'];
     executeUpdateElementById: CommandAdapt['updateElementById'];
     executeSetValue: CommandAdapt['setValue'];
@@ -98,6 +100,7 @@ export declare class Command {
     getImage: CommandAdapt['getImage'];
     getOptions: CommandAdapt['getOptions'];
     getValue: CommandAdapt['getValue'];
+    getAreaValue: CommandAdapt['getAreaValue'];
     getHTML: CommandAdapt['getHTML'];
     getText: CommandAdapt['getText'];
     getWordCount: CommandAdapt['getWordCount'];

package/dist/src/editor/core/command/CommandAdapt.d.ts

@@ -20,6 +20,7 @@ import { IGetTitleValueOption, IGetTitleValueResult } from '../../interface/Titl
 import { IWatermark } from '../../interface/Watermark';
 import { Draw } from '../draw/Draw';
 import { INavigateInfo } from '../draw/interactive/Search';
+import { IGetAreaValueOption, IGetAreaValueResult, IInsertAreaOption, ISetAreaPropertiesOption } from '../../interface/Area';
 export declare class CommandAdapt {
     private draw;
     private range;
@@ -104,6 +105,7 @@ export declare class CommandAdapt {
     getImage(payload?: IGetImageOption): Promise<string[]>;
     getOptions(): DeepRequired<IEditorOption>;
     getValue(options?: IGetValueOption): IEditorResult;
+    getAreaValue(options?: IGetAreaValueOption): IGetAreaValueResult | null;
     getHTML(): IEditorHTML;
     getText(): IEditorText;
     getWordCount(): Promise<number>;
@@ -154,4 +156,6 @@ export declare class CommandAdapt {
     getPositionContextByEvent(evt: MouseEvent): IPositionContextByEvent | null;
     insertTitle(payload: IElement): void;
     focus(payload?: IFocusOption): void;
+    insertArea(payload: IInsertAreaOption): string | null;
+    setAreaProperties(payload: ISetAreaPropertiesOption): void;
 }

package/dist/src/editor/core/draw/Draw.d.ts

@@ -37,6 +37,7 @@ import { Override } from '../override/Override';
 import { LineBreakParticle } from './particle/LineBreakParticle';
 import { ITd } from '../../interface/table/Td';
 import { TableOperate } from './particle/table/TableOperate';
+import { Area } from './interactive/Area';
 export declare class Draw {
     private container;
     private pageContainer;
@@ -61,6 +62,7 @@ export declare class Draw {
     private background;
     private search;
     private group;
+    private area;
     private underline;
     private strikeout;
     private highlight;
@@ -150,6 +152,7 @@ export declare class Draw {
     getOptions(): DeepRequired<IEditorOption>;
     getSearch(): Search;
     getGroup(): Group;
+    getArea(): Area;
     getHistoryManager(): HistoryManager;
     getPosition(): Position;
     getZone(): Zone;

package/dist/src/editor/core/draw/control/Control.d.ts

@@ -1,4 +1,4 @@
-import { IControlContext, IControlHighlight, IControlInitOption, IControlInstance, IGetControlValueOption, IGetControlValueResult, IInitNextControlOption, INextControlContext, IRepaintControlOption, ISetControlExtensionOption, ISetControlProperties, ISetControlRowFlexOption, ISetControlValueOption } from '../../../interface/Control';
+import { IControlContext, IControlHighlight, IControlInitOption, IControlInstance, IDestroyControlOption, IGetControlValueOption, IGetControlValueResult, IInitNextControlOption, INextControlContext, IRepaintControlOption, ISetControlExtensionOption, ISetControlProperties, ISetControlRowFlexOption, ISetControlValueOption } from '../../../interface/Control';
 import { IElement, IElementPosition } from '../../../interface/Element';
 import { IRange } from '../../../interface/Range';
 import { Draw } from '../Draw';
@@ -16,6 +16,7 @@ export declare class Control {
     private options;
     private controlOptions;
     private activeControl;
+    private activeControlValue;
     constructor(draw: Draw);
     setHighlightList(payload: IControlHighlight[]): void;
     computeHighlightList(): void;
@@ -35,8 +36,9 @@ export declare class Control {
     getRange(): IRange;
     shrinkBoundary(context?: IControlContext): void;
     getActiveControl(): IControlInstance | null;
+    updateActiveControlValue(): void;
     initControl(): void;
-    destroyControl(): void;
+    destroyControl(options?: IDestroyControlOption): void;
     repaintControl(options?: IRepaintControlOption): void;
     reAwakeControl(): void;
     moveCursor(position: IControlInitOption): IMoveCursorResult;

package/dist/src/editor/core/draw/interactive/Area.d.ts

@@ -0,0 +1,18 @@
+import { Draw } from '../Draw';
+import { IAreaInfo, IGetAreaValueOption, IGetAreaValueResult, IInsertAreaOption, ISetAreaPropertiesOption } from '../../../interface/Area';
+export declare class Area {
+    private draw;
+    private zone;
+    private range;
+    private position;
+    private areaInfoMap;
+    constructor(draw: Draw);
+    getActiveAreaId(): string | null;
+    getActiveAreaInfo(): IAreaInfo | null;
+    isReadonly(): boolean;
+    insertArea(payload: IInsertAreaOption): string | null;
+    render(ctx: CanvasRenderingContext2D, pageNo: number): void;
+    compute(): void;
+    getAreaValue(options?: IGetAreaValueOption): IGetAreaValueResult | null;
+    setAreaProperties(payload: ISetAreaPropertiesOption): void;
+}

package/dist/src/editor/core/range/RangeManager.d.ts

@@ -1,6 +1,6 @@
 import { IControlContext } from '../../interface/Control';
 import { IElement } from '../../interface/Element';
-import { IRange, IRangeParagraphInfo, RangeRowArray, RangeRowMap } from '../../interface/Range';
+import { IRange, IRangeElementStyle, IRangeParagraphInfo, RangeRowArray, RangeRowMap } from '../../interface/Range';
 import { Draw } from '../draw/Draw';
 export declare class RangeManager {
     private draw;
@@ -10,9 +10,13 @@ export declare class RangeManager {
     private eventBus;
     private position;
     private historyManager;
+    private defaultStyle;
     constructor(draw: Draw);
     getRange(): IRange;
     clearRange(): void;
+    setDefaultStyle(style: IRangeElementStyle | null): void;
+    getDefaultStyle(): IRangeElementStyle | null;
+    getRangeAnchorStyle(elementList: IElement[], anchorIndex: number): IElement | null;
     getIsCollapsed(): boolean;
     getIsSelection(): boolean;
     getSelection(): IElement[] | null;

package/dist/src/editor/dataset/constant/Element.d.ts

@@ -12,6 +12,7 @@ export declare const TITLE_CONTEXT_ATTR: Array<keyof IElement>;
 export declare const LIST_CONTEXT_ATTR: Array<keyof IElement>;
 export declare const CONTROL_CONTEXT_ATTR: Array<keyof IElement>;
 export declare const CONTROL_STYLE_ATTR: Array<keyof IControlStyle>;
+export declare const AREA_CONTEXT_ATTR: Array<keyof IElement>;
 export declare const EDITOR_ELEMENT_CONTEXT_ATTR: Array<keyof IElement>;
 export declare const TEXTLIKE_ELEMENT_TYPE: ElementType[];
 export declare const IMAGE_ELEMENT_TYPE: ElementType[];

package/dist/src/editor/dataset/enum/Area.d.ts

@@ -0,0 +1,5 @@
+export declare enum AreaMode {
+    EDIT = "edit",
+    READONLY = "readonly",
+    FORM = "form"
+}

package/dist/src/editor/dataset/enum/Control.d.ts

@@ -17,3 +17,7 @@ export declare enum ControlIndentation {
     ROW_START = "rowStart",
     VALUE_START = "valueStart"
 }
+export declare enum ControlState {
+    ACTIVE = "active",
+    INACTIVE = "inactive"
+}

package/dist/src/editor/dataset/enum/Element.d.ts

@@ -8,6 +8,7 @@ export declare enum ElementType {
     SEPARATOR = "separator",
     PAGE_BREAK = "pageBreak",
     CONTROL = "control",
+    AREA = "area",
     CHECKBOX = "checkbox",
     RADIO = "radio",
     LATEX = "latex",

package/dist/src/editor/index.d.ts

@@ -11,7 +11,7 @@ import { IContextMenuContext, IRegisterContextMenu } from './interface/contextme
 import { EditorComponent, EditorZone, EditorMode, PageMode, PaperDirection, WordBreak, RenderMode } from './dataset/enum/Editor';
 import { EDITOR_CLIPBOARD, EDITOR_COMPONENT } from './dataset/constant/Editor';
 import { IWatermark } from './interface/Watermark';
-import { ControlIndentation, ControlType } from './dataset/enum/Control';
+import { ControlIndentation, ControlState, ControlType } from './dataset/enum/Control';
 import { INavigateInfo } from './core/draw/interactive/Search';
 import { KeyMap } from './dataset/enum/KeyMap';
 import { BlockType } from './dataset/enum/Block';
@@ -36,6 +36,7 @@ import { createDomFromElementList, getElementListByHTML, getTextFromElementList,
 import { BackgroundRepeat, BackgroundSize } from './dataset/enum/Background';
 import { TextDecorationStyle } from './dataset/enum/Text';
 import { LineNumberType } from './dataset/enum/LineNumber';
+import { AreaMode } from './dataset/enum/Area';
 export default class Editor {
     command: Command;
     listener: Listener;
@@ -48,5 +49,5 @@ export default class Editor {
 }
 export { splitText, createDomFromElementList, getElementListByHTML, getTextFromElementList };
 export { EDITOR_COMPONENT, LETTER_CLASS, INTERNAL_CONTEXT_MENU_KEY, EDITOR_CLIPBOARD };
-export { Editor, RowFlex, VerticalAlign, EditorZone, EditorMode, ElementType, ControlType, EditorComponent, PageMode, RenderMode, ImageDisplay, Command, KeyMap, BlockType, PaperDirection, TableBorder, TdBorder, TdSlash, MaxHeightRatio, NumberType, TitleLevel, ListType, ListStyle, WordBreak, ControlIndentation, BackgroundRepeat, BackgroundSize, TextDecorationStyle, LineNumberType, LocationPosition, IGetElementListByHTMLOption };
-export type { IElement, IEditorData, IEditorOption, IEditorResult, IContextMenuContext, IRegisterContextMenu, IWatermark, INavigateInfo, IBlock, ILang, ICatalog, ICatalogItem, IRange, IRangeStyle };
+export { Editor, RowFlex, VerticalAlign, EditorZone, EditorMode, ElementType, ControlType, EditorComponent, PageMode, RenderMode, ImageDisplay, Command, KeyMap, BlockType, PaperDirection, TableBorder, TdBorder, TdSlash, MaxHeightRatio, NumberType, TitleLevel, ListType, ListStyle, WordBreak, ControlIndentation, BackgroundRepeat, BackgroundSize, TextDecorationStyle, LineNumberType, LocationPosition, AreaMode, ControlState };
+export type { IElement, IEditorData, IEditorOption, IEditorResult, IContextMenuContext, IRegisterContextMenu, IWatermark, INavigateInfo, IBlock, ILang, ICatalog, ICatalogItem, IRange, IRangeStyle, IGetElementListByHTMLOption };

package/dist/src/editor/interface/Area.d.ts

@@ -0,0 +1,41 @@
+import { AreaMode } from '../dataset/enum/Area';
+import { LocationPosition } from '../dataset/enum/Common';
+import { IElement, IElementPosition } from './Element';
+export interface IAreaBasic {
+    extension?: unknown;
+}
+export interface IAreaStyle {
+    top?: number;
+    borderColor?: string;
+    backgroundColor?: string;
+}
+export interface IAreaRule {
+    mode?: AreaMode;
+}
+export type IArea = IAreaBasic & IAreaStyle & IAreaRule;
+export interface IInsertAreaOption {
+    id?: string;
+    area: IArea;
+    value: IElement[];
+    position?: LocationPosition;
+}
+export interface ISetAreaPropertiesOption {
+    id?: string;
+    properties: IArea;
+}
+export interface IGetAreaValueOption {
+    id?: string;
+}
+export interface IGetAreaValueResult {
+    id?: string;
+    area: IArea;
+    startPageNo: number;
+    endPageNo: number;
+    value: IElement[];
+}
+export interface IAreaInfo {
+    id: string;
+    area: IArea;
+    elementList: IElement[];
+    positionList: IElementPosition[];
+}

package/dist/src/editor/interface/Control.d.ts

@@ -1,5 +1,5 @@
 import { LocationPosition } from '../dataset/enum/Common';
-import { ControlType, ControlIndentation } from '../dataset/enum/Control';
+import { ControlType, ControlIndentation, ControlState } from '../dataset/enum/Control';
 import { EditorZone } from '../dataset/enum/Editor';
 import { MoveDirection } from '../dataset/enum/Observer';
 import { RowFlex } from '../dataset/enum/Row';
@@ -89,7 +89,7 @@ export interface IControlInitResult {
 export interface IControlInstance {
     setElement(element: IElement): void;
     getElement(): IElement;
-    getValue(): IElement[];
+    getValue(context?: IControlContext): IElement[];
     setValue(data: IElement[], context?: IControlContext, options?: IControlRuleOption): number;
     keydown(evt: KeyboardEvent): number | null;
     cut(): number;
@@ -105,6 +105,7 @@ export interface IControlRuleOption {
 export interface IGetControlValueOption {
     id?: string;
     conceptId?: string;
+    areaId?: string;
 }
 export type IGetControlValueResult = (Omit<IControl, 'value'> & {
     value: string | null;
@@ -115,17 +116,20 @@ export type IGetControlValueResult = (Omit<IControl, 'value'> & {
 export interface ISetControlValueOption {
     id?: string;
     conceptId?: string;
+    areaId?: string;
     value: string | IElement[];
 }
 export interface ISetControlExtensionOption {
     id?: string;
     conceptId?: string;
+    areaId?: string;
     extension: unknown;
 }
 export type ISetControlHighlightOption = IControlHighlight[];
 export type ISetControlProperties = {
     id?: string;
     conceptId?: string;
+    areaId?: string;
     properties: Partial<Omit<IControl, 'value'>>;
 };
 export type IRepaintControlOption = Pick<IDrawOption, 'curIndex' | 'isCompute' | 'isSubmitHistory' | 'isSetCursor'>;
@@ -145,3 +149,11 @@ export interface ISetControlRowFlexOption {
     availableWidth: number;
     controlRealWidth: number;
 }
+export interface IControlChangeResult {
+    state: ControlState;
+    control: IControl;
+    controlId: string;
+}
+export interface IDestroyControlOption {
+    isEmitEvent?: boolean;
+}

package/dist/src/editor/interface/Element.d.ts

@@ -5,6 +5,7 @@ import { ListStyle, ListType } from '../dataset/enum/List';
 import { RowFlex } from '../dataset/enum/Row';
 import { TitleLevel } from '../dataset/enum/Title';
 import { TableBorder } from '../dataset/enum/table/Table';
+import { IArea } from './Area';
 import { IBlock } from './Block';
 import { ICheckbox } from './Checkbox';
 import { IControl } from './Control';
@@ -106,7 +107,12 @@ export interface IImageElement {
 export interface IBlockElement {
     block?: IBlock;
 }
-export type IElement = IElementBasic & IElementStyle & IElementGroup & ITable & IHyperlinkElement & ISuperscriptSubscript & ISeparator & IControlElement & ICheckboxElement & IRadioElement & ILaTexElement & IDateElement & IImageElement & IBlockElement & ITitleElement & IListElement;
+export interface IAreaElement {
+    valueList?: IElement[];
+    areaId?: string;
+    area?: IArea;
+}
+export type IElement = IElementBasic & IElementStyle & IElementGroup & ITable & IHyperlinkElement & ISuperscriptSubscript & ISeparator & IControlElement & ICheckboxElement & IRadioElement & ILaTexElement & IDateElement & IImageElement & IBlockElement & ITitleElement & IListElement & IAreaElement;
 export interface IElementMetrics {
     width: number;
     height: number;

package/dist/src/editor/interface/Listener.d.ts

@@ -1,6 +1,6 @@
 import { EditorZone, ElementType, ListStyle, ListType, PageMode, TitleLevel } from '..';
 import { RowFlex } from '../dataset/enum/Row';
-import { IControl } from './Control';
+import { IControlChangeResult } from './Control';
 import { IEditorResult } from './Editor';
 import { IPositionContext } from './Position';
 import { ITextDecoration } from './Text';
@@ -34,7 +34,7 @@ export type IPageSizeChange = (payload: number) => void;
 export type IPageScaleChange = (payload: number) => void;
 export type ISaved = (payload: IEditorResult) => void;
 export type IContentChange = () => void;
-export type IControlChange = (payload: IControl | null) => void;
+export type IControlChange = (payload: IControlChangeResult) => void;
 export type IPageModeChange = (payload: PageMode) => void;
 export type IZoneChange = (payload: EditorZone) => void;
 export type IMouseEventChange = (evt: MouseEvent) => void;

package/dist/src/editor/interface/Range.d.ts

@@ -1,5 +1,5 @@
 import { EditorZone } from '../dataset/enum/Editor';
-import { IElement, IElementFillRect } from './Element';
+import { IElement, IElementFillRect, IElementStyle } from './Element';
 export interface IRange {
     startIndex: number;
     endIndex: number;
@@ -35,3 +35,4 @@ export interface IRangeParagraphInfo {
     elementList: IElement[];
     startIndex: number;
 }
+export type IRangeElementStyle = Pick<IElementStyle, 'bold' | 'color' | 'highlight' | 'font' | 'size' | 'italic' | 'underline' | 'strikeout'>;

package/dist/src/editor/interface/Row.d.ts

@@ -15,6 +15,7 @@ export interface IRow {
     isList?: boolean;
     listIndex?: number;
     offsetX?: number;
+    offsetY?: number;
     elementList: IRowElement[];
     isWidthNotEnough?: boolean;
     rowIndex: number;

package/dist/src/editor/utils/element.d.ts

@@ -14,6 +14,7 @@ interface IPickElementOption {
 export declare function pickElementAttr(payload: IElement, option?: IPickElementOption): IElement;
 interface IZipElementListOption {
     extraPickAttrs?: Array<keyof IElement>;
+    isClassifyArea?: boolean;
 }
 export declare function zipElementList(payload: IElement[], options?: IZipElementListOption): IElement[];
 export declare function convertTextAlignToRowFlex(node: HTMLElement): RowFlex;

package/dist/src/editor/utils/index.d.ts

@@ -22,3 +22,4 @@ export declare function findScrollContainer(element: HTMLElement): HTMLElement;
 export declare function isArrayEqual(arr1: unknown[], arr2: unknown[]): boolean;
 export declare function isObjectEqual(obj1: unknown, obj2: unknown): boolean;
 export declare function isRectIntersect(rect1: IElementFillRect, rect2: IElementFillRect): boolean;
+export declare function isNonValue(value: unknown): boolean;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@hufe921/canvas-editor",
   "author": "Hufe",
   "license": "MIT",
-  "version": "0.9.96",
+  "version": "0.9.97",
   "description": "rich text editor by canvas/svg",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",