@univerjs-pro/engine-shape 0.25.0 → 1.0.0-alpha.0

package/lib/types/index.d.ts

@@ -1,8 +1,8 @@
-export { BasicShapeModel as ShapeModel } from '../src/model/shape-model';
+export { BasicShapeModel as ShapeModel } from '../src/models/shape-model';
 export { LineShapeRenderModel } from '../src/render-engine/line-shape-render-model';
 export { BaseShapeRenderModel } from '../src/render-engine/shape-render-model';
 export { BasicShapeEnum, ImageFillModeEnum, ImageSourceTypeEnum, ShapeArrowSizeEnum, ShapeArrowTypeEnum, ShapeFillEnum, ShapeGradientTypeEnum, ShapeLineCapEnum, ShapeLineDashEnum, ShapeLineJoinEnum, ShapeLineTypeEnum, ShapeOperatorEnum, ShapeRenderModeEnum, ShapeSketchTypeEnum, ShapeTypeEnum } from '../src/shape-enum';
-export type { IBasicShapeData, IConnectorLayoutResult, IConnectorRouteLayoutResult, IConnectPointInfo, ICustomShapeTextData, ICxnShapeData, IDrawingRect, IGdContext, IGdContextBase, ILineType, IPathCommand, IPresetShapeConfig, IShapeAdjustItem, IShapeAdjustItemResolved, IShapeContextOptions, IShapeData, IShapeHitTestResult, IShapeJSONData, IShapeLineStyle, IShapeModel, IShapePath, IShapePoint, IShapePointWithAdjName, IShapeRect, IShapeRelation, IShapeRelationItem, IShapeRenderParameters, IShapeText, ShapeAdjustHandleTypeEnum, ShapeHitTestHitTypeEnum, } from '../src/shape-type';
+export type { IBasicShapeData, IConnectorLayoutResult, IConnectorRouteLayoutResult, IConnectPointInfo, ICustomShapeTextData, ICxnShapeData, IDrawingRect, IGdContext, IGdContextBase, ILineType, IPathCommand, IPresetShapeConfig, IShapeAdjustItem, IShapeAdjustItemResolved, IShapeContextOptions, IShapeData, IShapeHitTestResult, IShapeJSONData, IShapeLineStyle, IShapeModel, IShapePath, IShapePoint, IShapePointWithAdjName, IShapeRect, IShapeRelation, IShapeRelationItem, IShapeRenderParameters, IShapeText, IShapeTextRectPadding, ShapeAdjustHandleTypeEnum, ShapeHitTestHitTypeEnum, ShapeTextDirection, } from '../src/shape-type';
 export { AccentBorderCallout1Shape } from '../src/shapes/accent-border-callout1-shape';
 export { AccentBorderCallout2Shape } from '../src/shapes/accent-border-callout2-shape';
 export { AccentBorderCallout3Shape } from '../src/shapes/accent-border-callout3-shape';
@@ -197,4 +197,5 @@ export { ShapeDefaultConfig } from './shape-default';
 export { freeRouteBentConnectorLinePoints } from './util/connector-points-util';
 export type { IBentConnectorResult } from './util/connector-points-util';
 export { ConnectorCoordinateTransform } from './util/connector-transform';
+export { createUniqueShapeName } from './util/shape-name';
 export { isConnectorShape, isCurvedConnectorShape } from './util/shape-util';

package/lib/types/{model → models}/shape-model.d.ts

