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(shared): fix IRect types #321

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
21 changes: 20 additions & 1 deletion packages/shared/src/coordinate.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { isValidNumber } from './types'

export interface IPoint {
x: number
y: number
Expand Down Expand Up @@ -34,6 +35,7 @@ export function isLineSegment(val: any): val is ILineSegment {
export class Point implements IPoint {
x: number
y: number

constructor(x: number, y: number) {
this.x = x
this.y = y
Expand All @@ -45,6 +47,7 @@ export class Rect implements IRect {
y = 0
width = 0
height = 0

constructor(x: number, y: number, width: number, height: number) {
this.x = x
this.y = y
Expand All @@ -67,18 +70,32 @@ export class Rect implements IRect {
get bottom() {
return this.y + this.height
}

toJSON(): any {
return {
x: this.x,
y: this.y,
top: this.top,
bottom: this.bottom,
left: this.left,
right: this.right,
width: this.width,
height: this.height,
}
}
}

export class LineSegment {
start: IPoint
end: IPoint

constructor(start: IPoint, end: IPoint) {
this.start = { ...start }
this.end = { ...end }
}
}

export interface IRect {
export interface IRect extends DOMRect {
x: number
y: number
width: number
Expand Down Expand Up @@ -528,12 +545,14 @@ export function calcOffsetOfSnapLineSegmentToEdge(
if (isVerticalLine) {
return { x: calcMinDistanceValue(edges.x, line.start.x) - current.x, y: 0 }
}

function calcEdgeLinesOfRect(rect: IRect) {
return {
x: [rect.x, rect.x + rect.width / 2, rect.x + rect.width],
y: [rect.y, rect.y + rect.height / 2, rect.y + rect.height],
}
}

function calcMinDistanceValue(edges: number[], targetValue: number) {
let minDistance = Infinity,
minDistanceIndex = -1
Expand Down