@hufe921/canvas-editor 0.9.72 → 0.9.74

package/dist/src/editor/core/cursor/Cursor.d.ts

@@ -3,7 +3,7 @@ import { ICursorOption } from '../../interface/Cursor';
 import { IElementPosition } from '../../interface/Element';
 import { Draw } from '../draw/Draw';
 import { CanvasEvent } from '../event/CanvasEvent';
-export declare type IDrawCursorOption = ICursorOption & {
+export type IDrawCursorOption = ICursorOption & {
     isShow?: boolean;
     isBlink?: boolean;
     isFocus?: boolean;

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

@@ -1,4 +1,4 @@
-import { IAppendElementListOption, IDrawOption, IDrawRowPayload, IGetImageOption, IGetValueOption, IPainterOption } from '../../interface/Draw';
+import { IAppendElementListOption, IComputeRowListPayload, IDrawOption, IDrawRowPayload, IGetImageOption, IGetValueOption, IPainterOption } from '../../interface/Draw';
 import { IEditorData, IEditorOption, IEditorResult } from '../../interface/Editor';
 import { IElement, IElementStyle } from '../../interface/Element';
 import { IRow } from '../../interface/Row';
@@ -196,7 +196,8 @@ export declare class Draw {
     private _initPageContext;
     getElementFont(el: IElement, scale?: number): string;
     getElementSize(el: IElement): number;
-    computeRowList(innerWidth: number, elementList: IElement[]): IRow[];
+    getElementRowMargin(el: IElement): number;
+    computeRowList(payload: IComputeRowListPayload): IRow[];
     private _computePageList;
     private _drawHighlight;
     drawRow(ctx: CanvasRenderingContext2D, payload: IDrawRowPayload): void;

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

@@ -7,6 +7,7 @@ interface IMoveCursorResult {
     newElement: IElement;
 }
 export declare class Control {
+    private controlBorder;
     private draw;
     private range;
     private listener;
@@ -30,7 +31,7 @@ export declare class Control {
     getPosition(): IElementPosition | null;
     getPreY(): number;
     getRange(): IRange;
-    shrinkBoundary(): void;
+    shrinkBoundary(context?: IControlContext): void;
     getActiveControl(): IControlInstance | null;
     initControl(): void;
     destroyControl(): void;
@@ -47,5 +48,7 @@ export declare class Control {
     setExtensionByConceptId(payload: ISetControlExtensionOption): void;
     setPropertiesByConceptId(payload: ISetControlProperties): void;
     getList(): IElement[];
+    recordBorderInfo(x: number, y: number, width: number, height: number): void;
+    drawBorder(ctx: CanvasRenderingContext2D): void;
 }
 export {};

package/dist/src/editor/core/draw/control/interactive/ControlSearch.d.ts

@@ -1,7 +1,7 @@
 import { IControlHighlight, IControlHighlightRule } from '../../../../interface/Control';
 import { ISearchResult } from '../../../../interface/Search';
 import { Control } from '../Control';
-declare type IHighlightMatchResult = (ISearchResult & IControlHighlightRule)[];
+type IHighlightMatchResult = (ISearchResult & IControlHighlightRule)[];
 export declare class ControlSearch {
     private draw;
     private options;

package/dist/src/editor/core/draw/control/richtext/Border.d.ts

@@ -0,0 +1,10 @@
+import { IElementFillRect } from '../../../../interface/Element';
+import { Draw } from '../../Draw';
+export declare class ControlBorder {
+    protected borderRect: IElementFillRect;
+    private options;
+    constructor(draw: Draw);
+    clearBorderInfo(): IElementFillRect;
+    recordBorderInfo(x: number, y: number, width: number, height: number): void;
+    render(ctx: CanvasRenderingContext2D): void;
+}

package/dist/src/editor/core/draw/particle/block/modules/IFrameBlock.d.ts

@@ -3,5 +3,6 @@ export declare class IFrameBlock {
     private static readonly sandbox;
     private element;
     constructor(element: IRowElement);
+    private _defineIframeProperties;
     render(blockItemContainer: HTMLDivElement): void;
 }

package/dist/src/editor/core/history/HistoryManager.d.ts

@@ -9,5 +9,6 @@ export declare class HistoryManager {
     execute(fn: Function): void;
     isCanUndo(): boolean;
     isCanRedo(): boolean;
+    isStackEmpty(): boolean;
     recovery(): void;
 }

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

@@ -1,5 +1,6 @@
+import { IControlContext } from '../../interface/Control';
 import { IElement } from '../../interface/Element';
-import { IRange, RangeRowArray, RangeRowMap } from '../../interface/Range';
+import { IRange, IRangeParagraphInfo, RangeRowArray, RangeRowMap } from '../../interface/Range';
 import { Draw } from '../draw/Draw';
 export declare class RangeManager {
     private draw;
@@ -20,6 +21,7 @@ export declare class RangeManager {
     getRangeRow(): RangeRowMap | null;
     getRangeRowElementList(): IElement[] | null;
     getRangeParagraph(): RangeRowArray | null;
+    getRangeParagraphInfo(): IRangeParagraphInfo | null;
     getRangeParagraphElementList(): IElement[] | null;
     getIsSelectAll(): boolean;
     getIsPointInRange(x: number, y: number): boolean;
@@ -29,7 +31,7 @@ export declare class RangeManager {
     replaceRange(range: IRange): void;
     setRangeStyle(): void;
     recoveryRangeStyle(): void;
-    shrinkBoundary(): void;
+    shrinkBoundary(context?: IControlContext): void;
     render(ctx: CanvasRenderingContext2D, x: number, y: number, width: number, height: number): void;
     toString(): string;
 }

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

@@ -1,6 +1,7 @@
 import { ElementType } from '../enum/Element';
 import { IElement } from '../../interface/Element';
 import { ITd } from '../../interface/table/Td';
+import { IControlStyle } from '../../interface/Control';
 export declare const EDITOR_ELEMENT_STYLE_ATTR: Array<keyof IElement>;
 export declare const EDITOR_ROW_ATTR: Array<keyof IElement>;
 export declare const EDITOR_ELEMENT_COPY_ATTR: Array<keyof IElement>;
@@ -10,6 +11,7 @@ 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 CONTROL_STYLE_ATTR: Array<keyof IControlStyle>;
 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/constant/Regular.d.ts

@@ -5,3 +5,4 @@ export declare const SURROGATE_PAIR_REG: RegExp;
 export declare const EMOJI_REG: RegExp;
 export declare const UNICODE_SYMBOL_REG: RegExp;
 export declare const PUNCTUATION_REG: RegExp;
+export declare const START_LINE_BREAK_REG: RegExp;

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

@@ -5,7 +5,8 @@ export declare enum ListType {
 export declare enum UlStyle {
     DISC = "disc",
     CIRCLE = "circle",
-    SQUARE = "square"
+    SQUARE = "square",
+    CHECKBOX = "checkbox"
 }
 export declare enum OlStyle {
     DECIMAL = "decimal"
@@ -14,5 +15,6 @@ export declare enum ListStyle {
     DISC = "disc",
     CIRCLE = "circle",
     SQUARE = "square",
-    DECIMAL = "decimal"
+    DECIMAL = "decimal",
+    CHECKBOX = "checkbox"
 }

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

@@ -1,6 +1,7 @@
 import { BlockType } from '../dataset/enum/Block';
 export interface IIFrameBlock {
-    src: string;
+    src?: string;
+    srcdoc?: string;
 }
 export interface IVideoBlock {
     src: string;

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

@@ -5,4 +5,4 @@ export interface ICatalogItem {
     level: TitleLevel;
     subCatalog: ICatalogItem[];
 }
-export declare type ICatalog = ICatalogItem[];
+export type ICatalog = ICatalogItem[];

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

@@ -1,12 +1,12 @@
-export declare type Primitive = string | number | boolean | bigint | symbol | undefined | null;
-export declare type Builtin = Primitive | Function | Date | Error | RegExp;
-export declare type DeepRequired<T> = T extends Error ? Required<T> : T extends Builtin ? T : T extends Map<infer K, infer V> ? Map<DeepRequired<K>, DeepRequired<V>> : T extends ReadonlyMap<infer K, infer V> ? ReadonlyMap<DeepRequired<K>, DeepRequired<V>> : T extends WeakMap<infer K, infer V> ? WeakMap<DeepRequired<K>, DeepRequired<V>> : T extends Set<infer U> ? Set<DeepRequired<U>> : T extends ReadonlySet<infer U> ? ReadonlySet<DeepRequired<U>> : T extends WeakSet<infer U> ? WeakSet<DeepRequired<U>> : T extends Promise<infer U> ? Promise<DeepRequired<U>> : T extends {} ? {
+export type Primitive = string | number | boolean | bigint | symbol | undefined | null;
+export type Builtin = Primitive | Function | Date | Error | RegExp;
+export type DeepRequired<T> = T extends Error ? Required<T> : T extends Builtin ? T : T extends Map<infer K, infer V> ? Map<DeepRequired<K>, DeepRequired<V>> : T extends ReadonlyMap<infer K, infer V> ? ReadonlyMap<DeepRequired<K>, DeepRequired<V>> : T extends WeakMap<infer K, infer V> ? WeakMap<DeepRequired<K>, DeepRequired<V>> : T extends Set<infer U> ? Set<DeepRequired<U>> : T extends ReadonlySet<infer U> ? ReadonlySet<DeepRequired<U>> : T extends WeakSet<infer U> ? WeakSet<DeepRequired<U>> : T extends Promise<infer U> ? Promise<DeepRequired<U>> : T extends {} ? {
     [K in keyof T]-?: DeepRequired<T[K]>;
 } : Required<T>;
-export declare type DeepPartial<T> = {
+export type DeepPartial<T> = {
     [P in keyof T]?: DeepPartial<T[P]>;
 };
-export declare type IPadding = [
+export type IPadding = [
     top: number,
     right: number,
     bottom: number,

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

@@ -40,15 +40,26 @@ export interface IControlBasic {
     postfix?: string;
     minWidth?: number;
     underline?: boolean;
+    border?: boolean;
     extension?: unknown;
     indentation?: ControlIndentation;
 }
-export declare type IControl = IControlBasic & IControlRule & Partial<IControlSelect> & Partial<IControlCheckbox>;
+export interface IControlStyle {
+    font?: string;
+    size?: number;
+    bold?: boolean;
+    highlight?: string;
+    italic?: boolean;
+    strikeout?: boolean;
+}
+export type IControl = IControlBasic & IControlRule & Partial<IControlSelect> & Partial<IControlCheckbox> & Partial<IControlStyle>;
 export interface IControlOption {
     placeholderColor?: string;
     bracketColor?: string;
     prefix?: string;
     postfix?: string;
+    borderWidth?: number;
+    borderColor?: string;
 }
 export interface IControlInitOption {
     index: number;
@@ -77,7 +88,7 @@ export interface IControlRuleOption {
 export interface IGetControlValueOption {
     conceptId: string;
 }
-export declare type IGetControlValueResult = (Omit<IControl, 'value'> & {
+export type IGetControlValueResult = (Omit<IControl, 'value'> & {
     value: string | null;
     innerText: string | null;
     zone: EditorZone;
@@ -90,8 +101,8 @@ export interface ISetControlExtensionOption {
     conceptId: string;
     extension: unknown;
 }
-export declare type ISetControlHighlightOption = IControlHighlight[];
-export declare type ISetControlProperties = {
+export type ISetControlHighlightOption = IControlHighlight[];
+export type ISetControlProperties = {
     conceptId: string;
     properties: Partial<Omit<IControl, 'value'>>;
 };

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

@@ -10,6 +10,7 @@ export interface IDrawOption {
     isLazy?: boolean;
     isInit?: boolean;
     isSourceHistory?: boolean;
+    isFirstRender?: boolean;
 }
 export interface IForceUpdateOption {
     isSubmitHistory?: boolean;
@@ -51,3 +52,8 @@ export interface IGetImageOption {
     pixelRatio?: number;
     mode?: EditorMode;
 }
+export interface IComputeRowListPayload {
+    innerWidth: number;
+    elementList: IElement[];
+    isPagingMode?: boolean;
+}

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

@@ -90,4 +90,4 @@ export interface IEditorHTML {
     main: string;
     footer: string;
 }
-export declare type IEditorText = IEditorHTML;
+export type IEditorText = IEditorHTML;

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

@@ -15,6 +15,7 @@ export interface IElementBasic {
     id?: string;
     type?: ElementType;
     value: string;
+    extension?: unknown;
 }
 export interface IElementStyle {
     font?: string;
@@ -59,7 +60,7 @@ export interface ITableElement {
     conceptId?: string;
     pagingId?: string;
 }
-export declare type ITable = ITableAttr & ITableElement;
+export type ITable = ITableAttr & ITableElement;
 export interface IHyperlinkElement {
     valueList?: IElement[];
     url?: string;
@@ -96,7 +97,7 @@ export interface IImageElement {
 export interface IBlockElement {
     block?: IBlock;
 }
-export declare type IElement = IElementBasic & IElementStyle & IElementGroup & ITable & IHyperlinkElement & ISuperscriptSubscript & ISeparator & IControlElement & ICheckboxElement & ILaTexElement & IDateElement & IImageElement & IBlockElement & ITitleElement & IListElement;
+export type IElement = IElementBasic & IElementStyle & IElementGroup & ITable & IHyperlinkElement & ISuperscriptSubscript & ISeparator & IControlElement & ICheckboxElement & ILaTexElement & IDateElement & IImageElement & IBlockElement & ITitleElement & IListElement;
 export interface IElementMetrics {
     width: number;
     height: number;

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

@@ -24,14 +24,15 @@ export interface IRangeStyle {
     listStyle: ListStyle | null;
     groupIds: string[] | null;
     textDecoration: ITextDecoration | null;
+    extension?: unknown | null;
 }
-export declare type IRangeStyleChange = (payload: IRangeStyle) => void;
-export declare type IVisiblePageNoListChange = (payload: number[]) => void;
-export declare type IIntersectionPageNoChange = (payload: number) => void;
-export declare type IPageSizeChange = (payload: number) => void;
-export declare type IPageScaleChange = (payload: number) => void;
-export declare type ISaved = (payload: IEditorResult) => void;
-export declare type IContentChange = () => void;
-export declare type IControlChange = (payload: IControl | null) => void;
-export declare type IPageModeChange = (payload: PageMode) => void;
-export declare type IZoneChange = (payload: EditorZone) => void;
+export type IRangeStyleChange = (payload: IRangeStyle) => void;
+export type IVisiblePageNoListChange = (payload: number[]) => void;
+export type IIntersectionPageNoChange = (payload: number) => void;
+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 IPageModeChange = (payload: PageMode) => void;
+export type IZoneChange = (payload: EditorZone) => void;

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

@@ -1 +1 @@
-export declare type IMargin = [top: number, right: number, bottom: number, left: number];
+export type IMargin = [top: number, right: number, bottom: number, left: number];

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

@@ -1,3 +1,3 @@
 import Editor from '..';
-export declare type PluginFunction<Options> = (editor: Editor, options?: Options) => any;
-export declare type UsePlugin = <Options>(pluginFunction: PluginFunction<Options>, options?: Options) => void;
+export type PluginFunction<Options> = (editor: Editor, options?: Options) => any;
+export type UsePlugin = <Options>(pluginFunction: PluginFunction<Options>, options?: Options) => void;

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

@@ -31,7 +31,7 @@ export interface IGetPositionByXYPayload {
     elementList?: IElement[];
     positionList?: IElementPosition[];
 }
-export declare type IGetFloatPositionByXYPayload = IGetPositionByXYPayload & {
+export type IGetFloatPositionByXYPayload = IGetPositionByXYPayload & {
     imgDisplay: ImageDisplay;
 };
 export interface IPositionContext {

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

@@ -11,10 +11,10 @@ export interface IRange {
     endTrIndex?: number;
     zone?: EditorZone;
 }
-export declare type RangeRowArray = Map<number, number[]>;
-export declare type RangeRowMap = Map<number, Set<number>>;
-export declare type RangeRect = IElementFillRect;
-export declare type RangeContext = {
+export type RangeRowArray = Map<number, number[]>;
+export type RangeRowMap = Map<number, Set<number>>;
+export type RangeRect = IElementFillRect;
+export type RangeContext = {
     isCollapsed: boolean;
     startElement: IElement;
     endElement: IElement;
@@ -24,3 +24,7 @@ export declare type RangeContext = {
     zone: EditorZone;
     isTable: boolean;
 };
+export interface IRangeParagraphInfo {
+    elementList: IElement[];
+    startIndex: number;
+}

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

@@ -1,6 +1,6 @@
 import { RowFlex } from '../dataset/enum/Row';
 import { IElement, IElementMetrics } from './Element';
-export declare type IRowElement = IElement & {
+export type IRowElement = IElement & {
     metrics: IElementMetrics;
     style: string;
     left?: number;

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

@@ -12,4 +12,4 @@ export interface ISearchResultRestArgs {
     tdId?: string;
     startIndex?: number;
 }
-export declare type ISearchResult = ISearchResultBasic & ISearchResultRestArgs;
+export type ISearchResult = ISearchResultBasic & ISearchResultRestArgs;

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

@@ -6,4 +6,4 @@ export interface ITitleSizeOption {
     defaultFifthSize?: number;
     defaultSixthSize?: number;
 }
-export declare type ITitleOption = ITitleSizeOption & {};
+export type ITitleOption = ITitleSizeOption & {};

package/package.json

@@ -2,7 +2,7 @@
   "name": "@hufe921/canvas-editor",
   "author": "Hufe",
   "license": "MIT",
-  "version": "0.9.72",
+  "version": "0.9.74",
   "description": "rich text editor by canvas/svg",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -30,7 +30,7 @@
     "emr"
   ],
   "engines": {
-    "node": ">=12.0.0"
+    "node": ">=16.9.1"
   },
   "type": "module",
   "scripts": {
@@ -49,15 +49,15 @@
   },
   "devDependencies": {
     "@rollup/plugin-typescript": "^10.0.1",
-    "@types/node": "^16.11.12",
+    "@types/node": "16.18.96",
     "@types/prismjs": "^1.26.0",
-    "@typescript-eslint/eslint-plugin": "4.33.0",
-    "@typescript-eslint/parser": "4.33.0",
+    "@typescript-eslint/eslint-plugin": "5.62.0",
+    "@typescript-eslint/parser": "5.62.0",
     "cypress": "13.6.0",
     "cypress-file-upload": "^5.0.8",
     "eslint": "7.32.0",
     "simple-git-hooks": "^2.8.1",
-    "typescript": "^4.3.2",
+    "typescript": "4.9.5",
     "vite": "^2.4.2",
     "vite-plugin-css-injected-by-js": "^2.1.1",
     "vitepress": "1.0.0-beta.6",