@@ -5,6 +5,7 @@ export declare function deepMerge<T extends Record<string, any>>(target: T, ...s
 export declare class BasicShapeModel implements IShapeModel {
     protected _shapeType: ShapeTypeEnum;
     private readonly _id;
+    private _name?;
     protected _shapeData: IShapeData;
     /**
      * this property is only used for LineShapeRenderModel to indicate whether to render line points for routing
@@ -13,12 +14,14 @@ export declare class BasicShapeModel implements IShapeModel {
     private _context;
     private _renderModel;
     private _adjustNameMap;
-    constructor(shapeType: ShapeTypeEnum, id: string, shapeData?: IShapeData);
+    constructor(shapeType: ShapeTypeEnum, id: string, shapeData?: IShapeData, name?: string);
     changeShapeType(shapeType: ShapeTypeEnum, shapeData?: IShapeData): void;
     getShapeType(): ShapeTypeEnum;
     getShapeRelation(): IShapeRelation | undefined;
     getBasicShapeType(): BasicShapeEnum;
     getId(): string;
+    getName(): string | undefined;
+    setName(name?: string): void;
     /**
      * get shape text data
      * @returns The shape text data
@@ -68,6 +71,9 @@ export declare class BasicShapeModel implements IShapeModel {
     private _getAdjScope;
     private _setAdjustValue;
     clearAdjustValue(): void;
+    cloneShapeDataForShapeType(shapeType: ShapeTypeEnum): IShapeData;
+    cloneSnapshot(): IShapeJSONData;
+    cloneSnapshotForShapeType(shapeType: ShapeTypeEnum): IShapeJSONData;
     /**
      * et adjust value by adj name
      * @param {string} adjName The name of adj point
@@ -113,8 +119,11 @@ export declare class BasicShapeModel implements IShapeModel {
      */
     buildClipPath(canvasContext: CanvasRenderingContext2D, rect: IShapeRect): IShapeRect | false;
     getDrawingPoints(): IShapePointWithAdjName[];
-    calcAdjValue(rect: IShapeRect, point: IShapePoint, adjustInfo: IShapeAdjustItemResolved, isFlipH: boolean, isFlipV: boolean): number;
+    calcAdjValue(rect: IShapeRect, point: IShapePoint, adjustInfo: IShapeAdjustItemResolved, _isFlipH: boolean, _isFlipV: boolean): number;
     dispose(): void;
+    private _getSnapshotAdjustValues;
+    private _cloneShapeDataWithSnapshotAdjustValues;
     toJSON(): IShapeJSONData;
     fromJSON(json: IShapeJSONData): void;
+    private _createRenderModel;
 }

package/lib/types/render-engine/custom-shape-render-model.d.ts

@@ -0,0 +1,7 @@
+import type { IPresetShapeConfig } from '../shape-type';
+import { BaseShapeRenderModel } from './shape-render-model';
+export declare class CustomShapeRenderModel extends BaseShapeRenderModel {
+    readonly name: string;
+    readonly presetShapeConfig: IPresetShapeConfig;
+    constructor(name: string, presetShapeConfig: IPresetShapeConfig);
+}

package/lib/types/render-engine/line-shape-render-model.d.ts

@@ -1,6 +1,14 @@
 import type { IShapeData, IShapePoint, IShapeRect, IShapeRenderParameters } from '../shape-type';
 import type { BaseShapeContext } from './base-shape-context';
 import { BaseShapeRenderModel } from './shape-render-model';
+/**
+ * Interface for storing complete path command information for line shapes
+ * Used to preserve bezier curve data when redrawing with arrow adjustments
+ */
+export interface ILinePathCommand {
+    command: string;
+    points: number[];
+}
 /**
  * Base class for line-type shapes (connectors, lines).
  *
@@ -13,6 +21,11 @@ import { BaseShapeRenderModel } from './shape-render-model';
  */
 export declare abstract class LineShapeRenderModel extends BaseShapeRenderModel {
     protected _isLineShape: boolean;
+    static toRoundedPolylineCommands(commands: ILinePathCommand[], cornerRadius: number): ILinePathCommand[];
+    private static _cloneLinePathCommands;
+    private static _isLineOnlyPolyline;
+    private static _getPolylineCommandPoint;
+    private static _getRoundedCorner;
     /**
      * Check if a point is near a line segment.
      *
@@ -84,8 +97,10 @@ export declare abstract class LineShapeRenderModel extends BaseShapeRenderModel
     render(canvasContext: CanvasRenderingContext2D, rect: IShapeRect, shapeContext: BaseShapeContext, shapeData: IShapeData, renderOption: IShapeRenderParameters): void;
     private _scalePoints;
     private _executePathCommand;
+    private _drawLinePathCommands;
     private _applyFill;
     private _applyStrokeWithArrows;
+    private _getLineCornerRadius;
     /**
      * Extract start and end points with tangent direction points for arrow rendering
      * For bezier curves, uses control points to get correct tangent direction

package/lib/types/render-engine/point-to-shape-transform.d.ts

@@ -1,13 +1,13 @@
 import type { IShapePoint } from '../shape-type';
-interface Point {
+interface IPoint {
     x: number;
     y: number;
 }
-interface TransformResult {
+interface ITransformResult {
     rotation: 0 | 90 | 180 | 270;
     flipH: boolean;
     flipV: boolean;
     restorePoints: IShapePoint[];
 }
-export declare function resolveTransform(points: Point[]): TransformResult;
+export declare function resolveTransform(points: IPoint[]): ITransformResult;
 export {};

package/lib/types/render-engine/shape-render-model.d.ts

@@ -23,7 +23,10 @@ export declare abstract class BaseShapeRenderModel {
      * @param gdRecord The current gdRecord used to calculate text rect, if the shape has transformed, should use the latest gdRecord
      * @returns {IShapeRect} The text rectangle within the shape
      */
-    getTextRect(rect: IShapeRect, gdRecord: Partial<IGdContext>): IShapeRect;
+    getTextRect(rect: IShapeRect, gdRecord: Partial<IGdContext>, shapeData?: IShapeData): IShapeRect;
+    private _hasExplicitTextRectPadding;
+    private _getPaddedWholeRect;
+    private _getTextRectPadding;
     /**
      * 计算所有可填充路径（fill !== 'none'）的实际包围盒。
      *

package/lib/types/shape-type.d.ts

@@ -104,6 +104,7 @@ export interface IGdContextBase {
     lsd32: number;
 }
 export interface IGdContext extends IGdContextBase {
+    [key: string]: number | undefined;
     x0?: number;
     x1?: number;
     x2?: number;
@@ -550,8 +551,16 @@ export interface IShapePath {
     /** Parsed path data array (alternative to data string) */
     dataArray?: IPathCommand[];
 }
+export type ShapeTextDirection = 'horz' | 'vert' | 'vert270' | 'wordArtVert' | 'eaVert' | 'mongolianVert' | 'wordArtVertRtl';
 export interface IShapeTextAlign {
     isHorizontal: boolean;
+    textDirection?: ShapeTextDirection;
+}
+export interface IShapeTextRectPadding {
+    left: number;
+    top: number;
+    right: number;
+    bottom: number;
 }
 export interface IShapeText extends IShapeTextAlign {
     isRichText: false;
@@ -571,6 +580,7 @@ export interface ICustomShapeTextData extends IShapeTextAlign {
  */
 export interface IBasicShapeData {
     shapeType?: ShapeTypeEnum;
+    isTextBox?: boolean;
     fill?: {
         color?: string;
         fillType?: ShapeFillEnum;
@@ -580,6 +590,7 @@ export interface IBasicShapeData {
         gradientStops?: Array<{
             position: number;
             color: string;
+            opacity?: number;
         }>;
         /**
          * Image fill source, can be a URL or base64 data URI. When fillType is 'image', this specifies the image to use for filling the shape.
@@ -630,7 +641,14 @@ export interface IBasicShapeData {
     };
     stroke?: IShapeLineStyle;
     adjustValues?: Record<string, number>;
+    isCustom?: boolean;
+    customGeometry?: IPresetShapeConfig;
     shapeText?: IShapeText | ICustomShapeTextData;
+    /**
+     * Text box inset used to calculate the editable/rendered text rect.
+     * Values use the same drawing units as the shape rect.
+     */
+    textRectPadding?: IShapeTextRectPadding;
 }
 export interface ICxnShapeData extends IBasicShapeData {
     points?: Array<{
@@ -656,6 +674,7 @@ export interface IGroupShapeData {
 export type IShapeData = IBasicShapeData | ICxnShapeData;
 export interface IShapeJSONData {
     id: string;
+    name?: string;
     shapeData: IShapeData;
     shapeType: ShapeTypeEnum;
 }
@@ -812,6 +831,7 @@ export interface IShapeLineStyle {
     color?: string;
     width?: number;
     opacity?: number;
+    cornerRadius?: number;
     dashType?: ShapeLineDashEnum;
     capType?: ShapeLineCapEnum;
     lineJoinType?: ShapeLineJoinEnum;
@@ -824,6 +844,8 @@ export interface IShapeLineStyle {
 export interface IShapeModel {
     getBasicShapeType(): BasicShapeEnum;
     getId(): string;
+    getName(): string | undefined;
+    setName(name?: string): void;
     dispose(): void;
     getShapeData(): IShapeData;
 }

package/lib/types/util/shape-name.d.ts

@@ -0,0 +1 @@
+export declare function createUniqueShapeName(shapeType: string, usedNames: Iterable<string | undefined | null>): string;