Virtual whiteboard for sketching hand-drawn like diagrams
feat: adjust line-confirm-threshold based on zoom (#2884)
David Luzare6cd97c4f285
diff --git a/src/actions/actionFinalize.tsx b/src/actions/actionFinalize.tsxindex 2842615f95..449e2b1571 100644--- a/src/actions/actionFinalize.tsx+++ b/src/actions/actionFinalize.tsx@@ -83,7 +83,7 @@ export const actionFinalize = register({// If the multi point line closes the loop,// set the last point to first point.// This ensures that loop remains closed at different scales.- const isLoop = isPathALoop(multiPointElement.points);+ const isLoop = isPathALoop(multiPointElement.points, appState.zoom.value);if (multiPointElement.type === "line" ||multiPointElement.type === "draw"diff --git a/src/components/App.tsx b/src/components/App.tsxindex 9a7a15c868..072a3aaf16 100644--- a/src/components/App.tsx+++ b/src/components/App.tsx@@ -1963,7 +1963,7 @@ class App extends React.Component<ExcalidrawProps, AppState> {points: points.slice(0, -1),});} else {- if (isPathALoop(points)) {+ if (isPathALoop(points, this.state.zoom.value)) {document.documentElement.style.cursor = CURSOR_TYPE.POINTER;}// update last uncommitted point@@ -2635,7 +2635,10 @@ class App extends React.Component<ExcalidrawProps, AppState> {const { multiElement } = this.state;// finalize if completing a loop- if (multiElement.type === "line" && isPathALoop(multiElement.points)) {+ if (+ multiElement.type === "line" &&+ isPathALoop(multiElement.points, this.state.zoom.value)+ ) {mutateElement(multiElement, {lastCommittedPoint:multiElement.points[multiElement.points.length - 1],diff --git a/src/constants.ts b/src/constants.tsindex acdfd27373..75bb63911d 100644--- a/src/constants.ts+++ b/src/constants.ts@@ -2,8 +2,8 @@ import { FontFamily } from "./element/types";export const APP_NAME = "Excalidraw";-export const DRAGGING_THRESHOLD = 10; // 10px-export const LINE_CONFIRM_THRESHOLD = 10; // 10px+export const DRAGGING_THRESHOLD = 10; // px+export const LINE_CONFIRM_THRESHOLD = 8; // pxexport const ELEMENT_SHIFT_TRANSLATE_AMOUNT = 5;export const ELEMENT_TRANSLATE_AMOUNT = 1;export const TEXT_TO_CENTER_SNAP_THRESHOLD = 30;diff --git a/src/element/linearElementEditor.ts b/src/element/linearElementEditor.tsindex b44f80c072..50eb9308a0 100644--- a/src/element/linearElementEditor.ts+++ b/src/element/linearElementEditor.ts@@ -129,7 +129,7 @@ export class LinearElementEditor {isDragging &&(activePointIndex === 0 || activePointIndex === element.points.length - 1)) {- if (isPathALoop(element.points)) {+ if (isPathALoop(element.points, appState.zoom.value)) {LinearElementEditor.movePoint(element,activePointIndex,diff --git a/src/math.ts b/src/math.tsindex 15a8aa6e3a..564be027f0 100644--- a/src/math.ts+++ b/src/math.ts@@ -1,4 +1,4 @@-import { Point } from "./types";+import { NormalizedZoomValue, Point, Zoom } from "./types";import { LINE_CONFIRM_THRESHOLD } from "./constants";import { ExcalidrawLinearElement } from "./element/types";@@ -147,13 +147,16 @@ export const centerPoint = (a: Point, b: Point): Point => {// to be considered a loopexport const isPathALoop = (points: ExcalidrawLinearElement["points"],+ /** supply if you want the loop detection to account for current zoom */+ zoomValue: Zoom["value"] = 1 as NormalizedZoomValue,): boolean => {if (points.length >= 3) {- const [firstPoint, lastPoint] = [points[0], points[points.length - 1]];- return (- distance2d(firstPoint[0], firstPoint[1], lastPoint[0], lastPoint[1]) <=- LINE_CONFIRM_THRESHOLD- );+ const [first, last] = [points[0], points[points.length - 1]];+ const distance = distance2d(first[0], first[1], last[0], last[1]);++ // Adjusting LINE_CONFIRM_THRESHOLD to current zoom so that when zoomed in+ // really close we make the threshold smaller, and vice versa.+ return distance <= LINE_CONFIRM_THRESHOLD / zoomValue;}return false;};