mirror of
https://github.com/excalidraw/excalidraw.git
synced 2026-11-22 05:51:53 +03:00
* Initial commit * Segments detection * Remove aspect ratio * Refactor * Fix tests * Toggle shapeSnap * Fix linting * debug: live preview * Rebase fixes Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * Bind to elements (no hover background) * Shape closed * Fix rad calc + rename segments * Comments * Fix binding highlighting + lints * Rename to convert to shape * fix: Binding Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * chore: Refactor spline simplification Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * chore: Remove unused doBoundsIntersect Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Restore type signature Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * feat: Propose new button shapes Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * chore: Remove unused types Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * chore: Icon shapes Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Element cloning Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Element cloning Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Remove unused Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * feat: Shape settings in recognition mode Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * chore: Remove debug Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * feat: Actions Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Lint Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Arrowheads for freedraw Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * feat: Draw shape tool instead of freedraw Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Test Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Lint Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Keyboard shortcut visibility Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * feat: Unique cursor for draw shape Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Remove selection Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Shape selection Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * feat: Improve shape recognition Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Further refine shape recognition Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * feat: Preview Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * feat: Add hint Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Refined shape recognition Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Less ellipse more rectanguloid Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Refined arrow recognition Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Refinerecognition Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * chore: Lower linear threshold Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * feat: Rectangle head arrow Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * feat: More arrowhead sizes Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Arrow remains an arrow Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * feat: Draw line between elements converts to arrow Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * remove pendingDrawShapeElement * fix: Arrow start point binding Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Different arrow endpoint heuristic Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Point type Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Various small fixes Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Avoid recompute Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Type issues Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * test(editor): cover the drawShape (snap-to-shape) tool The drawShape tool had no dedicated tests, which let master's toolbar / active-tool rewrite silently break it during the merge: actionFinalize reverted to the selection tool after every sketch, because the drawShape flow finalizes without a `newElement` and so failed master's new `&& element` guard. Covers the behavior the merge had to preserve: - sketch recognition (rectangle, ellipse) and the too-small no-op - the tool stays active after finalizing, so shapes can be sketched consecutively (regression guard for the above) - activation via the S shortcut and the extra-tools dropdown - the tool's own cursor Points are fed into the trail directly rather than through pointermove, which is rAF-throttled and would drop all but one point per frame — the same approach lasso.test.tsx uses. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat: Add test Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * feat: Breakout from App.tsx Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Shortcut is now Shift+X Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: No selecting arrows for shape recog Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * fix: Double history Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * feat: PCA + feature extraction recognition Signed-off-by: Mark Tolmacs <mark@lazycat.hu> * reduce and normalize min-size gates * never select newElement when shape recog tool active * simplify lifecycle & remove double finalize * make arrows bindings orbit * funnel though actionFinalize & fix two unrelated cleanup cases * use crosshair cursor * show strokeWidth * switch icons for drawShape & extraTools * dedupe getBoundsFromPoints * remove unused helpers * jsdoc cleanup * dynamic trail size * improve rectangle recognition * disallow linears to deviate too much from a straight line * put under freedraw tool on tablet/mobile * tweak label * rename `drawShape` -> `autoshape` --------- Signed-off-by: Mark Tolmacs <mark@lazycat.hu> Co-authored-by: dwelle <5153846+dwelle@users.noreply.github.com> Co-authored-by: Mark Tolmacs <mark@lazycat.hu> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
147 lines
4.3 KiB
TypeScript
147 lines
4.3 KiB
TypeScript
import {
|
|
pointFrom,
|
|
lineSegment,
|
|
polygon,
|
|
pointOnLineSegment,
|
|
polygonIncludesPoint,
|
|
segmentsIntersectAt,
|
|
} from "@excalidraw/math";
|
|
|
|
import type {
|
|
GlobalPoint,
|
|
LineSegment,
|
|
Polygon,
|
|
Radians,
|
|
} from "@excalidraw/math";
|
|
|
|
import { pointInEllipse, pointOnEllipse, type Ellipse } from "../src/shape";
|
|
|
|
describe("point and line", () => {
|
|
// const l: Line<GlobalPoint> = line(point(1, 0), point(1, 2));
|
|
|
|
// it("point on left or right of line", () => {
|
|
// expect(pointLeftofLine(point(0, 1), l)).toBe(true);
|
|
// expect(pointLeftofLine(point(1, 1), l)).toBe(false);
|
|
// expect(pointLeftofLine(point(2, 1), l)).toBe(false);
|
|
|
|
// expect(pointRightofLine(point(0, 1), l)).toBe(false);
|
|
// expect(pointRightofLine(point(1, 1), l)).toBe(false);
|
|
// expect(pointRightofLine(point(2, 1), l)).toBe(true);
|
|
// });
|
|
|
|
const s: LineSegment<GlobalPoint> = lineSegment(
|
|
pointFrom(1, 0),
|
|
pointFrom(1, 2),
|
|
);
|
|
|
|
it("point on the line", () => {
|
|
expect(pointOnLineSegment(pointFrom(0, 1), s)).toBe(false);
|
|
expect(pointOnLineSegment(pointFrom(1, 1), s, 0)).toBe(true);
|
|
expect(pointOnLineSegment(pointFrom(2, 1), s)).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe("point and polygon", () => {
|
|
it("point in polygon", () => {
|
|
const poly: Polygon<GlobalPoint> = polygon(
|
|
pointFrom(0, 0),
|
|
pointFrom(2, 0),
|
|
pointFrom(2, 2),
|
|
pointFrom(0, 2),
|
|
);
|
|
expect(polygonIncludesPoint(pointFrom(1, 1), poly)).toBe(true);
|
|
expect(polygonIncludesPoint(pointFrom(3, 3), poly)).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe("point and ellipse", () => {
|
|
const ellipse: Ellipse<GlobalPoint> = {
|
|
center: pointFrom(0, 0),
|
|
angle: 0 as Radians,
|
|
halfWidth: 2,
|
|
halfHeight: 1,
|
|
};
|
|
|
|
it("point on ellipse", () => {
|
|
[
|
|
pointFrom(0, 1),
|
|
pointFrom(0, -1),
|
|
pointFrom(2, 0),
|
|
pointFrom(-2, 0),
|
|
].forEach((p) => {
|
|
expect(pointOnEllipse(p, ellipse)).toBe(true);
|
|
});
|
|
expect(pointOnEllipse(pointFrom(-1.4, 0.7), ellipse, 0.1)).toBe(true);
|
|
expect(pointOnEllipse(pointFrom(-1.4, 0.71), ellipse, 0.01)).toBe(true);
|
|
|
|
expect(pointOnEllipse(pointFrom(1.4, 0.7), ellipse, 0.1)).toBe(true);
|
|
expect(pointOnEllipse(pointFrom(1.4, 0.71), ellipse, 0.01)).toBe(true);
|
|
|
|
expect(pointOnEllipse(pointFrom(1, -0.86), ellipse, 0.1)).toBe(true);
|
|
expect(pointOnEllipse(pointFrom(1, -0.86), ellipse, 0.01)).toBe(true);
|
|
|
|
expect(pointOnEllipse(pointFrom(-1, -0.86), ellipse, 0.1)).toBe(true);
|
|
expect(pointOnEllipse(pointFrom(-1, -0.86), ellipse, 0.01)).toBe(true);
|
|
|
|
expect(pointOnEllipse(pointFrom(-1, 0.8), ellipse)).toBe(false);
|
|
expect(pointOnEllipse(pointFrom(1, -0.8), ellipse)).toBe(false);
|
|
});
|
|
|
|
it("point in ellipse", () => {
|
|
[
|
|
pointFrom(0, 1),
|
|
pointFrom(0, -1),
|
|
pointFrom(2, 0),
|
|
pointFrom(-2, 0),
|
|
].forEach((p) => {
|
|
expect(pointInEllipse(p, ellipse)).toBe(true);
|
|
});
|
|
|
|
expect(pointInEllipse(pointFrom(-1, 0.8), ellipse)).toBe(true);
|
|
expect(pointInEllipse(pointFrom(1, -0.8), ellipse)).toBe(true);
|
|
|
|
expect(pointInEllipse(pointFrom(-1, 1), ellipse)).toBe(false);
|
|
expect(pointInEllipse(pointFrom(-1.4, 0.8), ellipse)).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe("line and line", () => {
|
|
const lineA: LineSegment<GlobalPoint> = lineSegment(
|
|
pointFrom(1, 4),
|
|
pointFrom(3, 4),
|
|
);
|
|
const lineB: LineSegment<GlobalPoint> = lineSegment(
|
|
pointFrom(2, 1),
|
|
pointFrom(2, 7),
|
|
);
|
|
const lineC: LineSegment<GlobalPoint> = lineSegment(
|
|
pointFrom(1, 8),
|
|
pointFrom(3, 8),
|
|
);
|
|
const lineD: LineSegment<GlobalPoint> = lineSegment(
|
|
pointFrom(1, 8),
|
|
pointFrom(3, 8),
|
|
);
|
|
const lineE: LineSegment<GlobalPoint> = lineSegment(
|
|
pointFrom(1, 9),
|
|
pointFrom(3, 9),
|
|
);
|
|
const lineF: LineSegment<GlobalPoint> = lineSegment(
|
|
pointFrom(1, 2),
|
|
pointFrom(3, 4),
|
|
);
|
|
const lineG: LineSegment<GlobalPoint> = lineSegment(
|
|
pointFrom(0, 1),
|
|
pointFrom(2, 3),
|
|
);
|
|
|
|
it("intersection", () => {
|
|
expect(segmentsIntersectAt(lineA, lineB)).toEqual([2, 4]);
|
|
expect(segmentsIntersectAt(lineA, lineC)).toBe(null);
|
|
expect(segmentsIntersectAt(lineB, lineC)).toBe(null);
|
|
expect(segmentsIntersectAt(lineC, lineD)).toBe(null); // Line overlapping line is not intersection!
|
|
expect(segmentsIntersectAt(lineE, lineD)).toBe(null);
|
|
expect(segmentsIntersectAt(lineF, lineG)).toBe(null);
|
|
});
|
|
});
|