marcel/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-11-15 02:04:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: Naming refactors

Browse Source 
Signed-off-by: Mark Tolmacs <mark@lazycat.hu>
This commit is contained in:
Mark Tolmacs
2025-11-11 18:49:37 +01:00
parent 5c1c74dd24
commit 8c37acd54a
2 changed files with 30 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
packages/element/src/binding.ts
View File

@@ -105,16 +105,12 @@ export type BindingStrategy =
/** excludes element strokeWidth */ /** excludes element strokeWidth */
export const BASE_BINDING_GAP = 10; export const BASE_BINDING_GAP = 10;
/** scaled based on zoom when < 1 */
const BASE_BINDING_DISTANCE = Math.max(BASE_BINDING_GAP, 15);
export const BINDING_HIGHLIGHT_THICKNESS = 10; export const getBindingGap = (element: ExcalidrawBindableElement): number =>
BASE_BINDING_GAP + element.strokeWidth / 2;
export const getFixedBindingGap = (
element: ExcalidrawBindableElement,
): number => BASE_BINDING_GAP + element.strokeWidth / 2;
export const maxBindingDistance_simple = (zoom?: AppState["zoom"]): number => { export const maxBindingDistance_simple = (zoom?: AppState["zoom"]): number => {
const BASE_BINDING_DISTANCE = Math.max(BASE_BINDING_GAP, 15);
const zoomValue = zoom?.value && zoom.value < 1 ? zoom.value : 1; const zoomValue = zoom?.value && zoom.value < 1 ? zoom.value : 1;
return clamp( return clamp(
// reducing zoom impact so that the diff between binding distance and // reducing zoom impact so that the diff between binding distance and
@@ -1259,7 +1255,7 @@ export const bindPointToSnapToElementOutline = (
bindableElement, bindableElement,
elementsMap, elementsMap,
intersector, intersector,
getFixedBindingGap(bindableElement), getBindingGap(bindableElement),
).sort(pointDistanceSq)[0]; ).sort(pointDistanceSq)[0];
if (!intersection) { if (!intersection) {
@@ -1289,7 +1285,7 @@ export const bindPointToSnapToElementOutline = (
vectorNormalize(vectorFromPoint(edgePoint, adjacentPoint)), vectorNormalize(vectorFromPoint(edgePoint, adjacentPoint)),
pointDistance(edgePoint, adjacentPoint) + pointDistance(edgePoint, adjacentPoint) +
Math.max(bindableElement.width, bindableElement.height) + Math.max(bindableElement.width, bindableElement.height) +
getFixedBindingGap(bindableElement) * 2, getBindingGap(bindableElement) * 2,
); );
const intersector = const intersector =
customIntersector ?? customIntersector ??
@@ -1304,7 +1300,7 @@ export const bindPointToSnapToElementOutline = (
bindableElement, bindableElement,
elementsMap, elementsMap,
intersector, intersector,
getFixedBindingGap(bindableElement), getBindingGap(bindableElement),
).sort( ).sort(
(g, h) => (g, h) =>
pointDistanceSq(g, adjacentPoint) - pointDistanceSq(g, adjacentPoint) -
@@ -1333,15 +1329,15 @@ export const avoidRectangularCorner = (
if (nonRotatedPoint[0] < element.x && nonRotatedPoint[1] < element.y) { if (nonRotatedPoint[0] < element.x && nonRotatedPoint[1] < element.y) {
// Top left // Top left
if (nonRotatedPoint[1] - element.y > -getFixedBindingGap(element)) { if (nonRotatedPoint[1] - element.y > -getBindingGap(element)) {
return pointRotateRads<GlobalPoint>( return pointRotateRads<GlobalPoint>(
pointFrom(element.x - getFixedBindingGap(element), element.y), pointFrom(element.x - getBindingGap(element), element.y),
center, center,
element.angle, element.angle,
); );
} }
return pointRotateRads( return pointRotateRads(
pointFrom(element.x, element.y - getFixedBindingGap(element)), pointFrom(element.x, element.y - getBindingGap(element)),
center, center,
element.angle, element.angle,
); );
@@ -1350,21 +1346,18 @@ export const avoidRectangularCorner = (
nonRotatedPoint[1] > element.y + element.height nonRotatedPoint[1] > element.y + element.height
) { ) {
// Bottom left // Bottom left
if (nonRotatedPoint[0] - element.x > -getFixedBindingGap(element)) { if (nonRotatedPoint[0] - element.x > -getBindingGap(element)) {
return pointRotateRads( return pointRotateRads(
pointFrom( pointFrom(
element.x, element.x,
element.y + element.height + getFixedBindingGap(element), element.y + element.height + getBindingGap(element),
), ),
center, center,
element.angle, element.angle,
); );
} }
return pointRotateRads( return pointRotateRads(
pointFrom( pointFrom(element.x - getBindingGap(element), element.y + element.height),
element.x - getFixedBindingGap(element),
element.y + element.height,
),
center, center,
element.angle, element.angle,
); );
@@ -1375,12 +1368,12 @@ export const avoidRectangularCorner = (
// Bottom right // Bottom right
if ( if (
nonRotatedPoint[0] - element.x < nonRotatedPoint[0] - element.x <
element.width + getFixedBindingGap(element) element.width + getBindingGap(element)
) { ) {
return pointRotateRads( return pointRotateRads(
pointFrom( pointFrom(
element.x + element.width, element.x + element.width,
element.y + element.height + getFixedBindingGap(element), element.y + element.height + getBindingGap(element),
), ),
center, center,
element.angle, element.angle,
@@ -1388,7 +1381,7 @@ export const avoidRectangularCorner = (
} }
return pointRotateRads( return pointRotateRads(
pointFrom( pointFrom(
element.x + element.width + getFixedBindingGap(element), element.x + element.width + getBindingGap(element),
element.y + element.height, element.y + element.height,
), ),
center, center,
@@ -1401,22 +1394,19 @@ export const avoidRectangularCorner = (
// Top right // Top right
if ( if (
nonRotatedPoint[0] - element.x < nonRotatedPoint[0] - element.x <
element.width + getFixedBindingGap(element) element.width + getBindingGap(element)
) { ) {
return pointRotateRads( return pointRotateRads(
pointFrom( pointFrom(
element.x + element.width, element.x + element.width,
element.y - getFixedBindingGap(element), element.y - getBindingGap(element),
), ),
center, center,
element.angle, element.angle,
); );
} }
return pointRotateRads( return pointRotateRads(
pointFrom( pointFrom(element.x + element.width + getBindingGap(element), element.y),
element.x + element.width + getFixedBindingGap(element),
element.y,
),
center, center,
element.angle, element.angle,
); );
@@ -1441,7 +1431,7 @@ const snapToMid = (
const horizontalThreshold = clamp(tolerance * width, 5, 80); const horizontalThreshold = clamp(tolerance * width, 5, 80);
// Too close to the center makes it hard to resolve direction precisely // Too close to the center makes it hard to resolve direction precisely
if (pointDistance(center, nonRotated) < getFixedBindingGap(element)) { if (pointDistance(center, nonRotated) < getBindingGap(element)) {
return p; return p;
} }
@@ -1452,7 +1442,7 @@ const snapToMid = (
) { ) {
// LEFT // LEFT
return pointRotateRads<GlobalPoint>( return pointRotateRads<GlobalPoint>(
pointFrom(x - getFixedBindingGap(element), center[1]), pointFrom(x - getBindingGap(element), center[1]),
center, center,
angle, angle,
); );
@@ -1463,7 +1453,7 @@ const snapToMid = (
) { ) {
// TOP // TOP
return pointRotateRads( return pointRotateRads(
pointFrom(center[0], y - getFixedBindingGap(element)), pointFrom(center[0], y - getBindingGap(element)),
center, center,
angle, angle,
); );
@@ -1474,7 +1464,7 @@ const snapToMid = (
) { ) {
// RIGHT // RIGHT
return pointRotateRads( return pointRotateRads(
pointFrom(x + width + getFixedBindingGap(element), center[1]), pointFrom(x + width + getBindingGap(element), center[1]),
center, center,
angle, angle,
); );
@@ -1485,12 +1475,12 @@ const snapToMid = (
) { ) {
// DOWN // DOWN
return pointRotateRads( return pointRotateRads(
pointFrom(center[0], y + height + getFixedBindingGap(element)), pointFrom(center[0], y + height + getBindingGap(element)),
center, center,
angle, angle,
); );
} else if (element.type === "diamond") { } else if (element.type === "diamond") {
const distance = getFixedBindingGap(element); const distance = getBindingGap(element);
const topLeft = pointFrom<GlobalPoint>( const topLeft = pointFrom<GlobalPoint>(
x + width / 4 - distance, x + width / 4 - distance,
y + height / 4 - distance, y + height / 4 - distance,

12
packages/element/src/elbowArrow.ts
View File

@@ -26,11 +26,11 @@ import type { AppState } from "@excalidraw/excalidraw/types";
import { import {
bindPointToSnapToElementOutline, bindPointToSnapToElementOutline,
BASE_BINDING_GAP,
getHeadingForElbowArrowSnap, getHeadingForElbowArrowSnap,
getGlobalFixedPointForBindableElement, getGlobalFixedPointForBindableElement,
getFixedBindingGap, getBindingGap,
maxBindingDistance_simple, maxBindingDistance_simple,
BASE_BINDING_GAP,
} from "./binding"; } from "./binding";
import { distanceToElement } from "./distance"; import { distanceToElement } from "./distance";
import { import {
@@ -1304,8 +1304,8 @@ const getElbowArrowData = (
offsetFromHeading( offsetFromHeading(
startHeading, startHeading,
arrow.startArrowhead arrow.startArrowhead
? getFixedBindingGap(hoveredStartElement) * 6 ? getBindingGap(hoveredStartElement) * 6
: getFixedBindingGap(hoveredStartElement) * 2, : getBindingGap(hoveredStartElement) * 2,
1, 1,
), ),
) )
@@ -1317,8 +1317,8 @@ const getElbowArrowData = (
offsetFromHeading( offsetFromHeading(
endHeading, endHeading,
arrow.endArrowhead arrow.endArrowhead
? getFixedBindingGap(hoveredEndElement) * 6 ? getBindingGap(hoveredEndElement) * 6
: getFixedBindingGap(hoveredEndElement) * 2, : getBindingGap(hoveredEndElement) * 2,
1, 1,
), ),
) )