@hufe921/canvas-editor 0.9.65 → 0.9.67

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

@@ -1,4 +1,4 @@
-import { ImageDisplay } from '../../dataset/enum/Control';
+import { ImageDisplay } from '../../dataset/enum/Common';
 import { EditorMode, EditorZone, PageMode, PaperDirection } from '../../dataset/enum/Editor';
 import { ListStyle, ListType } from '../../dataset/enum/List';
 import { RowFlex } from '../../dataset/enum/Row';
@@ -14,6 +14,7 @@ import { IElement } from '../../interface/Element';
 import { IPasteOption } from '../../interface/Event';
 import { IMargin } from '../../interface/Margin';
 import { IRange, RangeContext } from '../../interface/Range';
+import { ITextDecoration } from '../../interface/Text';
 import { IWatermark } from '../../interface/Watermark';
 import { Draw } from '../draw/Draw';
 import { INavigateInfo } from '../draw/interactive/Search';
@@ -52,7 +53,7 @@ export declare class CommandAdapt {
     sizeMinus(): void;
     bold(): void;
     italic(): void;
-    underline(): void;
+    underline(textDecoration?: ITextDecoration): void;
     strikeout(): void;
     superscript(): void;
     subscript(): void;

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

@@ -199,6 +199,7 @@ export declare class Draw {
     private _computePageList;
     private _drawRichText;
     drawRow(ctx: CanvasRenderingContext2D, payload: IDrawRowPayload): void;
+    private _drawFloat;
     private _clearPage;
     private _drawPage;
     private _disconnectLazyRender;
@@ -206,4 +207,5 @@ export declare class Draw {
     private _immediateRender;
     render(payload?: IDrawOption): void;
     destroy(): void;
+    clearSideEffect(): void;
 }

package/dist/src/editor/core/draw/control/text/TextControl.d.ts

@@ -6,7 +6,7 @@ export declare class TextControl implements IControlInstance {
     private control;
     constructor(element: IElement, control: Control);
     getElement(): IElement;
-    getValue(): IElement[];
+    getValue(context?: IControlContext): IElement[];
     setValue(data: IElement[], context?: IControlContext, options?: IControlRuleOption): number;
     clearValue(context?: IControlContext, options?: IControlRuleOption): number;
     keydown(evt: KeyboardEvent): number | null;

package/dist/src/editor/core/draw/particle/ImageParticle.d.ts

@@ -5,7 +5,13 @@ export declare class ImageParticle {
     private draw;
     protected options: Required<IEditorOption>;
     protected imageCache: Map<string, HTMLImageElement>;
+    private container;
+    private floatImageContainer;
+    private floatImage;
     constructor(draw: Draw);
+    createFloatImage(element: IElement): void;
+    dragFloatImage(movementX: number, movementY: number): void;
+    destroyFloatImage(): void;
     protected addImageObserver(promise: Promise<unknown>): void;
     protected getFallbackImage(width: number, height: number): HTMLImageElement;
     render(ctx: CanvasRenderingContext2D, element: IElement, x: number, y: number): void;

package/dist/src/editor/core/draw/particle/previewer/Previewer.d.ts

@@ -23,16 +23,17 @@ export declare class Previewer {
     private previewerContainer;
     private previewerImage;
     constructor(draw: Draw);
+    private _getElementPosition;
     private _createResizerDom;
     private _keydown;
     private _mousedown;
     private _mousemove;
-    private _dblclick;
     private _drawPreviewer;
     _setPreviewerTransform(scale: number, rotate: number, x: number, y: number): void;
     private _clearPreviewer;
     _updateResizerRect(width: number, height: number): void;
     _updateResizerSizeView(width: number, height: number): void;
-    drawResizer(element: IElement, position: IElementPosition, options?: IPreviewerDrawOption): void;
+    render(): void;
+    drawResizer(element: IElement, position?: IElementPosition | null, options?: IPreviewerDrawOption): void;
     clearResizer(): void;
 }

package/dist/src/editor/core/draw/richtext/AbstractRichText.d.ts

@@ -1,9 +1,11 @@
+import { TextDecorationStyle } from '../../../dataset/enum/Text';
 import { IElementFillRect } from '../../../interface/Element';
 export declare abstract class AbstractRichText {
-    fillRect: IElementFillRect;
-    fillColor?: string;
+    protected fillRect: IElementFillRect;
+    protected fillColor?: string;
+    protected fillDecorationStyle?: TextDecorationStyle;
     constructor();
     clearFillInfo(): IElementFillRect;
-    recordFillInfo(ctx: CanvasRenderingContext2D, x: number, y: number, width: number, height?: number, color?: string): void;
+    recordFillInfo(ctx: CanvasRenderingContext2D, x: number, y: number, width: number, height?: number, color?: string, decorationStyle?: TextDecorationStyle): void;
     abstract render(ctx: CanvasRenderingContext2D): void;
 }

package/dist/src/editor/core/draw/richtext/Underline.d.ts

@@ -3,5 +3,8 @@ import { Draw } from '../Draw';
 export declare class Underline extends AbstractRichText {
     private options;
     constructor(draw: Draw);
+    private _drawLine;
+    private _drawDouble;
+    private _drawWave;
     render(ctx: CanvasRenderingContext2D): void;
 }

package/dist/src/editor/core/event/handlers/mousedown.d.ts

@@ -1,2 +1,3 @@
 import { CanvasEvent } from '../CanvasEvent';
+export declare function setRangeCache(host: CanvasEvent): void;
 export declare function mousedown(evt: MouseEvent, host: CanvasEvent): void;

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

@@ -1,4 +1,4 @@
-import { IComputePageRowPositionPayload, IComputePageRowPositionResult, IComputeRowPositionPayload } from '../../interface/Position';
+import { IComputePageRowPositionPayload, IComputePageRowPositionResult, IComputeRowPositionPayload, IFloatPosition, IGetFloatPositionByXYPayload } from '../../interface/Position';
 import { IElement, IElementPosition } from '../../interface/Element';
 import { ICurrentPosition, IGetPositionByXYPayload, IPositionContext } from '../../interface/Position';
 import { Draw } from '../draw/Draw';
@@ -6,9 +6,11 @@ export declare class Position {
     private cursorPosition;
     private positionContext;
     private positionList;
+    private floatPositionList;
     private draw;
     private options;
     constructor(draw: Draw);
+    getFloatPositionList(): IFloatPosition[];
     getTablePositionList(sourceElementList: IElement[]): IElementPosition[];
     getPositionList(): IElementPosition[];
     getMainPositionList(): IElementPosition[];
@@ -24,5 +26,6 @@ export declare class Position {
     getPositionContext(): IPositionContext;
     setPositionContext(payload: IPositionContext): void;
     getPositionByXY(payload: IGetPositionByXYPayload): ICurrentPosition;
+    getFloatPositionByXY(payload: IGetFloatPositionByXYPayload): ICurrentPosition | void;
     adjustPositionContext(payload: IGetPositionByXYPayload): ICurrentPosition | null;
 }

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

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

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

@@ -9,6 +9,7 @@ export declare const TABLE_TD_ZIP_ATTR: Array<keyof ITd>;
 export declare const TABLE_CONTEXT_ATTR: Array<keyof IElement>;
 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 EDITOR_ELEMENT_CONTEXT_ATTR: Array<keyof IElement>;
 export declare const TEXTLIKE_ELEMENT_TYPE: ElementType[];
 export declare const INLINE_ELEMENT_TYPE: ElementType[];

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

@@ -7,3 +7,9 @@ export declare enum NumberType {
     ARABIC = "arabic",
     CHINESE = "chinese"
 }
+export declare enum ImageDisplay {
+    INLINE = "inline",
+    BLOCK = "block",
+    FLOAT_TOP = "float-top",
+    FLOAT_BOTTOM = "float-bottom"
+}

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

@@ -10,10 +10,6 @@ export declare enum ControlComponent {
     VALUE = "value",
     CHECKBOX = "checkbox"
 }
-export declare enum ImageDisplay {
-    INLINE = "inline",
-    BLOCK = "block"
-}
 export declare enum ControlIndentation {
     ROW_START = "rowStart",
     VALUE_START = "valueStart"

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

@@ -0,0 +1,12 @@
+export declare enum TextDecorationStyle {
+    SOLID = "solid",
+    DOUBLE = "double",
+    DASHED = "dashed",
+    DOTTED = "dotted",
+    WAVY = "wavy"
+}
+export declare enum DashType {
+    SOLID = "solid",
+    DASHED = "dashed",
+    DOTTED = "dotted"
+}

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

@@ -4,13 +4,14 @@ import { IElement } from './interface/Element';
 import { Command } from './core/command/Command';
 import { Listener } from './core/listener/Listener';
 import { RowFlex } from './dataset/enum/Row';
+import { ImageDisplay } from './dataset/enum/Common';
 import { ElementType } from './dataset/enum/Element';
 import { Register } from './core/register/Register';
 import { IContextMenuContext, IRegisterContextMenu } from './interface/contextmenu/ContextMenu';
 import { EditorComponent, EditorZone, EditorMode, PageMode, PaperDirection, WordBreak } from './dataset/enum/Editor';
 import { EDITOR_COMPONENT } from './dataset/constant/Editor';
 import { IWatermark } from './interface/Watermark';
-import { ControlIndentation, ControlType, ImageDisplay } from './dataset/enum/Control';
+import { ControlIndentation, ControlType } from './dataset/enum/Control';
 import { INavigateInfo } from './core/draw/interactive/Search';
 import { KeyMap } from './dataset/enum/KeyMap';
 import { BlockType } from './dataset/enum/Block';
@@ -32,6 +33,7 @@ import { INTERNAL_CONTEXT_MENU_KEY } from './dataset/constant/ContextMenu';
 import { IRange } from './interface/Range';
 import { splitText } from './utils';
 import { BackgroundRepeat, BackgroundSize } from './dataset/enum/Background';
+import { TextDecorationStyle } from './dataset/enum/Text';
 export default class Editor {
     command: Command;
     listener: Listener;
@@ -44,5 +46,5 @@ export default class Editor {
 }
 export { splitText };
 export { EDITOR_COMPONENT, LETTER_CLASS, INTERNAL_CONTEXT_MENU_KEY };
-export { Editor, RowFlex, VerticalAlign, EditorZone, EditorMode, ElementType, ControlType, EditorComponent, PageMode, ImageDisplay, Command, KeyMap, BlockType, PaperDirection, TableBorder, TdBorder, TdSlash, MaxHeightRatio, NumberType, TitleLevel, ListType, ListStyle, WordBreak, ControlIndentation, BackgroundRepeat, BackgroundSize };
+export { Editor, RowFlex, VerticalAlign, EditorZone, EditorMode, ElementType, ControlType, EditorComponent, PageMode, ImageDisplay, Command, KeyMap, BlockType, PaperDirection, TableBorder, TdBorder, TdSlash, MaxHeightRatio, NumberType, TitleLevel, ListType, ListStyle, WordBreak, ControlIndentation, BackgroundRepeat, BackgroundSize, TextDecorationStyle };
 export type { IElement, IEditorData, IEditorOption, IEditorResult, IContextMenuContext, IRegisterContextMenu, IWatermark, INavigateInfo, IBlock, ILang, ICatalog, ICatalogItem, IRange, IRangeStyle };

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

@@ -1,3 +1,4 @@
+import { ImageDisplay } from '../dataset/enum/Common';
 import { EditorMode, EditorZone } from '../dataset/enum/Editor';
 import { IElement, IElementPosition } from './Element';
 import { IRow } from './Row';
@@ -27,6 +28,10 @@ export interface IDrawRowPayload {
     innerWidth: number;
     zone?: EditorZone;
 }
+export interface IDrawFloatPayload {
+    pageNo: number;
+    imgDisplay: ImageDisplay;
+}
 export interface IDrawPagePayload {
     elementList: IElement[];
     positionList: IElementPosition[];

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

@@ -1,4 +1,5 @@
-import { ControlComponent, ImageDisplay } from '../dataset/enum/Control';
+import { ImageDisplay } from '../dataset/enum/Common';
+import { ControlComponent } from '../dataset/enum/Control';
 import { ElementType } from '../dataset/enum/Element';
 import { ListStyle, ListType } from '../dataset/enum/List';
 import { RowFlex } from '../dataset/enum/Row';
@@ -7,6 +8,7 @@ import { TableBorder } from '../dataset/enum/table/Table';
 import { IBlock } from './Block';
 import { ICheckbox } from './Checkbox';
 import { IControl } from './Control';
+import { ITextDecoration } from './Text';
 import { IColgroup } from './table/Colgroup';
 import { ITr } from './table/Tr';
 export interface IElementBasic {
@@ -28,6 +30,7 @@ export interface IElementStyle {
     rowFlex?: RowFlex;
     rowMargin?: number;
     letterSpacing?: number;
+    textDecoration?: ITextDecoration;
 }
 export interface IElementGroup {
     groupIds?: string[];
@@ -84,6 +87,10 @@ export interface IDateElement {
 }
 export interface IImageElement {
     imgDisplay?: ImageDisplay;
+    imgFloatPosition?: {
+        x: number;
+        y: number;
+    };
 }
 export interface IBlockElement {
     block?: IBlock;

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

@@ -2,6 +2,7 @@ import { EditorZone, ElementType, ListStyle, ListType, PageMode, TitleLevel } fr
 import { RowFlex } from '../dataset/enum/Row';
 import { IControl } from './Control';
 import { IEditorResult } from './Editor';
+import { ITextDecoration } from './Text';
 export interface IRangeStyle {
     type: ElementType | null;
     undo: boolean;
@@ -22,6 +23,7 @@ export interface IRangeStyle {
     listType: ListType | null;
     listStyle: ListStyle | null;
     groupIds: string[] | null;
+    textDecoration: ITextDecoration | null;
 }
 export declare type IRangeStyleChange = (payload: IRangeStyle) => void;
 export declare type IVisiblePageNoListChange = (payload: number[]) => void;

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

@@ -1,10 +1,12 @@
-import { IElement } from '..';
+import { IElement, ImageDisplay } from '..';
 import { EditorZone } from '../dataset/enum/Editor';
 import { IElementPosition } from './Element';
 import { IRow } from './Row';
 import { ITd } from './table/Td';
 export interface ICurrentPosition {
     index: number;
+    x?: number;
+    y?: number;
     isCheckbox?: boolean;
     isControl?: boolean;
     isImage?: boolean;
@@ -29,6 +31,9 @@ export interface IGetPositionByXYPayload {
     elementList?: IElement[];
     positionList?: IElementPosition[];
 }
+export declare type IGetFloatPositionByXYPayload = IGetPositionByXYPayload & {
+    imgDisplay: ImageDisplay;
+};
 export interface IPositionContext {
     isTable: boolean;
     isCheckbox?: boolean;
@@ -53,9 +58,24 @@ export interface IComputePageRowPositionPayload {
     startX: number;
     startY: number;
     innerWidth: number;
+    isTable?: boolean;
+    index?: number;
+    tdIndex?: number;
+    trIndex?: number;
+    tdValueIndex?: number;
 }
 export interface IComputePageRowPositionResult {
     x: number;
     y: number;
     index: number;
 }
+export interface IFloatPosition {
+    pageNo: number;
+    element: IElement;
+    position: IElementPosition;
+    isTable?: boolean;
+    index?: number;
+    tdIndex?: number;
+    trIndex?: number;
+    tdValueIndex?: number;
+}

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

@@ -0,0 +1,4 @@
+import { TextDecorationStyle } from '../dataset/enum/Text';
+export interface ITextDecoration {
+    style?: TextDecorationStyle;
+}

package/dist/src/editor/interface/table/Td.d.ts

@@ -20,8 +20,8 @@ export interface ITd {
     positionList?: IElementPosition[];
     verticalAlign?: VerticalAlign;
     backgroundColor?: string;
-    borderType?: TdBorder;
-    slashType?: TdSlash;
+    borderTypes?: TdBorder[];
+    slashTypes?: TdSlash[];
     mainHeight?: number;
     realHeight?: number;
     realMinHeight?: number;

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

@@ -18,3 +18,4 @@ export declare function omitObject<T>(object: T, omitKeys: (keyof T)[]): T;
 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;

package/package.json

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