fabric 6.0.0 → 6.0.2

package/src/shapes/Polyline.ts

@@ -16,7 +16,15 @@ import { FabricObject, cacheProperties } from './Object/FabricObject';
 import type { FabricObjectProps, SerializedObjectProps } from './Object/types';
 import type { ObjectEvents } from '../EventTypeDefs';
 import { cloneDeep } from '../util/internals/cloneDeep';
-import { CENTER, LEFT, TOP } from '../constants';
+import {
+  CENTER,
+  LEFT,
+  SCALE_X,
+  SCALE_Y,
+  SKEW_X,
+  SKEW_Y,
+  TOP,
+} from '../constants';
 import type { CSSRules } from '../parser/typedefs';
 
 export const polylineDefaultValues: Partial<TClassProperties<Polyline>> = {
@@ -71,8 +79,8 @@ export class Polyline<
    * @todo check if you really need to recalculate for all cases
    */
   static layoutProperties: (keyof Polyline)[] = [
-    'skewX',
-    'skewY',
+    SKEW_X,
+    SKEW_Y,
     'strokeLineCap',
     'strokeLineJoin',
     'strokeMiterLimit',
@@ -282,7 +290,7 @@ export class Polyline<
     if (
       this.exactBoundingBox &&
       changed &&
-      (((key === 'scaleX' || key === 'scaleY') &&
+      (((key === SCALE_X || key === SCALE_Y) &&
         this.strokeUniform &&
         (this.constructor as typeof Polyline).layoutProperties.includes(
           'strokeUniform'

package/src/shapes/Text/Text.ts

@@ -1,5 +1,5 @@
 import { cache } from '../../cache';
-import { DEFAULT_SVG_FONT_SIZE } from '../../constants';
+import { DEFAULT_SVG_FONT_SIZE, FILL, STROKE } from '../../constants';
 import type { ObjectEvents } from '../../EventTypeDefs';
 import type {
   CompleteTextStyleDeclaration,
@@ -94,7 +94,7 @@ interface UniqueTextProps {
   charSpacing: number;
   lineHeight: number;
   fontSize: number;
-  fontWeight: string;
+  fontWeight: string | number;
   fontFamily: string;
   fontStyle: string;
   pathSide: TPathSide;
@@ -176,7 +176,7 @@ export class FabricText<
    * @type {(Number|String)}
    * @default
    */
-  declare fontWeight: string;
+  declare fontWeight: string | number;
 
   /**
    * Font family
@@ -621,7 +621,7 @@ export class FabricText<
    * @param {CanvasRenderingContext2D} ctx Context to render on
    */
   _renderText(ctx: CanvasRenderingContext2D) {
-    if (this.paintFirst === 'stroke') {
+    if (this.paintFirst === STROKE) {
       this._renderTextStroke(ctx);
       this._renderTextFill(ctx);
     } else {
@@ -1100,7 +1100,7 @@ export class FabricText<
    * @param {CanvasRenderingContext2D} ctx Context to render on
    */
   _renderTextFill(ctx: CanvasRenderingContext2D) {
-    if (!this.fill && !this.styleHas('fill')) {
+    if (!this.fill && !this.styleHas(FILL)) {
       return;
     }
 
@@ -1572,7 +1572,7 @@ export class FabricText<
       let boxStart = 0;
       let boxWidth = 0;
       let lastDecoration = this.getValueOfPropertyAt(i, 0, type);
-      let lastFill = this.getValueOfPropertyAt(i, 0, 'fill');
+      let lastFill = this.getValueOfPropertyAt(i, 0, FILL);
       let currentDecoration;
       let currentFill;
       const top = topOffset + maxHeight * (1 - this._fontSizeFraction);
@@ -1581,7 +1581,7 @@ export class FabricText<
       for (let j = 0, jlen = line.length; j < jlen; j++) {
         const charBox = this.__charBounds[i][j] as Required<GraphemeBBox>;
         currentDecoration = this.getValueOfPropertyAt(i, j, type);
-        currentFill = this.getValueOfPropertyAt(i, j, 'fill');
+        currentFill = this.getValueOfPropertyAt(i, j, FILL);
         const currentSize = this.getHeightOfChar(i, j);
         const currentDy = this.getValueOfPropertyAt(i, j, 'deltaY');
         if (path && currentDecoration && currentFill) {

package/src/shapes/Text/TextSVGExportMixin.ts

@@ -8,6 +8,7 @@ import { FabricObjectSVGExportMixin } from '../Object/FabricObjectSVGExportMixin
 import { type TextStyleDeclaration } from './StyledText';
 import { JUSTIFY } from '../Text/constants';
 import type { FabricText } from './Text';
+import { STROKE, FILL } from '../../constants';
 
 const multipleSpacesRegex = /  +/g;
 const dblQuoteRegex = /"/g;
@@ -326,7 +327,7 @@ export class TextSVGExportMixin extends FabricObjectSVGExportMixin {
     const textDecoration = this.getSvgTextDecoration(style);
 
     return [
-      stroke ? colorPropToSVG('stroke', stroke) : '',
+      stroke ? colorPropToSVG(STROKE, stroke) : '',
       strokeWidth ? `stroke-width: ${strokeWidth}; ` : '',
       fontFamily
         ? `font-family: ${
@@ -339,7 +340,7 @@ export class TextSVGExportMixin extends FabricObjectSVGExportMixin {
       fontStyle ? `font-style: ${fontStyle}; ` : '',
       fontWeight ? `font-weight: ${fontWeight}; ` : '',
       textDecoration ? `text-decoration: ${textDecoration}; ` : textDecoration,
-      fill ? colorPropToSVG('fill', fill) : '',
+      fill ? colorPropToSVG(FILL, fill) : '',
       deltaY ? `baseline-shift: ${-deltaY}; ` : '',
       useWhiteSpace ? 'white-space: pre; ' : '',
     ].join('');

package/src/shapes/Text/constants.ts

@@ -1,4 +1,4 @@
-import { LEFT, reNewline } from '../../constants';
+import { FILL, LEFT, STROKE, reNewline } from '../../constants';
 import type { TClassProperties } from '../../typedefs';
 import type { FabricText } from './Text';
 
@@ -52,9 +52,9 @@ export type StylePropertiesType =
 export const styleProperties: Readonly<StylePropertiesType[]> = [
   ...fontProperties,
   ...textDecorationProperties,
-  'stroke',
+  STROKE,
   'strokeWidth',
-  'fill',
+  FILL,
   'deltaY',
   'textBackgroundColor',
 ] as const;

package/src/util/misc/objectEnlive.ts

@@ -81,6 +81,7 @@ export type EnlivenObjectOptions = Abortable & {
 };
 
 /**
+ * @TODO type this correctly.
  * Creates corresponding fabric instances from their object representations
  * @param {Object[]} objects Objects to enliven
  * @param {EnlivenObjectOptions} [options]

package/src/util/misc/svgParsing.ts

@@ -1,6 +1,6 @@
 import { Color } from '../../color/Color';
 import { config } from '../../config';
-import { DEFAULT_SVG_FONT_SIZE, NONE } from '../../constants';
+import { DEFAULT_SVG_FONT_SIZE, FILL, NONE } from '../../constants';
 import type {
   TBBox,
   TMat2D,
@@ -176,7 +176,7 @@ export const createSVGRect = (
   { left, top, width, height }: TBBox,
   precision = config.NUM_FRACTION_DIGITS
 ) => {
-  const svgColor = colorPropToSVG('fill', color, false);
+  const svgColor = colorPropToSVG(FILL, color, false);
   const [x, y, w, h] = [left, top, width, height].map((value) =>
     toFixed(value, precision)
   );

package/src/util/transform_matrix_removal.ts

@@ -1,4 +1,4 @@
-import { CENTER } from '../constants';
+import { CENTER, SCALE_X, SCALE_Y } from '../constants';
 import type { FabricImage } from '../shapes/Image';
 import type { FabricObject } from '../shapes/Object/FabricObject';
 import type { TMat2D } from '../typedefs';
@@ -23,8 +23,8 @@ const _assignTransformMatrixProps = (
     );
     object.flipX = false;
     object.flipY = false;
-    object.set('scaleX', scaleX);
-    object.set('scaleY', scaleY);
+    object.set(SCALE_X, scaleX);
+    object.set(SCALE_Y, scaleY);
     object.angle = angle;
     object.skewX = skewX;
     object.skewY = 0;