github.com/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2024-11-10 11:35:52 +01:00
Code Releases Wiki Activity

fix: hit test for closed sharp curves (#7881)

Browse Source
This commit is contained in:
Ryan Di 2024-04-12 18:58:51 +08:00 committed by GitHub
parent 0ae9b383d6
commit 4689a6b300
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/excalidraw/components/App.tsx
View File

@ -4383,6 +4383,7 @@ class App extends React.Component<AppProps, AppState> {
return shouldTestInside(element) return shouldTestInside(element)
? getClosedCurveShape( ? getClosedCurveShape(
element,
roughShape, roughShape,
[element.x, element.y], [element.x, element.y],
element.angle, element.angle,

12
packages/utils/geometry/shape.ts
View File

@ -20,6 +20,7 @@ import {
ExcalidrawFreeDrawElement, ExcalidrawFreeDrawElement,
ExcalidrawIframeElement, ExcalidrawIframeElement,
ExcalidrawImageElement, ExcalidrawImageElement,
ExcalidrawLinearElement,
ExcalidrawRectangleElement, ExcalidrawRectangleElement,
ExcalidrawSelectionElement, ExcalidrawSelectionElement,
ExcalidrawTextElement, ExcalidrawTextElement,
@ -233,12 +234,12 @@ export const getFreedrawShape = (
}; };
export const getClosedCurveShape = ( export const getClosedCurveShape = (
element: ExcalidrawLinearElement,
roughShape: Drawable, roughShape: Drawable,
startingPoint: Point = [0, 0], startingPoint: Point = [0, 0],
angleInRadian: number, angleInRadian: number,
center: Point, center: Point,
): GeometricShape => { ): GeometricShape => {
const ops = getCurvePathOps(roughShape);
const transform = (p: Point) => const transform = (p: Point) =>
pointRotate( pointRotate(
[p[0] + startingPoint[0], p[1] + startingPoint[1]], [p[0] + startingPoint[0], p[1] + startingPoint[1]],
@ -246,6 +247,15 @@ export const getClosedCurveShape = (
center, center,
); );
if (element.roundness === null) {
return {
type: "polygon",
data: close(element.points.map((p) => transform(p as Point))),
};
}
const ops = getCurvePathOps(roughShape);
const points: Point[] = []; const points: Point[] = [];
let odd = false; let odd = false;
for (const operation of ops) { for (const operation of ops) {