lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-04-05 20:48:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:konvajs/konva

Browse Source
This commit is contained in:
Anton Lavrenov 2024-09-09 11:30:06 -05:00
commit c98b1f6f2a
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Stage.ts
View File

@ -11,7 +11,7 @@ import { _registerNode } from './Global';
import * as PointerEvents from './PointerEvents'; import * as PointerEvents from './PointerEvents';
export interface StageConfig extends ContainerConfig { export interface StageConfig extends ContainerConfig {
container: HTMLDivElement | string; container?: HTMLDivElement | string;
} }
// CONSTANTS // CONSTANTS

26
src/shapes/Path.ts
View File

@ -235,8 +235,8 @@ export class Path extends Shape<PathConfig> {
return pathLength; return pathLength;
} }
static getPointAtLengthOfDataArray(length: number, dataArray) { static getPointAtLengthOfDataArray(length: number, dataArray: PathSegment[]) {
var point, var points: number[],
i = 0, i = 0,
ii = dataArray.length; ii = dataArray.length;
@ -250,18 +250,18 @@ export class Path extends Shape<PathConfig> {
} }
if (i === ii) { if (i === ii) {
point = dataArray[i - 1].points.slice(-2); points = dataArray[i - 1].points.slice(-2);
return { return {
x: point[0], x: points[0],
y: point[1], y: points[1],
}; };
} }
if (length < 0.01) { if (length < 0.01) {
point = dataArray[i].points.slice(0, 2); points = dataArray[i].points.slice(0, 2);
return { return {
x: point[0], x: points[0],
y: point[1], y: points[1],
}; };
} }
@ -319,7 +319,15 @@ export class Path extends Shape<PathConfig> {
return null; 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; fromX = fromX ?? P1x;
fromY = fromY ?? P1y; fromY = fromY ?? P1y;

8
src/shapes/Text.ts
View File

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