@nasser-sw/fabric 7.0.1-beta2 → 7.0.1-beta4

package/dist-extensions/src/shapes/Polyline.d.ts

@@ -9,6 +9,7 @@ import type { CSSRules } from '../parser/typedefs';
 export declare const polylineDefaultValues: Partial<TClassProperties<Polyline>>;
 export interface SerializedPolylineProps extends SerializedObjectProps {
     points: XY[];
+    cornerRadius: number;
 }
 export declare class Polyline<Props extends TOptions<FabricObjectProps> = Partial<FabricObjectProps>, SProps extends SerializedPolylineProps = SerializedPolylineProps, EventSpec extends ObjectEvents = ObjectEvents> extends FabricObject<Props, SProps, EventSpec> {
     /**
@@ -26,6 +27,12 @@ export declare class Polyline<Props extends TOptions<FabricObjectProps> = Partia
      * @default false
      */
     exactBoundingBox: boolean;
+    /**
+     * Corner radius for rounded corners
+     * @type Number
+     * @default 0
+     */
+    cornerRadius: number;
     private initialized;
     static ownDefaults: Partial<TClassProperties<Polyline<Partial<FabricObjectProps>, SerializedPolylineProps, ObjectEvents>>>;
     static type: string;

package/dist-extensions/src/shapes/Polyline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Polyline.d.ts","sourceRoot":"","sources":["../../../src/shapes/Polyline.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Polyline.d.ts","sourceRoot":"","sources":["../../../src/shapes/Polyline.ts"],"names":[],"mappings":"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"}

package/dist-extensions/src/shapes/Triangle.d.ts

@@ -3,20 +3,44 @@ import type { FabricObjectProps, SerializedObjectProps } from './Object/types';
 import type { TClassProperties, TOptions } from '../typedefs';
 import type { ObjectEvents } from '../EventTypeDefs';
 export declare const triangleDefaultValues: Partial<TClassProperties<Triangle>>;
-export declare class Triangle<Props extends TOptions<FabricObjectProps> = Partial<FabricObjectProps>, SProps extends SerializedObjectProps = SerializedObjectProps, EventSpec extends ObjectEvents = ObjectEvents> extends FabricObject<Props, SProps, EventSpec> implements FabricObjectProps {
+interface UniqueTriangleProps {
+    cornerRadius: number;
+}
+export interface SerializedTriangleProps extends SerializedObjectProps, UniqueTriangleProps {
+}
+export interface TriangleProps extends FabricObjectProps, UniqueTriangleProps {
+}
+export declare class Triangle<Props extends TOptions<TriangleProps> = Partial<TriangleProps>, SProps extends SerializedTriangleProps = SerializedTriangleProps, EventSpec extends ObjectEvents = ObjectEvents> extends FabricObject<Props, SProps, EventSpec> implements TriangleProps {
+    /**
+     * Corner radius for rounded triangle corners
+     * @type Number
+     */
+    cornerRadius: number;
     static type: string;
-    static ownDefaults: Partial<TClassProperties<Triangle<Partial<FabricObjectProps>, SerializedObjectProps, ObjectEvents>>>;
+    static cacheProperties: string[];
+    static ownDefaults: Partial<TClassProperties<Triangle<Partial<TriangleProps>, SerializedTriangleProps, ObjectEvents>>>;
     static getDefaults(): Record<string, any>;
     /**
      * Constructor
      * @param {Object} [options] Options object
      */
     constructor(options?: Props);
+    /**
+     * Get triangle points as an array of XY coordinates
+     * @private
+     */
+    private _getTrianglePoints;
     /**
      * @private
      * @param {CanvasRenderingContext2D} ctx Context to render on
      */
     _render(ctx: CanvasRenderingContext2D): void;
+    /**
+     * Returns object representation of an instance
+     * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
+     * @return {Object} object representation of an instance
+     */
+    toObject<T extends Omit<Props & TClassProperties<this>, keyof SProps>, K extends keyof T = never>(propertiesToInclude?: K[]): Pick<T, K> & SProps;
     /**
      * Returns svg representation of an instance
      * @return {Array} an array of strings with the specific svg representation
@@ -24,4 +48,5 @@ export declare class Triangle<Props extends TOptions<FabricObjectProps> = Partia
      */
     _toSVG(): string[];
 }
+export {};
 //# sourceMappingURL=Triangle.d.ts.map

package/dist-extensions/src/shapes/Triangle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Triangle.d.ts","sourceRoot":"","sources":["../../../src/shapes/Triangle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAC/E,OAAO,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAErD,eAAO,MAAM,qBAAqB,EAAE,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAGrE,CAAC;AAEF,qBAAa,QAAQ,CACjB,KAAK,SAAS,QAAQ,CAAC,iBAAiB,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,EACtE,MAAM,SAAS,qBAAqB,GAAG,qBAAqB,EAC5D,SAAS,SAAS,YAAY,GAAG,YAAY,CAE/C,SAAQ,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,CAC7C,YAAW,iBAAiB;IAE5B,MAAM,CAAC,IAAI,SAAc;IAEzB,MAAM,CAAC,WAAW,uGAAyB;IAE3C,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAIzC;;;OAGG;gBACS,OAAO,CAAC,EAAE,KAAK;IAM3B;;;OAGG;IACH,OAAO,CAAC,GAAG,EAAE,wBAAwB;IAarC;;;;OAIG;IACH,MAAM;CAMP"}
+{"version":3,"file":"Triangle.d.ts","sourceRoot":"","sources":["../../../src/shapes/Triangle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAmB,MAAM,uBAAuB,CAAC;AACtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAC/E,OAAO,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAOrD,eAAO,MAAM,qBAAqB,EAAE,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAIrE,CAAC;AAEF,UAAU,mBAAmB;IAC3B,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,uBACf,SAAQ,qBAAqB,EAC3B,mBAAmB;CAAG;AAE1B,MAAM,WAAW,aAAc,SAAQ,iBAAiB,EAAE,mBAAmB;CAAG;AAIhF,qBAAa,QAAQ,CACjB,KAAK,SAAS,QAAQ,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,EAC9D,MAAM,SAAS,uBAAuB,GAAG,uBAAuB,EAChE,SAAS,SAAS,YAAY,GAAG,YAAY,CAE/C,SAAQ,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,CAC7C,YAAW,aAAa;IAExB;;;OAGG;IACK,YAAY,EAAE,MAAM,CAAC;IAE7B,MAAM,CAAC,IAAI,SAAc;IAEzB,MAAM,CAAC,eAAe,WAA2C;IAEjE,MAAM,CAAC,WAAW,qGAAyB;IAE3C,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAIzC;;;OAGG;gBACS,OAAO,CAAC,EAAE,KAAK;IAM3B;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAW1B;;;OAGG;IACH,OAAO,CAAC,GAAG,EAAE,wBAAwB;IAqBrC;;;;OAIG;IACH,QAAQ,CACN,CAAC,SAAS,IAAI,CAAC,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,EAAE,MAAM,MAAM,CAAC,EAC5D,CAAC,SAAS,MAAM,CAAC,GAAG,KAAK,EACzB,mBAAmB,GAAE,CAAC,EAAO,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM;IAIrD;;;;OAIG;IACH,MAAM;CAeP"}

package/dist-extensions/src/util/misc/cornerRadius.d.ts

@@ -0,0 +1,70 @@
+import type { XY } from '../../Point';
+export interface CornerRadiusOptions {
+    /**
+     * Corner radius value
+     */
+    radius: number;
+    /**
+     * Whether to apply radius as percentage of the smallest dimension
+     */
+    radiusAsPercentage?: boolean;
+}
+export interface RoundedCornerPoint {
+    /**
+     * Original corner point
+     */
+    corner: XY;
+    /**
+     * Start point of the rounded corner arc
+     */
+    start: XY;
+    /**
+     * End point of the rounded corner arc
+     */
+    end: XY;
+    /**
+     * First control point for bezier curve
+     */
+    cp1: XY;
+    /**
+     * Second control point for bezier curve
+     */
+    cp2: XY;
+    /**
+     * Actual radius used (may be different from requested if constrained)
+     */
+    actualRadius: number;
+}
+/**
+ * Calculate the distance between two points
+ */
+export declare function pointDistance(p1: XY, p2: XY): number;
+/**
+ * Normalize a vector
+ */
+export declare function normalizeVector(vector: XY): XY;
+/**
+ * Calculate the angle between two vectors
+ */
+export declare function angleBetweenVectors(v1: XY, v2: XY): number;
+/**
+ * Get the maximum allowed radius for a corner based on adjacent edge lengths
+ */
+export declare function getMaxRadius(prevPoint: XY, currentPoint: XY, nextPoint: XY): number;
+/**
+ * Calculate rounded corner data for a single corner
+ */
+export declare function calculateRoundedCorner(prevPoint: XY, currentPoint: XY, nextPoint: XY, radius: number): RoundedCornerPoint;
+/**
+ * Apply corner radius to a polygon defined by points
+ */
+export declare function applyCornerRadiusToPolygon(points: XY[], radius: number, radiusAsPercentage?: boolean): RoundedCornerPoint[];
+/**
+ * Render a rounded polygon to a canvas context
+ */
+export declare function renderRoundedPolygon(ctx: CanvasRenderingContext2D, roundedCorners: RoundedCornerPoint[], closed?: boolean): void;
+/**
+ * Generate SVG path data for a rounded polygon
+ */
+export declare function generateRoundedPolygonPath(roundedCorners: RoundedCornerPoint[], closed?: boolean): string;
+//# sourceMappingURL=cornerRadius.d.ts.map

package/dist-extensions/src/util/misc/cornerRadius.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cornerRadius.d.ts","sourceRoot":"","sources":["../../../../src/util/misc/cornerRadius.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAItC,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,MAAM,EAAE,EAAE,CAAC;IACX;;OAEG;IACH,KAAK,EAAE,EAAE,CAAC;IACV;;OAEG;IACH,GAAG,EAAE,EAAE,CAAC;IACR;;OAEG;IACH,GAAG,EAAE,EAAE,CAAC;IACR;;OAEG;IACH,GAAG,EAAE,EAAE,CAAC;IACR;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,MAAM,CAEpD;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,CAI9C;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,MAAM,CAI1D;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,SAAS,EAAE,EAAE,EACb,YAAY,EAAE,EAAE,EAChB,SAAS,EAAE,EAAE,GACZ,MAAM,CAIR;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,EAAE,EACb,YAAY,EAAE,EAAE,EAChB,SAAS,EAAE,EAAE,EACb,MAAM,EAAE,MAAM,GACb,kBAAkB,CAoDpB;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,EAAE,EAAE,EACZ,MAAM,EAAE,MAAM,EACd,kBAAkB,UAAQ,GACzB,kBAAkB,EAAE,CAuCtB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,wBAAwB,EAC7B,cAAc,EAAE,kBAAkB,EAAE,EACpC,MAAM,UAAO,QAkCd;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,cAAc,EAAE,kBAAkB,EAAE,EACpC,MAAM,UAAO,GACZ,MAAM,CA8BR"}