@univerjs-pro/engine-shape 0.24.0 → 0.25.0-insiders.20260608-e4336f7

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, 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';

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

@@ -117,4 +117,5 @@ export declare class BasicShapeModel implements IShapeModel {
     dispose(): void;
     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,21 +1,14 @@
-/**
- * Copyright 2023-present DreamNum Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 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).
  *
@@ -28,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.
      *
@@ -99,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/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,10 @@ 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 IShapeText extends IShapeTextAlign {
     isRichText: false;
@@ -571,6 +574,7 @@ export interface ICustomShapeTextData extends IShapeTextAlign {
  */
 export interface IBasicShapeData {
     shapeType?: ShapeTypeEnum;
+    isTextBox?: boolean;
     fill?: {
         color?: string;
         fillType?: ShapeFillEnum;
@@ -580,6 +584,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,6 +635,8 @@ export interface IBasicShapeData {
     };
     stroke?: IShapeLineStyle;
     adjustValues?: Record<string, number>;
+    isCustom?: boolean;
+    customGeometry?: IPresetShapeConfig;
     shapeText?: IShapeText | ICustomShapeTextData;
 }
 export interface ICxnShapeData extends IBasicShapeData {
@@ -812,6 +819,7 @@ export interface IShapeLineStyle {
     color?: string;
     width?: number;
     opacity?: number;
+    cornerRadius?: number;
     dashType?: ShapeLineDashEnum;
     capType?: ShapeLineCapEnum;
     lineJoinType?: ShapeLineJoinEnum;