Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typo errors #553

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions packages/core/ruler/ruler.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import { Canvas, Point, IEvent } from 'fabric/fabric-impl';
import { fabric } from 'fabric';
import { getGap, mergeLines, darwRect, darwText, darwLine, drawMask } from './utils';
import { getGap, mergeLines, drawRect, drawText, drawLine, drawMask } from './utils';
import { throttle } from 'lodash-es';
import { setupGuideLine } from './guideline';

Expand Down Expand Up @@ -276,7 +276,7 @@ class CanvasRuler {

// 标尺背景
const canvasSize = this.getSize();
darwRect(this.ctx, {
drawRect(this.ctx, {
left: 0,
top: 0,
width: isHorizontal ? canvasSize.width : this.options.ruleSize,
Expand All @@ -298,7 +298,7 @@ class CanvasRuler {
const textY = isHorizontal
? this.options.ruleSize / 2 - this.options.fontSize / 2 - 4
: position + textLength;
darwText(this.ctx, {
drawText(this.ctx, {
text: textValue,
left: textX,
top: textY,
Expand All @@ -314,7 +314,7 @@ class CanvasRuler {
const top = isHorizontal ? this.options.ruleSize - 8 : position;
const width = isHorizontal ? 0 : 8;
const height = isHorizontal ? 8 : 0;
darwLine(this.ctx, {
drawLine(this.ctx, {
left,
top,
width,
Expand Down Expand Up @@ -366,7 +366,7 @@ class CanvasRuler {

// 高亮遮罩
highlightColor.setAlpha(0.5);
darwRect(this.ctx, {
drawRect(this.ctx, {
left: isHorizontal ? rect.left : this.options.ruleSize - 8,
top: isHorizontal ? this.options.ruleSize - 8 : rect.top,
width: isHorizontal ? rect.width : 8,
Expand All @@ -382,7 +382,7 @@ class CanvasRuler {
angle: isHorizontal ? 0 : -90,
};

darwText(this.ctx, {
drawText(this.ctx, {
...textOpt,
text: leftTextVal,
left: isHorizontal ? rect.left - 2 : pad,
Expand All @@ -391,7 +391,7 @@ class CanvasRuler {
});

if (!isSameText) {
darwText(this.ctx, {
drawText(this.ctx, {
...textOpt,
text: rightTextVal,
left: isHorizontal ? rect.left + rect.width + 2 : pad,
Expand All @@ -411,14 +411,14 @@ class CanvasRuler {
stroke: highlightColor.toRgba(),
};

darwLine(this.ctx, {
drawLine(this.ctx, {
...lineOpt,
left: isHorizontal ? rect.left : this.options.ruleSize - lineSize,
top: isHorizontal ? this.options.ruleSize - lineSize : rect.top,
});

if (!isSameText) {
darwLine(this.ctx, {
drawLine(this.ctx, {
...lineOpt,
left: isHorizontal ? rect.left + rect.width : this.options.ruleSize - lineSize,
top: isHorizontal ? this.options.ruleSize - lineSize : rect.top + rect.height,
Expand Down
10 changes: 5 additions & 5 deletions packages/core/ruler/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const mergeLines = (rect: Rect[], isHorizontal: boolean) => {
return mergedLines;
};

const darwLine = (
const drawLine = (
ctx: CanvasRenderingContext2D,
options: {
left: number;
Expand All @@ -71,7 +71,7 @@ const darwLine = (
ctx.restore();
};

const darwText = (
const drawText = (
ctx: CanvasRenderingContext2D,
options: {
left: number;
Expand All @@ -98,7 +98,7 @@ const darwText = (
ctx.restore();
};

const darwRect = (
const drawRect = (
ctx: CanvasRenderingContext2D,
options: {
left: number;
Expand Down Expand Up @@ -147,7 +147,7 @@ const drawMask = (
gradient.addColorStop(0.33, backgroundColor);
gradient.addColorStop(0.67, backgroundColor);
gradient.addColorStop(1, transparentColor.toRgba());
darwRect(ctx, {
drawRect(ctx, {
left,
top,
width,
Expand All @@ -157,4 +157,4 @@ const drawMask = (
ctx.restore();
};

export { getGap, mergeLines, darwRect, darwText, darwLine, drawMask };
export { getGap, mergeLines, drawRect, drawText, drawLine, drawMask };