chore(TS): more text typings (fabricjs#8489)

Co-authored-by: Andrea Bogazzi <andreabogazzi79@gmail.com>
cgwire · Jan 6, 2023 · eb7ecad · eb7ecad
1 parent 30da09b
commit eb7ecad
Show file tree

Hide file tree

Showing 9 changed files with 241 additions and 190 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## [next]
 
+- chore(TS): polish text [#8489](https://github.com/fabricjs/fabric.js/pull/8489)
 - chore(TS): fix import cycle, extract `groupSVGElements` [#8506](https://github.com/fabricjs/fabric.js/pull/8506)
 - chore(TS): permissive `Point` typings [#8434](https://github.com/fabricjs/fabric.js/pull/8434)
 - chore(TS): polish files [#8488](https://github.com/fabricjs/fabric.js/pull/8488)

diff --git a/src/mixins/text_style.mixin.ts b/src/mixins/text_style.mixin.ts
@@ -24,7 +24,7 @@ export abstract class TextStyleMixin<
    * @param {Number} lineIndex , lineIndex is on wrapped lines.
    * @return {Boolean}
    */
-  isEmptyStyles(lineIndex: number): boolean {
+  isEmptyStyles(lineIndex?: number): boolean {
     if (!this.styles) {
       return true;
     }
@@ -53,7 +53,7 @@ export abstract class TextStyleMixin<
    * @param {Number} lineIndex to check the style on
    * @return {Boolean}
    */
-  styleHas(property: string, lineIndex: number): boolean {
+  styleHas(property: string, lineIndex?: number): boolean {
     if (!this.styles || !property || property === '') {
       return false;
     }

diff --git a/src/shapes/itext.class.ts b/src/shapes/itext.class.ts
@@ -635,12 +635,16 @@ export class IText extends ITextClickBehaviorMixin<ITextEvents> {
    * @returns {Promise<IText>}
    */
   static fromObject(object: object): Promise<IText> {
-    const styles = stylesFromArray(object.styles, object.text);
-    //copy object to prevent mutation
-    const objCopy = Object.assign({}, object, { styles: styles });
-    return FabricObject._fromObject(IText, objCopy, {
-      extraParam: 'text',
-    });
+    return FabricObject._fromObject(
+      IText,
+      {
+        ...object,
+        styles: stylesFromArray(object.styles, object.text),
+      },
+      {
+        extraParam: 'text',
+      }
+    );
   }
 }
 

diff --git a/src/shapes/path.class.ts b/src/shapes/path.class.ts
@@ -13,6 +13,7 @@ import {
   joinPath,
   makePathSimpler,
   parsePath,
+  type TPathSegmentsInfo,
 } from '../util/path';
 import { FabricObject, fabricObjectDefaultValues } from './fabricObject.class';
 
@@ -30,6 +31,8 @@ export class Path extends FabricObject {
 
   sourcePath?: string;
 
+  segmentsInfo?: TPathSegmentsInfo[];
+
   /**
    * Constructor
    * @param {Array|String} path Path data (sequence of coordinates and corresponding "command" tokens)