github.com
/
excalidraw
mirror of https://github.com/excalidraw/excalidraw.git
1
0
Fork 0
Code Releases Wiki Activity

fix: Yet more patching of intersect code (#8352) 

* Yet more patching of intersect code
This commit is contained in:
Márk Tolmács 2024-08-09 17:33:12 +02:00 committed by GitHub
parent 1ea5b26f25
commit 99b91c46f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
packages/excalidraw/element/binding.ts
View File

@ -41,6 +41,7 @@ import {
isElbowArrow, isElbowArrow,
isFrameLikeElement, isFrameLikeElement,
isLinearElement, isLinearElement,
isRectangularElement,
isTextElement, isTextElement,
} from "./typeChecks"; } from "./typeChecks";
import type { ElementUpdate } from "./mutateElement"; import type { ElementUpdate } from "./mutateElement";
@ -751,7 +752,7 @@ export const bindPointToSnapToElementOutline = (
const aabb = bindableElement && aabbForElement(bindableElement); const aabb = bindableElement && aabbForElement(bindableElement);
if (bindableElement && aabb) { if (bindableElement && aabb) {
// TODO: Dirty hack until tangents are properly calculated // TODO: Dirty hacks until tangents are properly calculated
const intersections = [ const intersections = [
...intersectElementWithLine( ...intersectElementWithLine(
bindableElement, bindableElement,
@ -759,24 +760,32 @@ export const bindPointToSnapToElementOutline = (
[point[0], point[1] + 2 * bindableElement.height], [point[0], point[1] + 2 * bindableElement.height],
FIXED_BINDING_DISTANCE, FIXED_BINDING_DISTANCE,
elementsMap, elementsMap,
).map((i) => ).map((i) => {
distanceToBindableElement(bindableElement, i, elementsMap) >= if (!isRectangularElement(bindableElement)) {
bindableElement.height / 2 return i;
}
const d = distanceToBindableElement(bindableElement, i, elementsMap);
return d >= bindableElement.height / 2 || d < FIXED_BINDING_DISTANCE
? ([point[0], -1 * i[1]] as Point) ? ([point[0], -1 * i[1]] as Point)
: ([point[0], i[1]] as Point), : ([point[0], i[1]] as Point);
), }),
...intersectElementWithLine( ...intersectElementWithLine(
bindableElement, bindableElement,
[point[0] - 2 * bindableElement.width, point[1]], [point[0] - 2 * bindableElement.width, point[1]],
[point[0] + 2 * bindableElement.width, point[1]], [point[0] + 2 * bindableElement.width, point[1]],
FIXED_BINDING_DISTANCE, FIXED_BINDING_DISTANCE,
elementsMap, elementsMap,
).map((i) => ).map((i) => {
distanceToBindableElement(bindableElement, i, elementsMap) >= if (!isRectangularElement(bindableElement)) {
bindableElement.width / 2 return i;
}
const d = distanceToBindableElement(bindableElement, i, elementsMap);
return d >= bindableElement.width / 2 || d < FIXED_BINDING_DISTANCE
? ([-1 * i[0], point[1]] as Point) ? ([-1 * i[0], point[1]] as Point)
: ([i[0], point[1]] as Point), : ([i[0], point[1]] as Point);
), }),
]; ];
const heading = headingForPointFromElement(bindableElement, aabb, point); const heading = headingForPointFromElement(bindableElement, aabb, point);

17
packages/excalidraw/element/typeChecks.ts
View File

@ -176,6 +176,23 @@ export const isRectanguloidElement = (
); );
}; };
// TODO: Remove this when proper distance calculation is introduced
// @see binding.ts:distanceToBindableElement()
export const isRectangularElement = (
element?: ExcalidrawElement | null,
): element is ExcalidrawBindableElement => {
return (
element != null &&
(element.type === "rectangle" ||
element.type === "image" ||
element.type === "text" ||
element.type === "iframe" ||
element.type === "embeddable" ||
element.type === "frame" ||
element.type === "magicframe")
);
};
export const isTextBindableContainer = ( export const isTextBindableContainer = (
element: ExcalidrawElement | null, element: ExcalidrawElement | null,
includeLocked = true, includeLocked = true,