lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-06-28 15:23:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #994 from moonrailgun/fix-shape-errortype

Browse Source 
fix shape getClientRect error type
This commit is contained in:
Anton Lavrenov 2020-10-12 08:52:23 -05:00 committed by GitHub
commit 451b34d25d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/Shape.ts
View File

@ -76,13 +76,20 @@ export interface ShapeConfig extends NodeConfig {
perfectDrawEnabled?: boolean; perfectDrawEnabled?: boolean;
} }
export interface ShapegGetClientRectConfig {
skipTransform?: boolean;
skipShadow?: boolean;
skipStroke?: boolean;
relativeTo?: Node;
}
var HAS_SHADOW = 'hasShadow'; var HAS_SHADOW = 'hasShadow';
var SHADOW_RGBA = 'shadowRGBA'; var SHADOW_RGBA = 'shadowRGBA';
var patternImage = 'patternImage'; var patternImage = 'patternImage';
var linearGradient = 'linearGradient'; var linearGradient = 'linearGradient';
var radialGradient = 'radialGradient'; var radialGradient = 'radialGradient';
var dummyContext; let dummyContext: CanvasRenderingContext2D;
function getDummyContext(): CanvasRenderingContext2D { function getDummyContext(): CanvasRenderingContext2D {
if (dummyContext) { if (dummyContext) {
return dummyContext; return dummyContext;
@ -496,40 +503,39 @@ export class Shape<Config extends ShapeConfig = ShapeConfig> extends Node<
height: size.height, height: size.height,
}; };
} }
getClientRect(attrs) { getClientRect(config: ShapegGetClientRectConfig = {}) {
attrs = attrs || {}; const skipTransform = config.skipTransform;
var skipTransform = attrs.skipTransform;
var relativeTo = attrs.relativeTo; const relativeTo = config.relativeTo;
var fillRect = this.getSelfRect(); const fillRect = this.getSelfRect();
var applyStroke = !attrs.skipStroke && this.hasStroke(); const applyStroke = !config.skipStroke && this.hasStroke();
var strokeWidth = (applyStroke && this.strokeWidth()) || 0; const strokeWidth = (applyStroke && this.strokeWidth()) || 0;
var fillAndStrokeWidth = fillRect.width + strokeWidth; const fillAndStrokeWidth = fillRect.width + strokeWidth;
var fillAndStrokeHeight = fillRect.height + strokeWidth; const fillAndStrokeHeight = fillRect.height + strokeWidth;
var applyShadow = !attrs.skipShadow && this.hasShadow(); const applyShadow = !config.skipShadow && this.hasShadow();
var shadowOffsetX = applyShadow ? this.shadowOffsetX() : 0; const shadowOffsetX = applyShadow ? this.shadowOffsetX() : 0;
var shadowOffsetY = applyShadow ? this.shadowOffsetY() : 0; const shadowOffsetY = applyShadow ? this.shadowOffsetY() : 0;
var preWidth = fillAndStrokeWidth + Math.abs(shadowOffsetX); const preWidth = fillAndStrokeWidth + Math.abs(shadowOffsetX);
var preHeight = fillAndStrokeHeight + Math.abs(shadowOffsetY); const preHeight = fillAndStrokeHeight + Math.abs(shadowOffsetY);
var blurRadius = (applyShadow && this.shadowBlur()) || 0; const blurRadius = (applyShadow && this.shadowBlur()) || 0;
var width = preWidth + blurRadius * 2; const width = preWidth + blurRadius * 2;
var height = preHeight + blurRadius * 2; const height = preHeight + blurRadius * 2;
// if stroke, for example = 3 // if stroke, for example = 3
// we need to set x to 1.5, but after Math.round it will be 2 // we need to set x to 1.5, but after Math.round it will be 2
// as we have additional offset we need to increase width and height by 1 pixel // as we have additional offset we need to increase width and height by 1 pixel
var roundingOffset = 0; let roundingOffset = 0;
if (Math.round(strokeWidth / 2) !== strokeWidth / 2) { if (Math.round(strokeWidth / 2) !== strokeWidth / 2) {
roundingOffset = 1; roundingOffset = 1;
} }
var rect = { const rect = {
width: width + roundingOffset, width: width + roundingOffset,
height: height + roundingOffset, height: height + roundingOffset,
x: x: