Merge pull request #1795 from kyechan99/master

fix: specify type
konvajs · Jul 19, 2024 · 9830a6c · 9830a6c
2 parents 45889f9 + ad0c15a
commit 9830a6c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/src/shapes/Path.ts b/src/shapes/Path.ts
@@ -235,8 +235,8 @@ export class Path extends Shape<PathConfig> {
     return pathLength;
   }
 
-  static getPointAtLengthOfDataArray(length: number, dataArray) {
-    var point,
+  static getPointAtLengthOfDataArray(length: number, dataArray: PathSegment[]) {
+    var points: number[],
       i = 0,
       ii = dataArray.length;
 
@@ -250,18 +250,18 @@ export class Path extends Shape<PathConfig> {
     }
 
     if (i === ii) {
-      point = dataArray[i - 1].points.slice(-2);
+      points = dataArray[i - 1].points.slice(-2);
       return {
-        x: point[0],
-        y: point[1],
+        x: points[0],
+        y: points[1],
       };
     }
 
     if (length < 0.01) {
-      point = dataArray[i].points.slice(0, 2);
+      points = dataArray[i].points.slice(0, 2);
       return {
-        x: point[0],
-        y: point[1],
+        x: points[0],
+        y: points[1],
       };
     }
 
@@ -319,7 +319,15 @@ export class Path extends Shape<PathConfig> {
     return null;
   }
 
-  static getPointOnLine(dist, P1x, P1y, P2x, P2y, fromX?, fromY?) {
+  static getPointOnLine(
+    dist: number,
+    P1x: number,
+    P1y: number,
+    P2x: number,
+    P2y: number,
+    fromX?: number,
+    fromY?: number
+  ) {
     fromX = fromX ?? P1x;
     fromY = fromY ?? P1y;
 

diff --git a/src/shapes/Text.ts b/src/shapes/Text.ts
@@ -392,13 +392,13 @@ export class Text extends Shape<TextConfig> {
    * That method can't handle multiline text.
    * @method
    * @name Konva.Text#measureSize
-   * @param {String} [text] text to measure
-   * @returns {Object} { width , height} of measured text
+   * @param {String} text text to measure
+   * @returns {Object} { width , height } of measured text
    */
-  measureSize(text) {
+  measureSize(text: string) {
     var _context = getDummyContext(),
       fontSize = this.fontSize(),
-      metrics;
+      metrics: TextMetrics;
 
     _context.save();
     _context.font = this._getContextFont();