@hufe921/canvas-editor 0.9.92 → 0.9.94

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

@@ -101,6 +101,7 @@ export declare class Command {
     getHTML: CommandAdapt['getHTML'];
     getText: CommandAdapt['getText'];
     getWordCount: CommandAdapt['getWordCount'];
+    getCursorPosition: CommandAdapt['getCursorPosition'];
     getRange: CommandAdapt['getRange'];
     getRangeText: CommandAdapt['getRangeText'];
     getRangeContext: CommandAdapt['getRangeContext'];

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

@@ -10,7 +10,7 @@ import { DeepRequired } from '../../interface/Common';
 import { IGetControlValueOption, IGetControlValueResult, ILocationControlOption, ISetControlExtensionOption, ISetControlHighlightOption, ISetControlProperties, ISetControlValueOption } from '../../interface/Control';
 import { IAppendElementListOption, IDrawImagePayload, IForceUpdateOption, IGetImageOption, IGetValueOption, IPainterOption } from '../../interface/Draw';
 import { IEditorData, IEditorHTML, IEditorOption, IEditorResult, IEditorText, IFocusOption, ISetValueOption, IUpdateOption } from '../../interface/Editor';
-import { IElement, IUpdateElementByIdOption } from '../../interface/Element';
+import { IElement, IElementPosition, IUpdateElementByIdOption } from '../../interface/Element';
 import { IPasteOption, IPositionContextByEvent } from '../../interface/Event';
 import { IMargin } from '../../interface/Margin';
 import { IRange, RangeContext } from '../../interface/Range';
@@ -25,13 +25,13 @@ export declare class CommandAdapt {
     private position;
     private historyManager;
     private canvasEvent;
-    private tableTool;
     private options;
     private control;
     private workerManager;
     private searchManager;
     private i18n;
     private zone;
+    private tableOperate;
     constructor(draw: Draw);
     mode(payload: EditorMode): void;
     cut(): void;
@@ -106,6 +106,7 @@ export declare class CommandAdapt {
     getHTML(): IEditorHTML;
     getText(): IEditorText;
     getWordCount(): Promise<number>;
+    getCursorPosition(): IElementPosition | null;
     getRange(): IRange;
     getRangeText(): string;
     getRangeContext(): RangeContext | null;

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

@@ -36,6 +36,7 @@ import { Group } from './interactive/Group';
 import { Override } from '../override/Override';
 import { LineBreakParticle } from './particle/LineBreakParticle';
 import { ITd } from '../../interface/table/Td';
+import { TableOperate } from './particle/table/TableOperate';
 export declare class Draw {
     private container;
     private pageContainer;
@@ -70,6 +71,7 @@ export declare class Draw {
     private textParticle;
     private tableParticle;
     private tableTool;
+    private tableOperate;
     private pageNumber;
     private lineNumber;
     private waterMark;
@@ -174,6 +176,7 @@ export declare class Draw {
     getPreviewer(): Previewer;
     getImageParticle(): ImageParticle;
     getTableTool(): TableTool;
+    getTableOperate(): TableOperate;
     getTableParticle(): TableParticle;
     getHeader(): Header;
     getFooter(): Footer;

package/dist/src/editor/core/draw/particle/table/TableOperate.d.ts

@@ -0,0 +1,28 @@
+import { TableBorder, VerticalAlign } from '../../../..';
+import { TdBorder, TdSlash } from '../../../../dataset/enum/table/Table';
+import { Draw } from '../../Draw';
+export declare class TableOperate {
+    private draw;
+    private range;
+    private position;
+    private tableTool;
+    private tableParticle;
+    private options;
+    constructor(draw: Draw);
+    insertTable(row: number, col: number): void;
+    insertTableTopRow(): void;
+    insertTableBottomRow(): void;
+    insertTableLeftCol(): void;
+    insertTableRightCol(): void;
+    deleteTableRow(): void;
+    deleteTableCol(): void;
+    deleteTable(): void;
+    mergeTableCell(): void;
+    cancelMergeTableCell(): void;
+    tableTdVerticalAlign(payload: VerticalAlign): void;
+    tableBorderType(payload: TableBorder): void;
+    tableTdBorderType(payload: TdBorder): void;
+    tableTdSlashType(payload: TdSlash): void;
+    tableTdBackgroundColor(payload: string): void;
+    tableSelectAll(): void;
+}

package/dist/src/editor/core/draw/particle/table/TableTool.d.ts

@@ -2,13 +2,20 @@ import { Draw } from '../../Draw';
 export declare class TableTool {
     private readonly MIN_TD_WIDTH;
     private readonly ROW_COL_OFFSET;
+    private readonly ROW_COL_QUICK_WIDTH;
+    private readonly ROW_COL_QUICK_OFFSET;
+    private readonly ROW_COL_QUICK_POSITION;
     private readonly BORDER_VALUE;
+    private readonly TABLE_SELECT_OFFSET;
     private draw;
     private canvas;
     private options;
     private position;
     private container;
     private toolRowContainer;
+    private toolRowAddBtn;
+    private toolColAddBtn;
+    private toolTableSelectBtn;
     private toolColContainer;
     private toolBorderContainer;
     private anchorLine;

package/dist/src/editor/core/event/GlobalEvent.d.ts

@@ -11,6 +11,7 @@ export declare class GlobalEvent {
     private hyperlinkParticle;
     private control;
     private dateParticle;
+    private imageParticle;
     private dprMediaQueryList;
     constructor(draw: Draw, canvasEvent: CanvasEvent);
     register(): void;

package/dist/src/editor/core/position/Position.d.ts

@@ -1,4 +1,4 @@
-import { IComputePageRowPositionPayload, IComputePageRowPositionResult, IComputeRowPositionPayload, IFloatPosition, IGetFloatPositionByXYPayload } from '../../interface/Position';
+import { IComputePageRowPositionPayload, IComputePageRowPositionResult, IComputeRowPositionPayload, IFloatPosition, IGetFloatPositionByXYPayload, ISetSurroundPositionPayload } from '../../interface/Position';
 import { IElement, IElementPosition } from '../../interface/Element';
 import { ICurrentPosition, IGetPositionByXYPayload, IPositionContext } from '../../interface/Position';
 import { Draw } from '../draw/Draw';
@@ -30,4 +30,8 @@ export declare class Position {
     getPositionByXY(payload: IGetPositionByXYPayload): ICurrentPosition;
     getFloatPositionByXY(payload: IGetFloatPositionByXYPayload): ICurrentPosition | void;
     adjustPositionContext(payload: IGetPositionByXYPayload): ICurrentPosition | null;
+    setSurroundPosition(payload: ISetSurroundPositionPayload): {
+        x: number;
+        rowIncreaseWidth: number;
+    };
 }

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

@@ -23,6 +23,7 @@ export declare const INTERNAL_CONTEXT_MENU_KEY: {
         TEXT_WRAP: string;
         TEXT_WRAP_EMBED: string;
         TEXT_WRAP_UP_DOWN: string;
+        TEXT_WRAP_SURROUND: string;
         TEXT_WRAP_FLOAT_TOP: string;
         TEXT_WRAP_FLOAT_BOTTOM: string;
     };

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

@@ -10,6 +10,7 @@ export declare enum NumberType {
 export declare enum ImageDisplay {
     INLINE = "inline",
     BLOCK = "block",
+    SURROUND = "surround",
     FLOAT_TOP = "float-top",
     FLOAT_BOTTOM = "float-bottom"
 }

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

@@ -32,6 +32,7 @@ import { LETTER_CLASS } from './dataset/constant/Common';
 import { INTERNAL_CONTEXT_MENU_KEY } from './dataset/constant/ContextMenu';
 import { IRange } from './interface/Range';
 import { splitText } from './utils';
+import { createDomFromElementList } from './utils/element';
 import { BackgroundRepeat, BackgroundSize } from './dataset/enum/Background';
 import { TextDecorationStyle } from './dataset/enum/Text';
 import { LineNumberType } from './dataset/enum/LineNumber';
@@ -45,7 +46,7 @@ export default class Editor {
     use: UsePlugin;
     constructor(container: HTMLDivElement, data: IEditorData | IElement[], options?: IEditorOption);
 }
-export { splitText };
+export { splitText, createDomFromElementList };
 export { EDITOR_COMPONENT, LETTER_CLASS, INTERNAL_CONTEXT_MENU_KEY };
 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 };
 export type { IElement, IEditorData, IEditorOption, IEditorResult, IContextMenuContext, IRegisterContextMenu, IWatermark, INavigateInfo, IBlock, ILang, ICatalog, ICatalogItem, IRange, IRangeStyle };

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

@@ -3,6 +3,7 @@ export interface ICatalogItem {
     id: string;
     name: string;
     level: TitleLevel;
+    pageNo: number;
     subCatalog: ICatalogItem[];
 }
 export type ICatalog = ICatalogItem[];

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

@@ -106,11 +106,12 @@ export type IGetControlValueResult = (Omit<IControl, 'value'> & {
     value: string | null;
     innerText: string | null;
     zone: EditorZone;
+    elementList?: IElement[];
 })[];
 export interface ISetControlValueOption {
     id?: string;
     conceptId?: string;
-    value: string;
+    value: string | IElement[];
 }
 export interface ISetControlExtensionOption {
     id?: string;

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

@@ -33,7 +33,7 @@ export interface IDrawRowPayload {
 }
 export interface IDrawFloatPayload {
     pageNo: number;
-    imgDisplay: ImageDisplay;
+    imgDisplays: ImageDisplay[];
 }
 export interface IDrawPagePayload {
     elementList: IElement[];
@@ -58,5 +58,11 @@ export interface IGetImageOption {
 export interface IComputeRowListPayload {
     innerWidth: number;
     elementList: IElement[];
+    startX?: number;
+    startY?: number;
+    isFromTable?: boolean;
     isPagingMode?: boolean;
+    pageHeight?: number;
+    mainOuterHeight?: number;
+    surroundElementList?: IElement[];
 }

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

@@ -100,6 +100,7 @@ export interface IImageElement {
     imgFloatPosition?: {
         x: number;
         y: number;
+        pageNo?: number;
     };
 }
 export interface IBlockElement {

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

@@ -3,4 +3,5 @@ export interface IFooter {
     bottom?: number;
     maxHeightRadio?: MaxHeightRatio;
     disabled?: boolean;
+    editable?: boolean;
 }

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

@@ -3,4 +3,5 @@ export interface IHeader {
     top?: number;
     maxHeightRadio?: MaxHeightRatio;
     disabled?: boolean;
+    editable?: boolean;
 }

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

@@ -1,7 +1,7 @@
 import { IElement, ImageDisplay, IRange } from '..';
 import { EditorZone } from '../dataset/enum/Editor';
-import { IElementPosition } from './Element';
-import { IRow } from './Row';
+import { IElementFillRect, IElementPosition } from './Element';
+import { IRow, IRowElement } from './Row';
 import { ITd } from './table/Td';
 export interface ICurrentPosition {
     index: number;
@@ -33,7 +33,7 @@ export interface IGetPositionByXYPayload {
     positionList?: IElementPosition[];
 }
 export type IGetFloatPositionByXYPayload = IGetPositionByXYPayload & {
-    imgDisplay: ImageDisplay;
+    imgDisplays: ImageDisplay[];
 };
 export interface IPositionContext {
     isTable: boolean;
@@ -90,3 +90,11 @@ export interface ILocationPosition {
     range: IRange;
     positionContext: IPositionContext;
 }
+export interface ISetSurroundPositionPayload {
+    row: IRow;
+    rowElement: IRowElement;
+    rowElementRect: IElementFillRect;
+    pageNo: number;
+    availableWidth: number;
+    surroundElementList: IElement[];
+}

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

@@ -28,6 +28,8 @@ export type RangeContext = {
     tableElement: IElement | null;
     selectionText: string | null;
     selectionElementList: IElement[];
+    titleId: string | null;
+    titleStartPageNo: number | null;
 };
 export interface IRangeParagraphInfo {
     elementList: IElement[];

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

@@ -18,4 +18,5 @@ export interface IRow {
     elementList: IRowElement[];
     isWidthNotEnough?: boolean;
     rowIndex: number;
+    isSurround?: boolean;
 }

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

@@ -4,4 +4,6 @@ export interface IWatermark {
     opacity?: number;
     size?: number;
     font?: string;
+    repeat?: boolean;
+    gap?: [horizontal: number, vertical: number];
 }

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

@@ -33,7 +33,7 @@ export interface IElementListGroupRowFlex {
     data: IElement[];
 }
 export declare function groupElementListByRowFlex(elementList: IElement[]): IElementListGroupRowFlex[];
-export declare function createDomFromElementList(elementList: IElement[], options: DeepRequired<IEditorOption>): HTMLDivElement;
+export declare function createDomFromElementList(elementList: IElement[], options?: IEditorOption): HTMLDivElement;
 export declare function convertTextNodeToElement(textNode: Element | Node): IElement | null;
 interface IGetElementListByHTMLOption {
     innerWidth: number;
@@ -43,4 +43,6 @@ export declare function getTextFromElementList(elementList: IElement[]): string;
 export declare function getSlimCloneElementList(elementList: IElement[]): IElement[];
 export declare function getIsBlockElement(element?: IElement): boolean;
 export declare function replaceHTMLElementTag(oldDom: HTMLElement, tagName: keyof HTMLElementTagNameMap): HTMLElement;
+export declare function pickSurroundElementList(elementList: IElement[]): IElement[];
+export declare function deleteSurroundElementList(elementList: IElement[], pageNo: number): void;
 export {};

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

@@ -1,3 +1,4 @@
+import { IElementFillRect } from '../interface/Element';
 export declare function debounce<T extends unknown[]>(func: (...arg: T) => unknown, delay: number): (this: unknown, ...args: T) => void;
 export declare function throttle<T extends unknown[]>(func: (...arg: T) => unknown, delay: number): (this: unknown, ...args: T) => void;
 export declare function deepCloneOmitKeys<T, K>(obj: T, omitKeys: (keyof K)[]): T;
@@ -20,3 +21,4 @@ export declare function convertStringToBase64(input: string): string;
 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;

package/package.json

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