Compare commits
14
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d6349e3fad | ||
|
|
120b11119b | ||
|
|
f42dda6769 | ||
|
|
5ceb97e6b5 | ||
|
|
0dab7c3a68 | ||
|
|
708048ec61 | ||
|
|
2dfcc6f0ce | ||
|
|
3f5fdec04e | ||
|
|
278cd35772 | ||
|
|
43fa4b5602 | ||
|
|
2e1a529c67 | ||
|
|
b1c6bfcf40 | ||
|
|
1caec99b29 | ||
|
|
e18c1dd213 |
@@ -1,4 +1,4 @@
|
|||||||
FROM node:18-bullseye
|
FROM node:24-bullseye
|
||||||
|
|
||||||
# Vite wants to open the browser using `open`, so we
|
# Vite wants to open the browser using `open`, so we
|
||||||
# need to install those utils.
|
# need to install those utils.
|
||||||
|
|||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
FROM --platform=${BUILDPLATFORM} node:18 AS build
|
FROM --platform=${BUILDPLATFORM} node:24 AS build
|
||||||
|
|
||||||
WORKDIR /opt/node_app
|
WORKDIR /opt/node_app
|
||||||
|
|
||||||
@@ -13,7 +13,7 @@ ARG NODE_ENV=production
|
|||||||
|
|
||||||
RUN npm_config_target_arch=${TARGETARCH} yarn build:app:docker
|
RUN npm_config_target_arch=${TARGETARCH} yarn build:app:docker
|
||||||
|
|
||||||
FROM --platform=${TARGETPLATFORM} nginx:1.27-alpine
|
FROM nginx:1.27-alpine
|
||||||
|
|
||||||
COPY --from=build /opt/node_app/excalidraw-app/build /usr/share/nginx/html
|
COPY --from=build /opt/node_app/excalidraw-app/build /usr/share/nginx/html
|
||||||
|
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
<a href="https://docs.excalidraw.com/docs/introduction/contributing">
|
<a href="https://docs.excalidraw.com/docs/introduction/contributing">
|
||||||
<img alt="PRs welcome!" src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat" /></a>
|
<img alt="PRs welcome!" src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat" /></a>
|
||||||
<a href="https://discord.gg/UexuTaE">
|
<a href="https://discord.gg/UexuTaE">
|
||||||
<img alt="Chat on Discord" src="https://img.shields.io/discord/723672430744174682?color=738ad6&label=Chat%20on%20Discord&logo=discord&logoColor=ffffff&widge=false"/></a>
|
<img alt="Chat on Discord" src="https://img.shields.io/discord/723672430744174682?color=738ad6&label=Chat%20on%20Discord&logo=discord&logoColor=ffffff&widget=false"/></a>
|
||||||
<a href="https://deepwiki.com/excalidraw/excalidraw">
|
<a href="https://deepwiki.com/excalidraw/excalidraw">
|
||||||
<img alt="Ask DeepWiki" src="https://deepwiki.com/badge.svg" /></a>
|
<img alt="Ask DeepWiki" src="https://deepwiki.com/badge.svg" /></a>
|
||||||
<a href="https://twitter.com/excalidraw">
|
<a href="https://twitter.com/excalidraw">
|
||||||
|
|||||||
@@ -97,8 +97,8 @@ const config = {
|
|||||||
href: "https://discord.gg/UexuTaE",
|
href: "https://discord.gg/UexuTaE",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: "Twitter",
|
label: "𝕏",
|
||||||
href: "https://twitter.com/excalidraw",
|
href: "https://x.com/excalidraw",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: "Linkedin",
|
label: "Linkedin",
|
||||||
|
|||||||
@@ -405,9 +405,8 @@ export const ROUGHNESS = {
|
|||||||
|
|
||||||
export const STROKE_WIDTH = {
|
export const STROKE_WIDTH = {
|
||||||
thin: 1,
|
thin: 1,
|
||||||
medium: 2,
|
bold: 2,
|
||||||
bold: 4,
|
extraBold: 4,
|
||||||
extraBold: 8,
|
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
export const DEFAULT_ELEMENT_PROPS: {
|
export const DEFAULT_ELEMENT_PROPS: {
|
||||||
@@ -430,8 +429,6 @@ export const DEFAULT_ELEMENT_PROPS: {
|
|||||||
locked: false,
|
locked: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
export const DEFAULT_FREE_DRAW_STROKE_SHAPE = "variable" as const;
|
|
||||||
|
|
||||||
export const LIBRARY_SIDEBAR_TAB = "library";
|
export const LIBRARY_SIDEBAR_TAB = "library";
|
||||||
export const CANVAS_SEARCH_TAB = "search";
|
export const CANVAS_SEARCH_TAB = "search";
|
||||||
|
|
||||||
|
|||||||
@@ -1943,9 +1943,9 @@ export const calculateFixedPointForElbowArrowBinding = (
|
|||||||
return {
|
return {
|
||||||
fixedPoint: normalizeFixedPoint([
|
fixedPoint: normalizeFixedPoint([
|
||||||
(nonRotatedSnappedGlobalPoint[0] - hoveredElement.x) /
|
(nonRotatedSnappedGlobalPoint[0] - hoveredElement.x) /
|
||||||
hoveredElement.width,
|
Math.max(hoveredElement.width, PRECISION),
|
||||||
(nonRotatedSnappedGlobalPoint[1] - hoveredElement.y) /
|
(nonRotatedSnappedGlobalPoint[1] - hoveredElement.y) /
|
||||||
hoveredElement.height,
|
Math.max(hoveredElement.height, PRECISION),
|
||||||
]),
|
]),
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -1976,9 +1976,11 @@ export const calculateFixedPointForNonElbowArrowBinding = (
|
|||||||
|
|
||||||
// Calculate the ratio relative to the element's bounds
|
// Calculate the ratio relative to the element's bounds
|
||||||
const fixedPointX =
|
const fixedPointX =
|
||||||
(nonRotatedPoint[0] - hoveredElement.x) / hoveredElement.width;
|
(nonRotatedPoint[0] - hoveredElement.x) /
|
||||||
|
Math.max(hoveredElement.width, PRECISION);
|
||||||
const fixedPointY =
|
const fixedPointY =
|
||||||
(nonRotatedPoint[1] - hoveredElement.y) / hoveredElement.height;
|
(nonRotatedPoint[1] - hoveredElement.y) /
|
||||||
|
Math.max(hoveredElement.height, PRECISION);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
fixedPoint: normalizeFixedPoint([fixedPointX, fixedPointY]),
|
fixedPoint: normalizeFixedPoint([fixedPointX, fixedPointY]),
|
||||||
|
|||||||
@@ -168,14 +168,12 @@ export class ElementBounds {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
const padding =
|
|
||||||
element.strokeShape === "fixed" ? element.strokeWidth / 2 : 0;
|
|
||||||
|
|
||||||
return [
|
return [
|
||||||
minX + element.x - padding,
|
minX + element.x,
|
||||||
minY + element.y - padding,
|
minY + element.y,
|
||||||
maxX + element.x + padding,
|
maxX + element.x,
|
||||||
maxY + element.y + padding,
|
maxY + element.y,
|
||||||
];
|
];
|
||||||
} else if (isLinearElement(element)) {
|
} else if (isLinearElement(element)) {
|
||||||
bounds = getLinearElementRotatedBounds(element, cx, cy, elementsMap);
|
bounds = getLinearElementRotatedBounds(element, cx, cy, elementsMap);
|
||||||
@@ -705,11 +703,10 @@ const getFreeDrawElementAbsoluteCoords = (
|
|||||||
element: ExcalidrawFreeDrawElement,
|
element: ExcalidrawFreeDrawElement,
|
||||||
): [number, number, number, number, number, number] => {
|
): [number, number, number, number, number, number] => {
|
||||||
const [minX, minY, maxX, maxY] = getBoundsFromPoints(element.points);
|
const [minX, minY, maxX, maxY] = getBoundsFromPoints(element.points);
|
||||||
const padding = element.strokeShape === "fixed" ? element.strokeWidth / 2 : 0;
|
const x1 = minX + element.x;
|
||||||
const x1 = minX + element.x - padding;
|
const y1 = minY + element.y;
|
||||||
const y1 = minY + element.y - padding;
|
const x2 = maxX + element.x;
|
||||||
const x2 = maxX + element.x + padding;
|
const y2 = maxY + element.y;
|
||||||
const y2 = maxY + element.y + padding;
|
|
||||||
return [x1, y1, x2, y2, (x1 + x2) / 2, (y1 + y2) / 2];
|
return [x1, y1, x2, y2, (x1 + x2) / 2, (y1 + y2) / 2];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ import type {
|
|||||||
|
|
||||||
import type { FrameNameBounds } from "@excalidraw/excalidraw/types";
|
import type { FrameNameBounds } from "@excalidraw/excalidraw/types";
|
||||||
|
|
||||||
import { isLoopFreeDrawElement } from "./freedraw";
|
|
||||||
import { isPathALoop } from "./utils";
|
import { isPathALoop } from "./utils";
|
||||||
import {
|
import {
|
||||||
doBoundsIntersect,
|
doBoundsIntersect,
|
||||||
@@ -94,7 +93,7 @@ export const shouldTestInside = (element: ExcalidrawElement) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (element.type === "freedraw") {
|
if (element.type === "freedraw") {
|
||||||
return isDraggableFromInside && isLoopFreeDrawElement(element);
|
return isDraggableFromInside && isPathALoop(element.points);
|
||||||
}
|
}
|
||||||
|
|
||||||
return isDraggableFromInside || isImageElement(element);
|
return isDraggableFromInside || isImageElement(element);
|
||||||
@@ -755,8 +754,8 @@ export const isPointInElement = (
|
|||||||
elementsMap: ElementsMap,
|
elementsMap: ElementsMap,
|
||||||
) => {
|
) => {
|
||||||
if (
|
if (
|
||||||
(isLinearElement(element) && !isPathALoop(element.points)) ||
|
(isLinearElement(element) || isFreeDrawElement(element)) &&
|
||||||
(isFreeDrawElement(element) && !isLoopFreeDrawElement(element))
|
!isPathALoop(element.points)
|
||||||
) {
|
) {
|
||||||
// There isn't any "inside" for a non-looping path
|
// There isn't any "inside" for a non-looping path
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -250,6 +250,9 @@ export const duplicateElements = (
|
|||||||
elementsWithDuplicates.splice(index + 1, 0, ...castArray(elements));
|
elementsWithDuplicates.splice(index + 1, 0, ...castArray(elements));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// main
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
const frameIdsToDuplicate = new Set(
|
const frameIdsToDuplicate = new Set(
|
||||||
elements
|
elements
|
||||||
.filter(
|
.filter(
|
||||||
|
|||||||
@@ -2124,8 +2124,8 @@ const normalizeArrowElementUpdate = (
|
|||||||
offsetY < -MAX_POS ||
|
offsetY < -MAX_POS ||
|
||||||
offsetY > MAX_POS ||
|
offsetY > MAX_POS ||
|
||||||
offsetX + points[points.length - 1][0] < -MAX_POS ||
|
offsetX + points[points.length - 1][0] < -MAX_POS ||
|
||||||
offsetY + points[points.length - 1][0] > MAX_POS ||
|
offsetX + points[points.length - 1][0] > MAX_POS ||
|
||||||
offsetX + points[points.length - 1][1] < -MAX_POS ||
|
offsetY + points[points.length - 1][1] < -MAX_POS ||
|
||||||
offsetY + points[points.length - 1][1] > MAX_POS
|
offsetY + points[points.length - 1][1] > MAX_POS
|
||||||
) {
|
) {
|
||||||
console.error(
|
console.error(
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import {
|
|||||||
getElementAbsoluteCoords,
|
getElementAbsoluteCoords,
|
||||||
doBoundsIntersect,
|
doBoundsIntersect,
|
||||||
getElementBounds,
|
getElementBounds,
|
||||||
|
boundsContainBounds,
|
||||||
} from "./bounds";
|
} from "./bounds";
|
||||||
import { mutateElement } from "./mutateElement";
|
import { mutateElement } from "./mutateElement";
|
||||||
import { getBoundTextElement, getContainerElement } from "./textElement";
|
import { getBoundTextElement, getContainerElement } from "./textElement";
|
||||||
@@ -101,8 +102,9 @@ export const isElementContainingFrame = (
|
|||||||
frame: ExcalidrawFrameLikeElement,
|
frame: ExcalidrawFrameLikeElement,
|
||||||
elementsMap: ElementsMap,
|
elementsMap: ElementsMap,
|
||||||
) => {
|
) => {
|
||||||
return getElementsWithinSelection([frame], element, elementsMap).some(
|
return boundsContainBounds(
|
||||||
(e) => e.id === frame.id,
|
getElementBounds(element, elementsMap),
|
||||||
|
getElementBounds(frame, elementsMap),
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,181 +0,0 @@
|
|||||||
import {
|
|
||||||
pointDistance,
|
|
||||||
vectorCross,
|
|
||||||
vectorDot,
|
|
||||||
vectorFromPoint,
|
|
||||||
} from "@excalidraw/math";
|
|
||||||
|
|
||||||
import type { LocalPoint } from "@excalidraw/math";
|
|
||||||
|
|
||||||
import { isPathALoop } from "./utils";
|
|
||||||
|
|
||||||
import type { ExcalidrawFreeDrawElement } from "./types";
|
|
||||||
|
|
||||||
type ZoomValue = NonNullable<Parameters<typeof isPathALoop>[1]>;
|
|
||||||
|
|
||||||
type FixedFreeDrawSimplificationProfile = {
|
|
||||||
minPointDistancePx: number;
|
|
||||||
maxPointDistance: number;
|
|
||||||
strokeDistanceFactor: number;
|
|
||||||
collinearityFactor: number;
|
|
||||||
minAlignment: number;
|
|
||||||
zoomScaling: "sqrt" | "none";
|
|
||||||
};
|
|
||||||
|
|
||||||
const FIXED_FREEDRAW_CAPTURE_PROFILE: FixedFreeDrawSimplificationProfile = {
|
|
||||||
minPointDistancePx: 0.35,
|
|
||||||
maxPointDistance: 0.85,
|
|
||||||
strokeDistanceFactor: 0.08,
|
|
||||||
collinearityFactor: 0.3,
|
|
||||||
minAlignment: 0.985,
|
|
||||||
zoomScaling: "sqrt",
|
|
||||||
};
|
|
||||||
|
|
||||||
const hasSyntheticLoopClosure = (
|
|
||||||
points: readonly LocalPoint[],
|
|
||||||
): points is readonly [LocalPoint, LocalPoint, ...LocalPoint[]] => {
|
|
||||||
if (points.length < 3) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
const firstPoint = points[0];
|
|
||||||
const lastPoint = points[points.length - 1];
|
|
||||||
|
|
||||||
return firstPoint[0] === lastPoint[0] && firstPoint[1] === lastPoint[1];
|
|
||||||
};
|
|
||||||
|
|
||||||
const stripSyntheticLoopClosure = (points: readonly LocalPoint[]) =>
|
|
||||||
hasSyntheticLoopClosure(points) ? points.slice(0, -1) : points;
|
|
||||||
|
|
||||||
export const isLoopFreeDrawElement = (
|
|
||||||
element: ExcalidrawFreeDrawElement,
|
|
||||||
zoomValue: ZoomValue = 1 as ZoomValue,
|
|
||||||
) => element.strokeShape !== "fixed" && isPathALoop(element.points, zoomValue);
|
|
||||||
|
|
||||||
export const getFixedFreeDrawPoints = (
|
|
||||||
element: ExcalidrawFreeDrawElement,
|
|
||||||
): readonly LocalPoint[] => stripSyntheticLoopClosure(element.points);
|
|
||||||
|
|
||||||
export const getFixedFreeDrawPointSamplingDistance = (
|
|
||||||
strokeWidth: number,
|
|
||||||
zoomValue: ZoomValue = 1 as ZoomValue,
|
|
||||||
profile: FixedFreeDrawSimplificationProfile = FIXED_FREEDRAW_CAPTURE_PROFILE,
|
|
||||||
) =>
|
|
||||||
Math.min(
|
|
||||||
Math.max(
|
|
||||||
profile.minPointDistancePx /
|
|
||||||
(profile.zoomScaling === "sqrt"
|
|
||||||
? Math.max(1, Math.sqrt(zoomValue))
|
|
||||||
: 1),
|
|
||||||
strokeWidth * profile.strokeDistanceFactor,
|
|
||||||
),
|
|
||||||
profile.maxPointDistance,
|
|
||||||
);
|
|
||||||
|
|
||||||
const isRedundantFixedFreeDrawPoint = (
|
|
||||||
previousPoint: LocalPoint,
|
|
||||||
currentPoint: LocalPoint,
|
|
||||||
nextPoint: LocalPoint,
|
|
||||||
strokeWidth: number,
|
|
||||||
zoomValue: ZoomValue,
|
|
||||||
profile: FixedFreeDrawSimplificationProfile,
|
|
||||||
) => {
|
|
||||||
const previousSegmentLength = pointDistance(previousPoint, currentPoint);
|
|
||||||
const nextSegmentLength = pointDistance(currentPoint, nextPoint);
|
|
||||||
|
|
||||||
if (!previousSegmentLength || !nextSegmentLength) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
const previousVector = vectorFromPoint(currentPoint, previousPoint);
|
|
||||||
const nextVector = vectorFromPoint(nextPoint, currentPoint);
|
|
||||||
const alignment =
|
|
||||||
vectorDot(previousVector, nextVector) /
|
|
||||||
(previousSegmentLength * nextSegmentLength);
|
|
||||||
|
|
||||||
if (alignment < profile.minAlignment) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
const chord = vectorFromPoint(nextPoint, previousPoint);
|
|
||||||
const chordLength = pointDistance(previousPoint, nextPoint);
|
|
||||||
|
|
||||||
if (!chordLength) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
const distanceToChord =
|
|
||||||
Math.abs(vectorCross(vectorFromPoint(currentPoint, previousPoint), chord)) /
|
|
||||||
chordLength;
|
|
||||||
|
|
||||||
return (
|
|
||||||
distanceToChord <=
|
|
||||||
getFixedFreeDrawPointSamplingDistance(strokeWidth, zoomValue, profile) *
|
|
||||||
profile.collinearityFactor
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export const getFixedFreeDrawPointAction = ({
|
|
||||||
points,
|
|
||||||
nextPoint,
|
|
||||||
strokeWidth,
|
|
||||||
zoomValue,
|
|
||||||
isFinalPoint = false,
|
|
||||||
profile,
|
|
||||||
}: {
|
|
||||||
points: readonly LocalPoint[];
|
|
||||||
nextPoint: LocalPoint;
|
|
||||||
strokeWidth: number;
|
|
||||||
zoomValue: ZoomValue;
|
|
||||||
isFinalPoint?: boolean;
|
|
||||||
profile?: FixedFreeDrawSimplificationProfile;
|
|
||||||
}) => {
|
|
||||||
const simplificationProfile = profile ?? FIXED_FREEDRAW_CAPTURE_PROFILE;
|
|
||||||
const lastPoint = points[points.length - 1];
|
|
||||||
|
|
||||||
if (!lastPoint) {
|
|
||||||
return "append" as const;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (lastPoint[0] === nextPoint[0] && lastPoint[1] === nextPoint[1]) {
|
|
||||||
return "discard" as const;
|
|
||||||
}
|
|
||||||
|
|
||||||
const samplingDistance = getFixedFreeDrawPointSamplingDistance(
|
|
||||||
strokeWidth,
|
|
||||||
zoomValue,
|
|
||||||
simplificationProfile,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (points.length === 1) {
|
|
||||||
return !isFinalPoint &&
|
|
||||||
pointDistance(lastPoint, nextPoint) < samplingDistance
|
|
||||||
? ("discard" as const)
|
|
||||||
: ("append" as const);
|
|
||||||
}
|
|
||||||
|
|
||||||
const previousPoint = points[points.length - 2];
|
|
||||||
|
|
||||||
if (
|
|
||||||
isRedundantFixedFreeDrawPoint(
|
|
||||||
previousPoint,
|
|
||||||
lastPoint,
|
|
||||||
nextPoint,
|
|
||||||
strokeWidth,
|
|
||||||
zoomValue,
|
|
||||||
simplificationProfile,
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
return "replace" as const;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!isFinalPoint && pointDistance(lastPoint, nextPoint) < samplingDistance) {
|
|
||||||
return "discard" as const;
|
|
||||||
}
|
|
||||||
|
|
||||||
return "append" as const;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const getRenderableFixedFreeDrawPoints = (
|
|
||||||
element: ExcalidrawFreeDrawElement,
|
|
||||||
): readonly LocalPoint[] => getFixedFreeDrawPoints(element);
|
|
||||||
@@ -69,7 +69,6 @@ export * from "./duplicate";
|
|||||||
export * from "./elbowArrow";
|
export * from "./elbowArrow";
|
||||||
export * from "./elementLink";
|
export * from "./elementLink";
|
||||||
export * from "./embeddable";
|
export * from "./embeddable";
|
||||||
export * from "./freedraw";
|
|
||||||
export * from "./flowchart";
|
export * from "./flowchart";
|
||||||
export * from "./arrows/focus";
|
export * from "./arrows/focus";
|
||||||
export * from "./fractionalIndex";
|
export * from "./fractionalIndex";
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import {
|
import {
|
||||||
DEFAULT_FREE_DRAW_STROKE_SHAPE,
|
|
||||||
getSizeFromPoints,
|
getSizeFromPoints,
|
||||||
randomInteger,
|
randomInteger,
|
||||||
getUpdatedTimestamp,
|
getUpdatedTimestamp,
|
||||||
@@ -19,8 +18,6 @@ import type {
|
|||||||
ElementsMap,
|
ElementsMap,
|
||||||
ExcalidrawElbowArrowElement,
|
ExcalidrawElbowArrowElement,
|
||||||
ExcalidrawElement,
|
ExcalidrawElement,
|
||||||
ExcalidrawFreeDrawElement,
|
|
||||||
FreeDrawStrokeShape,
|
|
||||||
NonDeletedSceneElementsMap,
|
NonDeletedSceneElementsMap,
|
||||||
} from "./types";
|
} from "./types";
|
||||||
|
|
||||||
@@ -180,30 +177,6 @@ export const newElementWith = <TElement extends ExcalidrawElement>(
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export const newFreeDrawElementWithStrokeShape = <
|
|
||||||
TElement extends ExcalidrawFreeDrawElement,
|
|
||||||
>(
|
|
||||||
element: TElement,
|
|
||||||
strokeShape: FreeDrawStrokeShape,
|
|
||||||
): TElement => {
|
|
||||||
if (strokeShape === DEFAULT_FREE_DRAW_STROKE_SHAPE) {
|
|
||||||
if (!("strokeShape" in element)) {
|
|
||||||
return element;
|
|
||||||
}
|
|
||||||
const nextElement = newElementWith(
|
|
||||||
element,
|
|
||||||
{} as ElementUpdate<TElement>,
|
|
||||||
true,
|
|
||||||
);
|
|
||||||
delete (nextElement as Mutable<Partial<TElement>>).strokeShape;
|
|
||||||
return nextElement;
|
|
||||||
}
|
|
||||||
|
|
||||||
return newElementWith(element, {
|
|
||||||
strokeShape,
|
|
||||||
} as ElementUpdate<TElement>);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mutates element, bumping `version`, `versionNonce`, and `updated`.
|
* Mutates element, bumping `version`, `versionNonce`, and `updated`.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -445,7 +445,6 @@ export const newFreeDrawElement = (
|
|||||||
points?: ExcalidrawFreeDrawElement["points"];
|
points?: ExcalidrawFreeDrawElement["points"];
|
||||||
simulatePressure: boolean;
|
simulatePressure: boolean;
|
||||||
pressures?: ExcalidrawFreeDrawElement["pressures"];
|
pressures?: ExcalidrawFreeDrawElement["pressures"];
|
||||||
strokeShape?: ExcalidrawFreeDrawElement["strokeShape"];
|
|
||||||
} & ElementConstructorOpts,
|
} & ElementConstructorOpts,
|
||||||
): NonDeleted<ExcalidrawFreeDrawElement> => {
|
): NonDeleted<ExcalidrawFreeDrawElement> => {
|
||||||
return {
|
return {
|
||||||
@@ -453,7 +452,6 @@ export const newFreeDrawElement = (
|
|||||||
points: opts.points || [],
|
points: opts.points || [],
|
||||||
pressures: opts.pressures || [],
|
pressures: opts.pressures || [],
|
||||||
simulatePressure: opts.simulatePressure,
|
simulatePressure: opts.simulatePressure,
|
||||||
...(opts.strokeShape === "fixed" ? { strokeShape: opts.strokeShape } : {}),
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -417,27 +417,16 @@ const drawElementOnCanvas = (
|
|||||||
case "freedraw": {
|
case "freedraw": {
|
||||||
// Draw directly to canvas
|
// Draw directly to canvas
|
||||||
context.save();
|
context.save();
|
||||||
context.lineJoin = "round";
|
|
||||||
context.lineCap = "round";
|
|
||||||
|
|
||||||
const shapes = ShapeCache.generateElementShape(element, renderConfig);
|
const shapes = ShapeCache.generateElementShape(element, renderConfig);
|
||||||
const isFixedStroke = element.strokeShape === "fixed";
|
|
||||||
|
|
||||||
for (const shape of shapes) {
|
for (const shape of shapes) {
|
||||||
if (typeof shape === "string") {
|
if (typeof shape === "string") {
|
||||||
const strokeColor =
|
context.fillStyle =
|
||||||
renderConfig.theme === THEME.DARK
|
renderConfig.theme === THEME.DARK
|
||||||
? applyDarkModeFilter(element.strokeColor)
|
? applyDarkModeFilter(element.strokeColor)
|
||||||
: element.strokeColor;
|
: element.strokeColor;
|
||||||
|
context.fill(new Path2D(shape));
|
||||||
if (isFixedStroke) {
|
|
||||||
context.strokeStyle = strokeColor;
|
|
||||||
context.lineWidth = element.strokeWidth;
|
|
||||||
context.stroke(new Path2D(shape));
|
|
||||||
} else {
|
|
||||||
context.fillStyle = strokeColor;
|
|
||||||
context.fill(new Path2D(shape));
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
rc.draw(shape);
|
rc.draw(shape);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,7 +34,6 @@ import {
|
|||||||
elementOverlapsWithFrame,
|
elementOverlapsWithFrame,
|
||||||
getContainingFrame,
|
getContainingFrame,
|
||||||
getFrameChildren,
|
getFrameChildren,
|
||||||
isElementIntersectingFrame,
|
|
||||||
} from "./frame";
|
} from "./frame";
|
||||||
|
|
||||||
import { LinearElementEditor } from "./linearElementEditor";
|
import { LinearElementEditor } from "./linearElementEditor";
|
||||||
@@ -170,7 +169,7 @@ export const getElementsWithinSelection = (
|
|||||||
const associatedFrame = getContainingFrame(element, elementsMap);
|
const associatedFrame = getContainingFrame(element, elementsMap);
|
||||||
if (
|
if (
|
||||||
associatedFrame &&
|
associatedFrame &&
|
||||||
isElementIntersectingFrame(element, associatedFrame, elementsMap)
|
elementOverlapsWithFrame(element, associatedFrame, elementsMap)
|
||||||
) {
|
) {
|
||||||
const frameAABB = getElementBounds(associatedFrame, elementsMap);
|
const frameAABB = getElementBounds(associatedFrame, elementsMap);
|
||||||
elementAABB = [
|
elementAABB = [
|
||||||
@@ -209,10 +208,9 @@ export const getElementsWithinSelection = (
|
|||||||
if (boundsContainBounds(selectionBounds, commonAABB)) {
|
if (boundsContainBounds(selectionBounds, commonAABB)) {
|
||||||
if (framesInSelection && isFrameLikeElement(element)) {
|
if (framesInSelection && isFrameLikeElement(element)) {
|
||||||
framesInSelection.add(element.id);
|
framesInSelection.add(element.id);
|
||||||
} else {
|
|
||||||
elementsInSelection.push(element);
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
|
elementsInSelection.push(element);
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. Handle the case where the label is overlapped by the selection box
|
// 2. Handle the case where the label is overlapped by the selection box
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { simplify } from "points-on-curve";
|
import { simplify } from "points-on-curve";
|
||||||
import { DEFAULT_FREE_DRAW_STROKE_SHAPE } from "@excalidraw/common";
|
|
||||||
import { getStroke } from "perfect-freehand";
|
import { getStroke } from "perfect-freehand";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@@ -14,7 +13,6 @@ import {
|
|||||||
import {
|
import {
|
||||||
pointFrom,
|
pointFrom,
|
||||||
pointDistance,
|
pointDistance,
|
||||||
round,
|
|
||||||
type LocalPoint,
|
type LocalPoint,
|
||||||
pointRotateRads,
|
pointRotateRads,
|
||||||
} from "@excalidraw/math";
|
} from "@excalidraw/math";
|
||||||
@@ -54,10 +52,6 @@ import {
|
|||||||
isIframeLikeElement,
|
isIframeLikeElement,
|
||||||
isLinearElement,
|
isLinearElement,
|
||||||
} from "./typeChecks";
|
} from "./typeChecks";
|
||||||
import {
|
|
||||||
getRenderableFixedFreeDrawPoints,
|
|
||||||
isLoopFreeDrawElement,
|
|
||||||
} from "./freedraw";
|
|
||||||
import { getCornerRadius, isPathALoop } from "./utils";
|
import { getCornerRadius, isPathALoop } from "./utils";
|
||||||
import { headingForPointIsHorizontal } from "./heading";
|
import { headingForPointIsHorizontal } from "./heading";
|
||||||
|
|
||||||
@@ -250,12 +244,7 @@ export const generateRoughOptions = (
|
|||||||
}
|
}
|
||||||
case "line":
|
case "line":
|
||||||
case "freedraw": {
|
case "freedraw": {
|
||||||
const isLoop =
|
if (isPathALoop(element.points)) {
|
||||||
element.type === "freedraw"
|
|
||||||
? isLoopFreeDrawElement(element)
|
|
||||||
: isPathALoop(element.points);
|
|
||||||
|
|
||||||
if (isLoop) {
|
|
||||||
options.fillStyle = element.fillStyle;
|
options.fillStyle = element.fillStyle;
|
||||||
options.fill =
|
options.fill =
|
||||||
element.backgroundColor === "transparent"
|
element.backgroundColor === "transparent"
|
||||||
@@ -977,7 +966,7 @@ const _generateElementShape = (
|
|||||||
const shapes: ElementShapes[typeof element.type] = [];
|
const shapes: ElementShapes[typeof element.type] = [];
|
||||||
|
|
||||||
// (1) background fill (rc shape), optional
|
// (1) background fill (rc shape), optional
|
||||||
if (isLoopFreeDrawElement(element)) {
|
if (isPathALoop(element.points)) {
|
||||||
// generate rough polygon to fill freedraw shape
|
// generate rough polygon to fill freedraw shape
|
||||||
const simplifiedPoints = simplify(
|
const simplifiedPoints = simplify(
|
||||||
element.points as Mutable<LocalPoint[]>,
|
element.points as Mutable<LocalPoint[]>,
|
||||||
@@ -1184,13 +1173,6 @@ export const toggleLinePolygonState = (
|
|||||||
|
|
||||||
// NOTE not cached (-> for SVG export)
|
// NOTE not cached (-> for SVG export)
|
||||||
const getFreeDrawSvgPath = (element: ExcalidrawFreeDrawElement) => {
|
const getFreeDrawSvgPath = (element: ExcalidrawFreeDrawElement) => {
|
||||||
if (element.strokeShape === "fixed") {
|
|
||||||
return getSvgPathFromFixedFreeDrawPoints(
|
|
||||||
getRenderableFixedFreeDrawPoints(element),
|
|
||||||
element.strokeWidth,
|
|
||||||
) as SVGPathString;
|
|
||||||
}
|
|
||||||
|
|
||||||
return getSvgPathFromStroke(
|
return getSvgPathFromStroke(
|
||||||
getFreedrawOutlinePoints(element),
|
getFreedrawOutlinePoints(element),
|
||||||
) as SVGPathString;
|
) as SVGPathString;
|
||||||
@@ -1199,243 +1181,34 @@ const getFreeDrawSvgPath = (element: ExcalidrawFreeDrawElement) => {
|
|||||||
export const getFreedrawOutlinePoints = (
|
export const getFreedrawOutlinePoints = (
|
||||||
element: ExcalidrawFreeDrawElement,
|
element: ExcalidrawFreeDrawElement,
|
||||||
) => {
|
) => {
|
||||||
const strokeShape = element.strokeShape ?? DEFAULT_FREE_DRAW_STROKE_SHAPE;
|
|
||||||
const isFixedStroke = strokeShape === "fixed";
|
|
||||||
// If input points are empty (should they ever be?) return a dot
|
// If input points are empty (should they ever be?) return a dot
|
||||||
const inputPoints = isFixedStroke
|
const inputPoints = element.simulatePressure
|
||||||
? element.points.length
|
|
||||||
? element.points
|
|
||||||
: [[0, 0]]
|
|
||||||
: element.simulatePressure
|
|
||||||
? element.points
|
? element.points
|
||||||
: element.points.length
|
: element.points.length
|
||||||
? element.points.map(([x, y], i) => [x, y, element.pressures[i]])
|
? element.points.map(([x, y], i) => [x, y, element.pressures[i]])
|
||||||
: [[0, 0, 0.5]];
|
: [[0, 0, 0.5]];
|
||||||
|
|
||||||
return getStroke(inputPoints as number[][], {
|
return getStroke(inputPoints as number[][], {
|
||||||
simulatePressure: isFixedStroke ? false : element.simulatePressure,
|
simulatePressure: element.simulatePressure,
|
||||||
size: isFixedStroke ? element.strokeWidth : element.strokeWidth * 4.25,
|
size: element.strokeWidth * 4.25,
|
||||||
thinning: isFixedStroke ? 0 : 0.6,
|
thinning: 0.6,
|
||||||
smoothing: 0.5,
|
smoothing: 0.5,
|
||||||
streamline: 0.5,
|
streamline: 0.5,
|
||||||
easing: isFixedStroke ? (t) => t : (t) => Math.sin((t * Math.PI) / 2), // https://easings.net/#easeOutSine
|
easing: (t) => Math.sin((t * Math.PI) / 2), // https://easings.net/#easeOutSine
|
||||||
last: true,
|
last: true,
|
||||||
}) as [number, number][];
|
}) as [number, number][];
|
||||||
};
|
};
|
||||||
|
|
||||||
const med = (A: readonly number[], B: readonly number[]) => {
|
const med = (A: number[], B: number[]) => {
|
||||||
return [(A[0] + B[0]) / 2, (A[1] + B[1]) / 2];
|
return [(A[0] + B[0]) / 2, (A[1] + B[1]) / 2];
|
||||||
};
|
};
|
||||||
|
|
||||||
const roundPoint = (point: readonly number[]) =>
|
|
||||||
`${round(point[0], 2)},${round(point[1], 2)} `;
|
|
||||||
|
|
||||||
const averagePoint = (A: readonly number[], B: readonly number[]) =>
|
|
||||||
`${round((A[0] + B[0]) / 2, 2)},${round((A[1] + B[1]) / 2, 2)} `;
|
|
||||||
|
|
||||||
const getReadonlyPointDistance = (
|
|
||||||
pointA: readonly number[],
|
|
||||||
pointB: readonly number[],
|
|
||||||
) => Math.hypot(pointA[0] - pointB[0], pointA[1] - pointB[1]);
|
|
||||||
|
|
||||||
// Trim SVG path data so number are each two decimal points. This
|
// Trim SVG path data so number are each two decimal points. This
|
||||||
// improves SVG exports, and prevents rendering errors on points
|
// improves SVG exports, and prevents rendering errors on points
|
||||||
// with long decimals.
|
// with long decimals.
|
||||||
const TO_FIXED_PRECISION = /(\s?[A-Z]?,?-?[0-9]*\.[0-9]{0,2})(([0-9]|e|-)*)/g;
|
const TO_FIXED_PRECISION = /(\s?[A-Z]?,?-?[0-9]*\.[0-9]{0,2})(([0-9]|e|-)*)/g;
|
||||||
|
|
||||||
const getSvgPathFromPoints = (
|
const getSvgPathFromStroke = (points: number[][]): string => {
|
||||||
points: ReadonlyArray<readonly number[]>,
|
|
||||||
closed = false,
|
|
||||||
): string => {
|
|
||||||
const len = points.length;
|
|
||||||
|
|
||||||
if (len < 2) {
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
const path = points
|
|
||||||
.slice(1)
|
|
||||||
.map((point) => `L${roundPoint(point)}`)
|
|
||||||
.join("");
|
|
||||||
|
|
||||||
return `M${roundPoint(points[0])}${path}${closed ? "Z" : ""}`;
|
|
||||||
};
|
|
||||||
|
|
||||||
const FIXED_FREEDRAW_MIN_SMOOTH_ALIGNMENT = 0.6;
|
|
||||||
const FIXED_FREEDRAW_MIN_SMOOTH_SEGMENT_LENGTH = 0.2;
|
|
||||||
const FIXED_FREEDRAW_MIN_CORNER_ALIGNMENT = -0.25;
|
|
||||||
const FIXED_FREEDRAW_MIN_CORNER_ROUNDING = 0.75;
|
|
||||||
const FIXED_FREEDRAW_MAX_CORNER_ROUNDING = 6;
|
|
||||||
const FIXED_FREEDRAW_CORNER_ROUNDING_FACTOR = 0.35;
|
|
||||||
const FIXED_FREEDRAW_CORNER_ROUNDING_WIDTH_FACTOR = 1.5;
|
|
||||||
const FIXED_FREEDRAW_MIN_TERMINAL_STUB = 0.75;
|
|
||||||
const FIXED_FREEDRAW_MAX_TERMINAL_STUB = 2.5;
|
|
||||||
const FIXED_FREEDRAW_TERMINAL_STUB_WIDTH_FACTOR = 1.5;
|
|
||||||
|
|
||||||
const shouldSmoothFixedFreeDrawPoint = (
|
|
||||||
previousPoint: readonly number[],
|
|
||||||
currentPoint: readonly number[],
|
|
||||||
nextPoint: readonly number[],
|
|
||||||
) => {
|
|
||||||
const previousDeltaX = currentPoint[0] - previousPoint[0];
|
|
||||||
const previousDeltaY = currentPoint[1] - previousPoint[1];
|
|
||||||
const nextDeltaX = nextPoint[0] - currentPoint[0];
|
|
||||||
const nextDeltaY = nextPoint[1] - currentPoint[1];
|
|
||||||
const previousSegmentLength = Math.hypot(previousDeltaX, previousDeltaY);
|
|
||||||
const nextSegmentLength = Math.hypot(nextDeltaX, nextDeltaY);
|
|
||||||
|
|
||||||
if (
|
|
||||||
previousSegmentLength < FIXED_FREEDRAW_MIN_SMOOTH_SEGMENT_LENGTH ||
|
|
||||||
nextSegmentLength < FIXED_FREEDRAW_MIN_SMOOTH_SEGMENT_LENGTH
|
|
||||||
) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
const alignment =
|
|
||||||
(previousDeltaX * nextDeltaX + previousDeltaY * nextDeltaY) /
|
|
||||||
(previousSegmentLength * nextSegmentLength);
|
|
||||||
|
|
||||||
return alignment >= FIXED_FREEDRAW_MIN_SMOOTH_ALIGNMENT;
|
|
||||||
};
|
|
||||||
|
|
||||||
const getFixedFreeDrawRoundedCorner = (
|
|
||||||
previousPoint: readonly number[],
|
|
||||||
currentPoint: readonly number[],
|
|
||||||
nextPoint: readonly number[],
|
|
||||||
strokeWidth: number,
|
|
||||||
) => {
|
|
||||||
const previousDeltaX = currentPoint[0] - previousPoint[0];
|
|
||||||
const previousDeltaY = currentPoint[1] - previousPoint[1];
|
|
||||||
const nextDeltaX = nextPoint[0] - currentPoint[0];
|
|
||||||
const nextDeltaY = nextPoint[1] - currentPoint[1];
|
|
||||||
const previousSegmentLength = Math.hypot(previousDeltaX, previousDeltaY);
|
|
||||||
const nextSegmentLength = Math.hypot(nextDeltaX, nextDeltaY);
|
|
||||||
|
|
||||||
if (!previousSegmentLength || !nextSegmentLength) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const alignment =
|
|
||||||
(previousDeltaX * nextDeltaX + previousDeltaY * nextDeltaY) /
|
|
||||||
(previousSegmentLength * nextSegmentLength);
|
|
||||||
|
|
||||||
if (
|
|
||||||
alignment >= FIXED_FREEDRAW_MIN_SMOOTH_ALIGNMENT ||
|
|
||||||
alignment <= FIXED_FREEDRAW_MIN_CORNER_ALIGNMENT
|
|
||||||
) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const cornerRounding = Math.min(
|
|
||||||
Math.max(
|
|
||||||
strokeWidth * FIXED_FREEDRAW_CORNER_ROUNDING_WIDTH_FACTOR,
|
|
||||||
FIXED_FREEDRAW_MIN_CORNER_ROUNDING,
|
|
||||||
),
|
|
||||||
previousSegmentLength * FIXED_FREEDRAW_CORNER_ROUNDING_FACTOR,
|
|
||||||
nextSegmentLength * FIXED_FREEDRAW_CORNER_ROUNDING_FACTOR,
|
|
||||||
FIXED_FREEDRAW_MAX_CORNER_ROUNDING,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!cornerRounding) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
entryPoint: [
|
|
||||||
currentPoint[0] - (previousDeltaX / previousSegmentLength) * cornerRounding,
|
|
||||||
currentPoint[1] - (previousDeltaY / previousSegmentLength) * cornerRounding,
|
|
||||||
] as const,
|
|
||||||
exitPoint: [
|
|
||||||
currentPoint[0] + (nextDeltaX / nextSegmentLength) * cornerRounding,
|
|
||||||
currentPoint[1] + (nextDeltaY / nextSegmentLength) * cornerRounding,
|
|
||||||
] as const,
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
const getFixedFreeDrawTerminalStubThreshold = (strokeWidth: number) =>
|
|
||||||
Math.min(
|
|
||||||
Math.max(
|
|
||||||
strokeWidth * FIXED_FREEDRAW_TERMINAL_STUB_WIDTH_FACTOR,
|
|
||||||
FIXED_FREEDRAW_MIN_TERMINAL_STUB,
|
|
||||||
),
|
|
||||||
FIXED_FREEDRAW_MAX_TERMINAL_STUB,
|
|
||||||
);
|
|
||||||
|
|
||||||
const getSvgPathFromFixedFreeDrawPoints = (
|
|
||||||
points: ReadonlyArray<readonly number[]>,
|
|
||||||
strokeWidth: number,
|
|
||||||
): string => {
|
|
||||||
const len = points.length;
|
|
||||||
|
|
||||||
if (len < 2) {
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (len === 2) {
|
|
||||||
return `M${roundPoint(points[0])}L${roundPoint(points[1])}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
let path = `M${roundPoint(points[0])}`;
|
|
||||||
const lastPoint = points[len - 1];
|
|
||||||
let endsAtLastPoint = false;
|
|
||||||
|
|
||||||
for (let index = 1; index < len - 1; index++) {
|
|
||||||
const previousPoint = points[index - 1];
|
|
||||||
const currentPoint = points[index];
|
|
||||||
const nextPoint = points[index + 1];
|
|
||||||
const isLastCurveSegment = index === len - 2;
|
|
||||||
const terminalStubThreshold = getFixedFreeDrawTerminalStubThreshold(
|
|
||||||
strokeWidth,
|
|
||||||
);
|
|
||||||
const shouldSmooth = shouldSmoothFixedFreeDrawPoint(
|
|
||||||
previousPoint,
|
|
||||||
currentPoint,
|
|
||||||
nextPoint,
|
|
||||||
);
|
|
||||||
const roundedCorner = shouldSmooth
|
|
||||||
? null
|
|
||||||
: getFixedFreeDrawRoundedCorner(
|
|
||||||
previousPoint,
|
|
||||||
currentPoint,
|
|
||||||
nextPoint,
|
|
||||||
strokeWidth,
|
|
||||||
);
|
|
||||||
const shouldCollapseSmoothTerminalStub =
|
|
||||||
isLastCurveSegment &&
|
|
||||||
shouldSmooth &&
|
|
||||||
getReadonlyPointDistance(currentPoint, nextPoint) / 2 <=
|
|
||||||
terminalStubThreshold;
|
|
||||||
const shouldCollapseRoundedTerminalStub =
|
|
||||||
isLastCurveSegment &&
|
|
||||||
!!roundedCorner &&
|
|
||||||
getReadonlyPointDistance(roundedCorner.exitPoint, lastPoint) <=
|
|
||||||
terminalStubThreshold;
|
|
||||||
|
|
||||||
path += shouldSmooth
|
|
||||||
? `Q${roundPoint(currentPoint)}${
|
|
||||||
shouldCollapseSmoothTerminalStub
|
|
||||||
? roundPoint(lastPoint)
|
|
||||||
: averagePoint(currentPoint, nextPoint)
|
|
||||||
}`
|
|
||||||
: roundedCorner
|
|
||||||
? `L${roundPoint(roundedCorner.entryPoint)}Q${roundPoint(
|
|
||||||
currentPoint,
|
|
||||||
)}${
|
|
||||||
shouldCollapseRoundedTerminalStub
|
|
||||||
? roundPoint(lastPoint)
|
|
||||||
: roundPoint(roundedCorner.exitPoint)
|
|
||||||
}`
|
|
||||||
: `L${roundPoint(currentPoint)}`;
|
|
||||||
endsAtLastPoint =
|
|
||||||
shouldCollapseSmoothTerminalStub || shouldCollapseRoundedTerminalStub;
|
|
||||||
}
|
|
||||||
|
|
||||||
return endsAtLastPoint ? path : `${path}L${roundPoint(lastPoint)}`;
|
|
||||||
};
|
|
||||||
|
|
||||||
const getSvgPathFromStroke = (
|
|
||||||
points: ReadonlyArray<readonly number[]>,
|
|
||||||
): string => {
|
|
||||||
if (!points.length) {
|
if (!points.length) {
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,59 +1,56 @@
|
|||||||
import { arrayToMapWithIndex } from "@excalidraw/common";
|
import { arrayToMap } from "@excalidraw/common";
|
||||||
|
|
||||||
import type { ExcalidrawElement } from "./types";
|
import type { ExcalidrawElement } from "./types";
|
||||||
|
|
||||||
const normalizeGroupElementOrder = (elements: readonly ExcalidrawElement[]) => {
|
const defragmentGroups = (elements: readonly ExcalidrawElement[]) => {
|
||||||
const origElements: ExcalidrawElement[] = elements.slice();
|
const groupIdAtLevel = (element: ExcalidrawElement, level: number) => {
|
||||||
const sortedElements = new Set<ExcalidrawElement>();
|
return element.groupIds[element.groupIds.length - level - 1];
|
||||||
|
|
||||||
const orderInnerGroups = (
|
|
||||||
elements: readonly ExcalidrawElement[],
|
|
||||||
): ExcalidrawElement[] => {
|
|
||||||
const firstGroupSig = elements[0]?.groupIds?.join("");
|
|
||||||
const aGroup: ExcalidrawElement[] = [elements[0]];
|
|
||||||
const bGroup: ExcalidrawElement[] = [];
|
|
||||||
for (const element of elements.slice(1)) {
|
|
||||||
if (element.groupIds?.join("") === firstGroupSig) {
|
|
||||||
aGroup.push(element);
|
|
||||||
} else {
|
|
||||||
bGroup.push(element);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return bGroup.length ? [...aGroup, ...orderInnerGroups(bGroup)] : aGroup;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const groupHandledElements = new Map<string, true>();
|
const orderLevel = (
|
||||||
|
levelElements: readonly ExcalidrawElement[],
|
||||||
|
level: number,
|
||||||
|
): ExcalidrawElement[] => {
|
||||||
|
const buckets = new Map<string, ExcalidrawElement[]>();
|
||||||
|
// Slots preserve first-occurrence order: a groupId reserves its slot
|
||||||
|
// the first time one of its members is seen; loose elements occupy
|
||||||
|
// their own slot. Groups are then expanded (and recursed into) in place.
|
||||||
|
const slots: (ExcalidrawElement | string)[] = [];
|
||||||
|
|
||||||
origElements.forEach((element, idx) => {
|
for (const element of levelElements) {
|
||||||
if (groupHandledElements.has(element.id)) {
|
const groupId = groupIdAtLevel(element, level);
|
||||||
return;
|
if (groupId === undefined) {
|
||||||
}
|
slots.push(element);
|
||||||
if (element.groupIds?.length) {
|
continue;
|
||||||
const topGroup = element.groupIds[element.groupIds.length - 1];
|
|
||||||
const groupElements = origElements.slice(idx).filter((element) => {
|
|
||||||
const ret = element?.groupIds?.some((id) => id === topGroup);
|
|
||||||
if (ret) {
|
|
||||||
groupHandledElements.set(element!.id, true);
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
});
|
|
||||||
|
|
||||||
for (const elem of orderInnerGroups(groupElements)) {
|
|
||||||
sortedElements.add(elem);
|
|
||||||
}
|
}
|
||||||
} else {
|
let bucket = buckets.get(groupId);
|
||||||
sortedElements.add(element);
|
if (!bucket) {
|
||||||
|
bucket = [];
|
||||||
|
buckets.set(groupId, bucket);
|
||||||
|
slots.push(groupId);
|
||||||
|
}
|
||||||
|
bucket.push(element);
|
||||||
}
|
}
|
||||||
});
|
|
||||||
|
return slots.flatMap((slot) =>
|
||||||
|
typeof slot === "string"
|
||||||
|
? orderLevel(buckets.get(slot)!, level + 1)
|
||||||
|
: [slot],
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
// `groupIds` is stored innermost-first, so the outermost group is the
|
||||||
|
// last entry. We recurse from level 0 (outermost) inward.
|
||||||
|
const sortedElements = orderLevel(elements, 0);
|
||||||
|
|
||||||
// if there's a bug which resulted in losing some of the elements, return
|
// if there's a bug which resulted in losing some of the elements, return
|
||||||
// original instead as that's better than losing data
|
// original instead as that's better than losing data
|
||||||
if (sortedElements.size !== elements.length) {
|
if (sortedElements.length !== elements.length) {
|
||||||
console.error("normalizeGroupElementOrder: lost some elements... bailing!");
|
console.error("defragmentGroups: lost some elements... bailing!");
|
||||||
return elements;
|
return elements;
|
||||||
}
|
}
|
||||||
|
|
||||||
return [...sortedElements];
|
return sortedElements;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -68,39 +65,40 @@ const normalizeGroupElementOrder = (elements: readonly ExcalidrawElement[]) => {
|
|||||||
const normalizeBoundElementsOrder = (
|
const normalizeBoundElementsOrder = (
|
||||||
elements: readonly ExcalidrawElement[],
|
elements: readonly ExcalidrawElement[],
|
||||||
) => {
|
) => {
|
||||||
const elementsMap = arrayToMapWithIndex(elements);
|
const elementsMap = arrayToMap(elements);
|
||||||
|
|
||||||
const origElements: (ExcalidrawElement | null)[] = elements.slice();
|
|
||||||
const sortedElements = new Set<ExcalidrawElement>();
|
const sortedElements = new Set<ExcalidrawElement>();
|
||||||
|
|
||||||
origElements.forEach((element, idx) => {
|
for (const element of elements) {
|
||||||
if (!element) {
|
if (sortedElements.has(element)) {
|
||||||
return;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (element.boundElements?.length) {
|
if (element.boundElements?.length) {
|
||||||
sortedElements.add(element);
|
sortedElements.add(element);
|
||||||
origElements[idx] = null;
|
for (const boundElement of element.boundElements) {
|
||||||
element.boundElements.forEach((boundElement) => {
|
|
||||||
const child = elementsMap.get(boundElement.id);
|
const child = elementsMap.get(boundElement.id);
|
||||||
if (child && boundElement.type === "text") {
|
if (child && boundElement.type === "text") {
|
||||||
sortedElements.add(child[0]);
|
sortedElements.add(child);
|
||||||
origElements[child[1]] = null;
|
|
||||||
}
|
}
|
||||||
});
|
|
||||||
} else if (element.type === "text" && element.containerId) {
|
|
||||||
const parent = elementsMap.get(element.containerId);
|
|
||||||
if (!parent?.[0].boundElements?.find((x) => x.id === element.id)) {
|
|
||||||
sortedElements.add(element);
|
|
||||||
origElements[idx] = null;
|
|
||||||
|
|
||||||
// if element has a container and container lists it, skip this element
|
|
||||||
// as it'll be taken care of by the container
|
|
||||||
}
|
}
|
||||||
} else {
|
continue;
|
||||||
sortedElements.add(element);
|
|
||||||
origElements[idx] = null;
|
|
||||||
}
|
}
|
||||||
});
|
|
||||||
|
// if element has a container and container lists it, skip this element
|
||||||
|
// as it'll be taken care of by the container
|
||||||
|
if (
|
||||||
|
element.type === "text" &&
|
||||||
|
element.containerId &&
|
||||||
|
elementsMap
|
||||||
|
.get(element.containerId)
|
||||||
|
?.boundElements?.some((el) => el.id === element.id)
|
||||||
|
) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
sortedElements.add(element);
|
||||||
|
}
|
||||||
|
|
||||||
// if there's a bug which resulted in losing some of the elements, return
|
// if there's a bug which resulted in losing some of the elements, return
|
||||||
// original instead as that's better than losing data
|
// original instead as that's better than losing data
|
||||||
@@ -117,5 +115,5 @@ const normalizeBoundElementsOrder = (
|
|||||||
export const normalizeElementOrder = (
|
export const normalizeElementOrder = (
|
||||||
elements: readonly ExcalidrawElement[],
|
elements: readonly ExcalidrawElement[],
|
||||||
) => {
|
) => {
|
||||||
return normalizeBoundElementsOrder(normalizeGroupElementOrder(elements));
|
return normalizeBoundElementsOrder(defragmentGroups(elements));
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ export type PointerType = "mouse" | "pen" | "touch";
|
|||||||
export type StrokeRoundness = "round" | "sharp";
|
export type StrokeRoundness = "round" | "sharp";
|
||||||
export type RoundnessType = ValueOf<typeof ROUNDNESS>;
|
export type RoundnessType = ValueOf<typeof ROUNDNESS>;
|
||||||
export type StrokeStyle = "solid" | "dashed" | "dotted";
|
export type StrokeStyle = "solid" | "dashed" | "dotted";
|
||||||
export type FreeDrawStrokeShape = "variable" | "fixed";
|
|
||||||
export type TextAlign = typeof TEXT_ALIGN[keyof typeof TEXT_ALIGN];
|
export type TextAlign = typeof TEXT_ALIGN[keyof typeof TEXT_ALIGN];
|
||||||
|
|
||||||
type VerticalAlignKeys = keyof typeof VERTICAL_ALIGN;
|
type VerticalAlignKeys = keyof typeof VERTICAL_ALIGN;
|
||||||
@@ -391,7 +390,6 @@ export type ExcalidrawFreeDrawElement = _ExcalidrawElementBase &
|
|||||||
points: readonly LocalPoint[];
|
points: readonly LocalPoint[];
|
||||||
pressures: readonly number[];
|
pressures: readonly number[];
|
||||||
simulatePressure: boolean;
|
simulatePressure: boolean;
|
||||||
strokeShape?: FreeDrawStrokeShape;
|
|
||||||
}>;
|
}>;
|
||||||
|
|
||||||
export type FileId = string & { _brand: "FileId" };
|
export type FileId = string & { _brand: "FileId" };
|
||||||
|
|||||||
@@ -6,11 +6,7 @@ import type { LocalPoint } from "@excalidraw/math";
|
|||||||
|
|
||||||
import { getElementAbsoluteCoords, getElementBounds } from "../src/bounds";
|
import { getElementAbsoluteCoords, getElementBounds } from "../src/bounds";
|
||||||
|
|
||||||
import type {
|
import type { ExcalidrawElement, ExcalidrawLinearElement } from "../src/types";
|
||||||
ExcalidrawElement,
|
|
||||||
ExcalidrawFreeDrawElement,
|
|
||||||
ExcalidrawLinearElement,
|
|
||||||
} from "../src/types";
|
|
||||||
|
|
||||||
const _ce = ({
|
const _ce = ({
|
||||||
x,
|
x,
|
||||||
@@ -121,31 +117,6 @@ describe("getElementBounds", () => {
|
|||||||
expect(y2).toEqual(42.90569415042095);
|
expect(y2).toEqual(42.90569415042095);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("fixed freedraw", () => {
|
|
||||||
const element = {
|
|
||||||
..._ce({
|
|
||||||
x: 40,
|
|
||||||
y: 30,
|
|
||||||
w: 10,
|
|
||||||
h: 0,
|
|
||||||
a: 0,
|
|
||||||
t: "freedraw",
|
|
||||||
}),
|
|
||||||
strokeWidth: 8,
|
|
||||||
points: [pointFrom<LocalPoint>(0, 0), pointFrom<LocalPoint>(10, 0)],
|
|
||||||
pressures: [],
|
|
||||||
simulatePressure: true,
|
|
||||||
strokeShape: "fixed",
|
|
||||||
} as unknown as ExcalidrawFreeDrawElement;
|
|
||||||
|
|
||||||
const [x1, y1, x2, y2] = getElementBounds(element, arrayToMap([element]));
|
|
||||||
|
|
||||||
expect(x1).toEqual(36);
|
|
||||||
expect(y1).toEqual(26);
|
|
||||||
expect(x2).toEqual(54);
|
|
||||||
expect(y2).toEqual(34);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("curved line", () => {
|
it("curved line", () => {
|
||||||
const element = {
|
const element = {
|
||||||
..._ce({
|
..._ce({
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import {
|
|||||||
convertToExcalidrawElements,
|
convertToExcalidrawElements,
|
||||||
Excalidraw,
|
Excalidraw,
|
||||||
} from "@excalidraw/excalidraw";
|
} from "@excalidraw/excalidraw";
|
||||||
|
import { arrayToMap } from "@excalidraw/common";
|
||||||
|
|
||||||
import { API } from "@excalidraw/excalidraw/tests/helpers/api";
|
import { API } from "@excalidraw/excalidraw/tests/helpers/api";
|
||||||
import { Keyboard, Pointer } from "@excalidraw/excalidraw/tests/helpers/ui";
|
import { Keyboard, Pointer } from "@excalidraw/excalidraw/tests/helpers/ui";
|
||||||
@@ -10,7 +11,12 @@ import {
|
|||||||
render,
|
render,
|
||||||
} from "@excalidraw/excalidraw/tests/test-utils";
|
} from "@excalidraw/excalidraw/tests/test-utils";
|
||||||
|
|
||||||
import type { ExcalidrawElement } from "../src/types";
|
import { elementOverlapsWithFrame } from "../src/frame";
|
||||||
|
|
||||||
|
import type {
|
||||||
|
ExcalidrawElement,
|
||||||
|
ExcalidrawFrameLikeElement,
|
||||||
|
} from "../src/types";
|
||||||
|
|
||||||
const { h } = window;
|
const { h } = window;
|
||||||
const mouse = new Pointer("mouse");
|
const mouse = new Pointer("mouse");
|
||||||
@@ -125,6 +131,26 @@ describe("adding elements to frames", () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("should treat an element fully containing a frame as overlapping the frame", () => {
|
||||||
|
const containingRect = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
x: -50,
|
||||||
|
y: -50,
|
||||||
|
width: 250,
|
||||||
|
height: 250,
|
||||||
|
});
|
||||||
|
|
||||||
|
API.setElements([containingRect, frame]);
|
||||||
|
|
||||||
|
expect(
|
||||||
|
elementOverlapsWithFrame(
|
||||||
|
containingRect,
|
||||||
|
frame as ExcalidrawFrameLikeElement,
|
||||||
|
arrayToMap(h.elements),
|
||||||
|
),
|
||||||
|
).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
const commonTestCases = async (
|
const commonTestCases = async (
|
||||||
func: typeof resizeFrameOverElement | typeof dragElementIntoFrame,
|
func: typeof resizeFrameOverElement | typeof dragElementIntoFrame,
|
||||||
) => {
|
) => {
|
||||||
@@ -415,6 +441,22 @@ describe("adding elements to frames", () => {
|
|||||||
describe("dragging elements into the frame", async () => {
|
describe("dragging elements into the frame", async () => {
|
||||||
await commonTestCases(dragElementIntoFrame);
|
await commonTestCases(dragElementIntoFrame);
|
||||||
|
|
||||||
|
it("should add a dragged element fully containing the frame", () => {
|
||||||
|
const containingRect = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
x: 220,
|
||||||
|
y: 20,
|
||||||
|
width: 300,
|
||||||
|
height: 300,
|
||||||
|
});
|
||||||
|
|
||||||
|
API.setElements([frame, containingRect]);
|
||||||
|
|
||||||
|
dragElementIntoFrame(frame, containingRect);
|
||||||
|
|
||||||
|
expect(API.getElement(containingRect).frameId).toBe(frame.id);
|
||||||
|
});
|
||||||
|
|
||||||
it.skip("should drag element inside, duplicate it and keep it in frame", () => {
|
it.skip("should drag element inside, duplicate it and keep it in frame", () => {
|
||||||
API.setElements([frame, rect2]);
|
API.setElements([frame, rect2]);
|
||||||
|
|
||||||
|
|||||||
@@ -1,160 +0,0 @@
|
|||||||
import { pointFrom } from "@excalidraw/math";
|
|
||||||
import { API } from "@excalidraw/excalidraw/tests/helpers/api";
|
|
||||||
import { vi } from "vitest";
|
|
||||||
|
|
||||||
vi.mock("perfect-freehand", () => ({
|
|
||||||
getStroke: vi.fn(() => []),
|
|
||||||
}));
|
|
||||||
|
|
||||||
import { getStroke } from "perfect-freehand";
|
|
||||||
|
|
||||||
import { getFreedrawOutlinePoints, ShapeCache } from "../src/shape";
|
|
||||||
|
|
||||||
describe("freedraw stroke shape", () => {
|
|
||||||
beforeEach(() => {
|
|
||||||
vi.mocked(getStroke).mockClear();
|
|
||||||
ShapeCache.destroy();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("renders fixed strokes from the centerline path", () => {
|
|
||||||
const element = API.createElement({
|
|
||||||
type: "freedraw",
|
|
||||||
strokeShape: "fixed",
|
|
||||||
points: [pointFrom(0, 0), pointFrom(10, 10), pointFrom(20, 15)],
|
|
||||||
});
|
|
||||||
|
|
||||||
const shapes = ShapeCache.generateElementShape(element, null);
|
|
||||||
|
|
||||||
expect(shapes).toEqual([expect.any(String)]);
|
|
||||||
expect(shapes[0]).not.toContain("Z");
|
|
||||||
expect(vi.mocked(getStroke)).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("rounds fixed stroke corners without flattening them", () => {
|
|
||||||
const element = API.createElement({
|
|
||||||
type: "freedraw",
|
|
||||||
strokeShape: "fixed",
|
|
||||||
strokeWidth: 1,
|
|
||||||
points: [pointFrom(0, 0), pointFrom(10, 0), pointFrom(10, 10)],
|
|
||||||
});
|
|
||||||
|
|
||||||
const [path] = ShapeCache.generateElementShape(element, null);
|
|
||||||
|
|
||||||
expect(path).toBe("M0,0 L8.5,0 Q10,0 10,1.5 L10,10 ");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("does not round fixed stroke hairpin turns", () => {
|
|
||||||
const element = API.createElement({
|
|
||||||
type: "freedraw",
|
|
||||||
strokeShape: "fixed",
|
|
||||||
strokeWidth: 1,
|
|
||||||
points: [pointFrom(0, 0), pointFrom(10, 0), pointFrom(9, 1)],
|
|
||||||
});
|
|
||||||
|
|
||||||
const [path] = ShapeCache.generateElementShape(element, null);
|
|
||||||
|
|
||||||
expect(path).toBe("M0,0 L10,0 L9,1 ");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("curves directly to the endpoint for tiny final smooth segments", () => {
|
|
||||||
const element = API.createElement({
|
|
||||||
type: "freedraw",
|
|
||||||
strokeShape: "fixed",
|
|
||||||
strokeWidth: 1,
|
|
||||||
points: [pointFrom(0, 0), pointFrom(0.5, 0.1), pointFrom(0.8, 0.3)],
|
|
||||||
});
|
|
||||||
|
|
||||||
const [path] = ShapeCache.generateElementShape(element, null);
|
|
||||||
|
|
||||||
expect(path).toBe("M0,0 Q0.5,0.1 0.8,0.3 ");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("curves directly to the endpoint for tiny final rounded corners", () => {
|
|
||||||
const element = API.createElement({
|
|
||||||
type: "freedraw",
|
|
||||||
strokeShape: "fixed",
|
|
||||||
strokeWidth: 1,
|
|
||||||
points: [pointFrom(0, 0), pointFrom(10, 0), pointFrom(10, 1)],
|
|
||||||
});
|
|
||||||
|
|
||||||
const [path] = ShapeCache.generateElementShape(element, null);
|
|
||||||
|
|
||||||
expect(path).toBe("M0,0 L9.65,0 Q10,0 10,1 ");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("smooths dense fixed stroke points without dropping them", () => {
|
|
||||||
const element = API.createElement({
|
|
||||||
type: "freedraw",
|
|
||||||
strokeShape: "fixed",
|
|
||||||
points: [
|
|
||||||
pointFrom(0, 0),
|
|
||||||
pointFrom(0.3, 0.1),
|
|
||||||
pointFrom(0.6, 0.35),
|
|
||||||
pointFrom(1, 0.9),
|
|
||||||
],
|
|
||||||
});
|
|
||||||
|
|
||||||
const [path] = ShapeCache.generateElementShape(element, null);
|
|
||||||
|
|
||||||
expect(path).toContain("Q0.3,0.1 ");
|
|
||||||
expect(path).toContain("Q0.6,0.35 ");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("drops synthetic loop closure for fixed strokes", () => {
|
|
||||||
const element = API.createElement({
|
|
||||||
type: "freedraw",
|
|
||||||
strokeShape: "fixed",
|
|
||||||
points: [pointFrom(0, 0), pointFrom(10, 0), pointFrom(0, 0)],
|
|
||||||
});
|
|
||||||
|
|
||||||
const [path] = ShapeCache.generateElementShape(element, null);
|
|
||||||
|
|
||||||
expect(path).toBe("M0,0 L10,0 ");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("uses fixed perfect-freehand settings for fixed strokes", () => {
|
|
||||||
const element = API.createElement({
|
|
||||||
type: "freedraw",
|
|
||||||
strokeShape: "fixed",
|
|
||||||
strokeWidth: 8,
|
|
||||||
points: [pointFrom(0, 0), pointFrom(10, 10), pointFrom(20, 15)],
|
|
||||||
});
|
|
||||||
|
|
||||||
getFreedrawOutlinePoints(element);
|
|
||||||
|
|
||||||
expect(vi.mocked(getStroke)).toHaveBeenCalledWith(
|
|
||||||
element.points,
|
|
||||||
expect.objectContaining({
|
|
||||||
simulatePressure: false,
|
|
||||||
size: element.strokeWidth,
|
|
||||||
thinning: 0,
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("keeps pressure-aware perfect-freehand settings for variable strokes", () => {
|
|
||||||
const element = API.createElement({
|
|
||||||
type: "freedraw",
|
|
||||||
points: [pointFrom(0, 0), pointFrom(10, 10), pointFrom(20, 15)],
|
|
||||||
});
|
|
||||||
|
|
||||||
getFreedrawOutlinePoints({
|
|
||||||
...element,
|
|
||||||
simulatePressure: false,
|
|
||||||
pressures: [0.2, 0.8, 0.4],
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(vi.mocked(getStroke)).toHaveBeenCalledWith(
|
|
||||||
[
|
|
||||||
[0, 0, 0.2],
|
|
||||||
[10, 10, 0.8],
|
|
||||||
[20, 15, 0.4],
|
|
||||||
],
|
|
||||||
expect.objectContaining({
|
|
||||||
simulatePressure: false,
|
|
||||||
size: element.strokeWidth * 4.25,
|
|
||||||
thinning: 0.6,
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -326,19 +326,59 @@ describe("normalizeElementsOrder", () => {
|
|||||||
]),
|
]),
|
||||||
[
|
[
|
||||||
"BA_rect1",
|
"BA_rect1",
|
||||||
|
"CBA_rect3",
|
||||||
|
"CBA_rect7",
|
||||||
"BA_rect5",
|
"BA_rect5",
|
||||||
"BA_rect6",
|
"BA_rect6",
|
||||||
"A_rect2",
|
"A_rect2",
|
||||||
"A_rect5",
|
"A_rect5",
|
||||||
"CBA_rect3",
|
|
||||||
"CBA_rect7",
|
|
||||||
"rect4",
|
"rect4",
|
||||||
"X_rect8",
|
"X_rect8",
|
||||||
"X_rect11",
|
|
||||||
"YX_rect10",
|
"YX_rect10",
|
||||||
|
"X_rect11",
|
||||||
"rect9",
|
"rect9",
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
assertOrder(
|
||||||
|
normalizeElementOrder([
|
||||||
|
API.createElement({
|
||||||
|
id: "A_rect1",
|
||||||
|
type: "rectangle",
|
||||||
|
groupIds: ["A"],
|
||||||
|
}),
|
||||||
|
API.createElement({
|
||||||
|
id: "CBA_rect2",
|
||||||
|
type: "rectangle",
|
||||||
|
groupIds: ["C", "B", "A"],
|
||||||
|
}),
|
||||||
|
API.createElement({
|
||||||
|
id: "A_rect3",
|
||||||
|
type: "rectangle",
|
||||||
|
groupIds: ["A"],
|
||||||
|
}),
|
||||||
|
]),
|
||||||
|
["A_rect1", "CBA_rect2", "A_rect3"],
|
||||||
|
);
|
||||||
|
assertOrder(
|
||||||
|
normalizeElementOrder([
|
||||||
|
API.createElement({
|
||||||
|
id: "abcT_rect1",
|
||||||
|
type: "rectangle",
|
||||||
|
groupIds: ["ab", "c", "T"],
|
||||||
|
}),
|
||||||
|
API.createElement({
|
||||||
|
id: "abcT_rect2",
|
||||||
|
type: "rectangle",
|
||||||
|
groupIds: ["a", "bc", "T"],
|
||||||
|
}),
|
||||||
|
API.createElement({
|
||||||
|
id: "abcT_rect3",
|
||||||
|
type: "rectangle",
|
||||||
|
groupIds: ["ab", "c", "T"],
|
||||||
|
}),
|
||||||
|
]),
|
||||||
|
["abcT_rect1", "abcT_rect3", "abcT_rect2"],
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
// TODO
|
// TODO
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import { pointFrom } from "@excalidraw/math";
|
|||||||
|
|
||||||
import { bindOrUnbindBindingElement } from "@excalidraw/element/binding";
|
import { bindOrUnbindBindingElement } from "@excalidraw/element/binding";
|
||||||
import {
|
import {
|
||||||
isLoopFreeDrawElement,
|
|
||||||
isValidPolygon,
|
isValidPolygon,
|
||||||
LinearElementEditor,
|
LinearElementEditor,
|
||||||
newElementWith,
|
newElementWith,
|
||||||
@@ -243,11 +242,7 @@ export const actionFinalize = register<FormData>({
|
|||||||
// If the multi point line closes the loop,
|
// If the multi point line closes the loop,
|
||||||
// set the last point to first point.
|
// set the last point to first point.
|
||||||
// This ensures that loop remains closed at different scales.
|
// This ensures that loop remains closed at different scales.
|
||||||
const isLoop = isLineElement(element)
|
const isLoop = isPathALoop(element.points, appState.zoom.value);
|
||||||
? isPathALoop(element.points, appState.zoom.value)
|
|
||||||
: isFreeDrawElement(element)
|
|
||||||
? isLoopFreeDrawElement(element, appState.zoom.value)
|
|
||||||
: false;
|
|
||||||
|
|
||||||
if (isLoop && (isLineElement(element) || isFreeDrawElement(element))) {
|
if (isLoop && (isLineElement(element) || isFreeDrawElement(element))) {
|
||||||
const linePoints = element.points;
|
const linePoints = element.points;
|
||||||
@@ -334,7 +329,6 @@ export const actionFinalize = register<FormData>({
|
|||||||
selectionElement: null,
|
selectionElement: null,
|
||||||
multiElement: null,
|
multiElement: null,
|
||||||
editingTextElement: null,
|
editingTextElement: null,
|
||||||
startBoundElement: null,
|
|
||||||
suggestedBinding: null,
|
suggestedBinding: null,
|
||||||
selectedElementIds:
|
selectedElementIds:
|
||||||
element &&
|
element &&
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { queryByTestId } from "@testing-library/react";
|
import { queryByTestId } from "@testing-library/react";
|
||||||
import { pointFrom } from "@excalidraw/math";
|
|
||||||
|
|
||||||
import {
|
import {
|
||||||
COLOR_PALETTE,
|
COLOR_PALETTE,
|
||||||
@@ -11,7 +10,7 @@ import {
|
|||||||
import { Excalidraw } from "../index";
|
import { Excalidraw } from "../index";
|
||||||
import { API } from "../tests/helpers/api";
|
import { API } from "../tests/helpers/api";
|
||||||
import { UI } from "../tests/helpers/ui";
|
import { UI } from "../tests/helpers/ui";
|
||||||
import { act, render } from "../tests/test-utils";
|
import { render } from "../tests/test-utils";
|
||||||
|
|
||||||
describe("element locking", () => {
|
describe("element locking", () => {
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
@@ -81,20 +80,6 @@ describe("element locking", () => {
|
|||||||
const centerTextAlign = queryByTestId(document.body, `align-right`);
|
const centerTextAlign = queryByTestId(document.body, `align-right`);
|
||||||
expect(centerTextAlign).toBeChecked();
|
expect(centerTextAlign).toBeChecked();
|
||||||
});
|
});
|
||||||
|
|
||||||
it("should show the active freedraw stroke type", () => {
|
|
||||||
UI.clickTool("freedraw");
|
|
||||||
|
|
||||||
API.setAppState({
|
|
||||||
currentItemStrokeShape: "fixed",
|
|
||||||
});
|
|
||||||
|
|
||||||
const fixedStrokeShape = queryByTestId(
|
|
||||||
document.body,
|
|
||||||
"strokeShape-fixed",
|
|
||||||
);
|
|
||||||
expect(fixedStrokeShape).toBeChecked();
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("properties when elements selected", () => {
|
describe("properties when elements selected", () => {
|
||||||
@@ -159,9 +144,6 @@ describe("element locking", () => {
|
|||||||
expect(
|
expect(
|
||||||
queryByTestId(document.body, `strokeWidth-thin`),
|
queryByTestId(document.body, `strokeWidth-thin`),
|
||||||
).not.toBeChecked();
|
).not.toBeChecked();
|
||||||
expect(
|
|
||||||
queryByTestId(document.body, `strokeWidth-medium`),
|
|
||||||
).not.toBeChecked();
|
|
||||||
expect(
|
expect(
|
||||||
queryByTestId(document.body, `strokeWidth-bold`),
|
queryByTestId(document.body, `strokeWidth-bold`),
|
||||||
).not.toBeChecked();
|
).not.toBeChecked();
|
||||||
@@ -177,7 +159,6 @@ describe("element locking", () => {
|
|||||||
});
|
});
|
||||||
const text = API.createElement({
|
const text = API.createElement({
|
||||||
type: "text",
|
type: "text",
|
||||||
strokeWidth: STROKE_WIDTH.bold,
|
|
||||||
fontFamily: FONT_FAMILY["Comic Shanns"],
|
fontFamily: FONT_FAMILY["Comic Shanns"],
|
||||||
});
|
});
|
||||||
API.setElements([rect, text]);
|
API.setElements([rect, text]);
|
||||||
@@ -188,35 +169,5 @@ describe("element locking", () => {
|
|||||||
"active",
|
"active",
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("should highlight the fixed freedraw stroke type for selected elements", () => {
|
|
||||||
const freedraw = API.createElement({
|
|
||||||
type: "freedraw",
|
|
||||||
strokeShape: "fixed",
|
|
||||||
points: [pointFrom(0, 0), pointFrom(10, 10), pointFrom(20, 15)],
|
|
||||||
});
|
|
||||||
API.setElements([freedraw]);
|
|
||||||
API.setSelectedElements([freedraw]);
|
|
||||||
|
|
||||||
const fixedStrokeShape = queryByTestId(
|
|
||||||
document.body,
|
|
||||||
"strokeShape-fixed",
|
|
||||||
);
|
|
||||||
expect(fixedStrokeShape).toBeChecked();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should apply fixed freedraw stroke type to newly drawn strokes", () => {
|
|
||||||
UI.clickTool("freedraw");
|
|
||||||
|
|
||||||
act(() => {
|
|
||||||
queryByTestId(document.body, "strokeShape-fixed")?.click();
|
|
||||||
});
|
|
||||||
|
|
||||||
const freedraw = UI.createElement("freedraw", {
|
|
||||||
points: [pointFrom(0, 0), pointFrom(10, 10), pointFrom(20, 15)],
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(freedraw.strokeShape).toBe("fixed");
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { pointFrom } from "@excalidraw/math";
|
|||||||
import { useEffect, useMemo, useRef, useState } from "react";
|
import { useEffect, useMemo, useRef, useState } from "react";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
DEFAULT_FREE_DRAW_STROKE_SHAPE,
|
|
||||||
DEFAULT_ELEMENT_BACKGROUND_COLOR_PALETTE,
|
DEFAULT_ELEMENT_BACKGROUND_COLOR_PALETTE,
|
||||||
DEFAULT_ELEMENT_BACKGROUND_PICKS,
|
DEFAULT_ELEMENT_BACKGROUND_PICKS,
|
||||||
DEFAULT_ELEMENT_STROKE_COLOR_PALETTE,
|
DEFAULT_ELEMENT_STROKE_COLOR_PALETTE,
|
||||||
@@ -37,7 +36,6 @@ import {
|
|||||||
import { LinearElementEditor } from "@excalidraw/element";
|
import { LinearElementEditor } from "@excalidraw/element";
|
||||||
|
|
||||||
import { newElementWith } from "@excalidraw/element";
|
import { newElementWith } from "@excalidraw/element";
|
||||||
import { newFreeDrawElementWithStrokeShape } from "@excalidraw/element";
|
|
||||||
import { getArrowheadForPicker } from "@excalidraw/element";
|
import { getArrowheadForPicker } from "@excalidraw/element";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@@ -49,7 +47,6 @@ import {
|
|||||||
isArrowElement,
|
isArrowElement,
|
||||||
isBoundToContainer,
|
isBoundToContainer,
|
||||||
isElbowArrow,
|
isElbowArrow,
|
||||||
isFreeDrawElement,
|
|
||||||
isLinearElement,
|
isLinearElement,
|
||||||
isLineElement,
|
isLineElement,
|
||||||
isTextElement,
|
isTextElement,
|
||||||
@@ -73,7 +70,6 @@ import type {
|
|||||||
ElementsMap,
|
ElementsMap,
|
||||||
ExcalidrawBindableElement,
|
ExcalidrawBindableElement,
|
||||||
ExcalidrawElement,
|
ExcalidrawElement,
|
||||||
ExcalidrawFreeDrawElement,
|
|
||||||
ExcalidrawLinearElement,
|
ExcalidrawLinearElement,
|
||||||
ExcalidrawTextElement,
|
ExcalidrawTextElement,
|
||||||
FontFamilyValues,
|
FontFamilyValues,
|
||||||
@@ -109,11 +105,8 @@ import {
|
|||||||
SloppinessArtistIcon,
|
SloppinessArtistIcon,
|
||||||
SloppinessCartoonistIcon,
|
SloppinessCartoonistIcon,
|
||||||
StrokeWidthBaseIcon,
|
StrokeWidthBaseIcon,
|
||||||
StrokeWidthMediumIcon,
|
|
||||||
StrokeWidthBoldIcon,
|
StrokeWidthBoldIcon,
|
||||||
StrokeWidthExtraBoldIcon,
|
StrokeWidthExtraBoldIcon,
|
||||||
StrokeShapeFixedIcon,
|
|
||||||
StrokeShapeVariableIcon,
|
|
||||||
FontSizeSmallIcon,
|
FontSizeSmallIcon,
|
||||||
FontSizeMediumIcon,
|
FontSizeMediumIcon,
|
||||||
FontSizeLargeIcon,
|
FontSizeLargeIcon,
|
||||||
@@ -194,29 +187,6 @@ export const changeProperty = (
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
const getFreeDrawStrokeShape = (item: {
|
|
||||||
strokeShape?: ExcalidrawFreeDrawElement["strokeShape"];
|
|
||||||
currentItemStrokeShape?: AppState["currentItemStrokeShape"];
|
|
||||||
}) =>
|
|
||||||
item.strokeShape ??
|
|
||||||
item.currentItemStrokeShape ??
|
|
||||||
DEFAULT_FREE_DRAW_STROKE_SHAPE;
|
|
||||||
|
|
||||||
const getAppStateWithCurrentItemStrokeShape = (
|
|
||||||
appState: AppState,
|
|
||||||
strokeShape: NonNullable<ExcalidrawFreeDrawElement["strokeShape"]>,
|
|
||||||
) => {
|
|
||||||
// if (strokeShape === DEFAULT_FREE_DRAW_STROKE_SHAPE) {
|
|
||||||
// const { currentItemStrokeShape, ...nextAppState } = appState;
|
|
||||||
// return nextAppState;
|
|
||||||
// }
|
|
||||||
|
|
||||||
return {
|
|
||||||
...appState,
|
|
||||||
currentItemStrokeShape: strokeShape,
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
export const getFormValue = function <T extends Primitive>(
|
export const getFormValue = function <T extends Primitive>(
|
||||||
elements: readonly ExcalidrawElement[],
|
elements: readonly ExcalidrawElement[],
|
||||||
app: AppClassProperties,
|
app: AppClassProperties,
|
||||||
@@ -604,12 +574,6 @@ export const actionChangeStrokeWidth = register<
|
|||||||
icon: StrokeWidthBaseIcon,
|
icon: StrokeWidthBaseIcon,
|
||||||
testId: "strokeWidth-thin",
|
testId: "strokeWidth-thin",
|
||||||
},
|
},
|
||||||
{
|
|
||||||
value: STROKE_WIDTH.medium,
|
|
||||||
text: t("labels.medium"),
|
|
||||||
icon: StrokeWidthMediumIcon,
|
|
||||||
testId: "strokeWidth-medium",
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
value: STROKE_WIDTH.bold,
|
value: STROKE_WIDTH.bold,
|
||||||
text: t("labels.bold"),
|
text: t("labels.bold"),
|
||||||
@@ -638,60 +602,6 @@ export const actionChangeStrokeWidth = register<
|
|||||||
),
|
),
|
||||||
});
|
});
|
||||||
|
|
||||||
export const actionChangeStrokeShape = register<
|
|
||||||
NonNullable<ExcalidrawFreeDrawElement["strokeShape"]>
|
|
||||||
>({
|
|
||||||
name: "changeStrokeShape",
|
|
||||||
label: "labels.strokeShape",
|
|
||||||
trackEvent: false,
|
|
||||||
perform: (elements, appState, value) => {
|
|
||||||
invariant(value, "actionChangeStrokeShape: value must be defined");
|
|
||||||
return {
|
|
||||||
elements: changeProperty(elements, appState, (el) =>
|
|
||||||
isFreeDrawElement(el)
|
|
||||||
? newFreeDrawElementWithStrokeShape(el, value)
|
|
||||||
: el,
|
|
||||||
),
|
|
||||||
appState: getAppStateWithCurrentItemStrokeShape(appState, value),
|
|
||||||
captureUpdate: CaptureUpdateAction.IMMEDIATELY,
|
|
||||||
};
|
|
||||||
},
|
|
||||||
PanelComponent: ({ elements, appState, updateData, app }) => (
|
|
||||||
<fieldset>
|
|
||||||
<legend>{t("labels.strokeShape")}</legend>
|
|
||||||
<div className="buttonList">
|
|
||||||
<RadioSelection
|
|
||||||
group="stroke-shape"
|
|
||||||
options={[
|
|
||||||
{
|
|
||||||
value: "variable",
|
|
||||||
text: t("labels.strokeShape_variable"),
|
|
||||||
icon: StrokeShapeVariableIcon,
|
|
||||||
testId: "strokeShape-variable",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: "fixed",
|
|
||||||
text: t("labels.strokeShape_fixed"),
|
|
||||||
icon: StrokeShapeFixedIcon,
|
|
||||||
testId: "strokeShape-fixed",
|
|
||||||
},
|
|
||||||
]}
|
|
||||||
value={getFormValue(
|
|
||||||
elements,
|
|
||||||
app,
|
|
||||||
(element) =>
|
|
||||||
getFreeDrawStrokeShape(element as ExcalidrawFreeDrawElement),
|
|
||||||
isFreeDrawElement,
|
|
||||||
(hasSelection) =>
|
|
||||||
hasSelection ? null : getFreeDrawStrokeShape(appState),
|
|
||||||
)}
|
|
||||||
onChange={(value) => updateData(value)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</fieldset>
|
|
||||||
),
|
|
||||||
});
|
|
||||||
|
|
||||||
export const actionChangeSloppiness = register<ExcalidrawElement["roughness"]>({
|
export const actionChangeSloppiness = register<ExcalidrawElement["roughness"]>({
|
||||||
name: "changeSloppiness",
|
name: "changeSloppiness",
|
||||||
label: "labels.sloppiness",
|
label: "labels.sloppiness",
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import {
|
import {
|
||||||
DEFAULT_FREE_DRAW_STROKE_SHAPE,
|
|
||||||
DEFAULT_FONT_SIZE,
|
DEFAULT_FONT_SIZE,
|
||||||
DEFAULT_FONT_FAMILY,
|
DEFAULT_FONT_FAMILY,
|
||||||
DEFAULT_TEXT_ALIGN,
|
DEFAULT_TEXT_ALIGN,
|
||||||
@@ -11,7 +10,6 @@ import {
|
|||||||
import { newElementWith } from "@excalidraw/element";
|
import { newElementWith } from "@excalidraw/element";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
isFreeDrawElement,
|
|
||||||
hasBoundTextElement,
|
hasBoundTextElement,
|
||||||
canApplyRoundnessTypeToElement,
|
canApplyRoundnessTypeToElement,
|
||||||
getDefaultRoundnessTypeForElement,
|
getDefaultRoundnessTypeForElement,
|
||||||
@@ -20,7 +18,6 @@ import {
|
|||||||
isExcalidrawElement,
|
isExcalidrawElement,
|
||||||
isTextElement,
|
isTextElement,
|
||||||
} from "@excalidraw/element";
|
} from "@excalidraw/element";
|
||||||
import { newFreeDrawElementWithStrokeShape } from "@excalidraw/element";
|
|
||||||
|
|
||||||
import {
|
import {
|
||||||
getBoundTextElement,
|
getBoundTextElement,
|
||||||
@@ -157,17 +154,6 @@ export const actionPasteStyles = register({
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (
|
|
||||||
isFreeDrawElement(newElement) &&
|
|
||||||
isFreeDrawElement(elementStylesToCopyFrom)
|
|
||||||
) {
|
|
||||||
newElement = newFreeDrawElementWithStrokeShape(
|
|
||||||
newElement,
|
|
||||||
elementStylesToCopyFrom.strokeShape ??
|
|
||||||
DEFAULT_FREE_DRAW_STROKE_SHAPE,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isFrameLikeElement(element)) {
|
if (isFrameLikeElement(element)) {
|
||||||
newElement = newElementWith(newElement, {
|
newElement = newElementWith(newElement, {
|
||||||
roundness: null,
|
roundness: null,
|
||||||
|
|||||||
@@ -99,7 +99,6 @@ export const getDefaultAppState = (): Omit<
|
|||||||
open: false,
|
open: false,
|
||||||
panels: STATS_PANELS.generalStats | STATS_PANELS.elementProperties,
|
panels: STATS_PANELS.generalStats | STATS_PANELS.elementProperties,
|
||||||
},
|
},
|
||||||
startBoundElement: null,
|
|
||||||
suggestedBinding: null,
|
suggestedBinding: null,
|
||||||
frameRendering: { enabled: true, clip: true, name: true, outline: true },
|
frameRendering: { enabled: true, clip: true, name: true, outline: true },
|
||||||
frameToHighlight: null,
|
frameToHighlight: null,
|
||||||
@@ -172,7 +171,6 @@ const APP_STATE_STORAGE_CONF = (<
|
|||||||
currentItemStrokeColor: { browser: true, export: false, server: false },
|
currentItemStrokeColor: { browser: true, export: false, server: false },
|
||||||
currentItemStrokeStyle: { browser: true, export: false, server: false },
|
currentItemStrokeStyle: { browser: true, export: false, server: false },
|
||||||
currentItemStrokeWidth: { browser: true, export: false, server: false },
|
currentItemStrokeWidth: { browser: true, export: false, server: false },
|
||||||
currentItemStrokeShape: { browser: true, export: false, server: false },
|
|
||||||
currentItemTextAlign: { browser: true, export: false, server: false },
|
currentItemTextAlign: { browser: true, export: false, server: false },
|
||||||
currentHoveredFontFamily: { browser: false, export: false, server: false },
|
currentHoveredFontFamily: { browser: false, export: false, server: false },
|
||||||
cursorButton: { browser: true, export: false, server: false },
|
cursorButton: { browser: true, export: false, server: false },
|
||||||
@@ -232,7 +230,6 @@ const APP_STATE_STORAGE_CONF = (<
|
|||||||
selectionElement: { browser: false, export: false, server: false },
|
selectionElement: { browser: false, export: false, server: false },
|
||||||
shouldCacheIgnoreZoom: { browser: true, export: false, server: false },
|
shouldCacheIgnoreZoom: { browser: true, export: false, server: false },
|
||||||
stats: { browser: true, export: false, server: false },
|
stats: { browser: true, export: false, server: false },
|
||||||
startBoundElement: { browser: false, export: false, server: false },
|
|
||||||
suggestedBinding: { browser: false, export: false, server: false },
|
suggestedBinding: { browser: false, export: false, server: false },
|
||||||
frameRendering: { browser: false, export: false, server: false },
|
frameRendering: { browser: false, export: false, server: false },
|
||||||
frameToHighlight: { browser: false, export: false, server: false },
|
frameToHighlight: { browser: false, export: false, server: false },
|
||||||
|
|||||||
@@ -394,11 +394,6 @@ const CombinedShapeProperties = ({
|
|||||||
hasStrokeWidth(element.type),
|
hasStrokeWidth(element.type),
|
||||||
)) &&
|
)) &&
|
||||||
renderAction("changeStrokeWidth")}
|
renderAction("changeStrokeWidth")}
|
||||||
{(appState.activeTool.type === "freedraw" ||
|
|
||||||
targetElements.some(
|
|
||||||
(element) => element.type === "freedraw",
|
|
||||||
)) &&
|
|
||||||
renderAction("changeStrokeShape")}
|
|
||||||
{(hasStrokeStyle(appState.activeTool.type) ||
|
{(hasStrokeStyle(appState.activeTool.type) ||
|
||||||
targetElements.some((element) =>
|
targetElements.some((element) =>
|
||||||
hasStrokeStyle(element.type),
|
hasStrokeStyle(element.type),
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ import {
|
|||||||
clamp,
|
clamp,
|
||||||
pointFrom,
|
pointFrom,
|
||||||
pointDistance,
|
pointDistance,
|
||||||
round,
|
|
||||||
vector,
|
vector,
|
||||||
pointRotateRads,
|
pointRotateRads,
|
||||||
vectorFromPoint,
|
vectorFromPoint,
|
||||||
@@ -120,7 +119,6 @@ import {
|
|||||||
getElementAbsoluteCoords,
|
getElementAbsoluteCoords,
|
||||||
bindOrUnbindBindingElements,
|
bindOrUnbindBindingElements,
|
||||||
fixBindingsAfterDeletion,
|
fixBindingsAfterDeletion,
|
||||||
getFixedFreeDrawPointAction,
|
|
||||||
getHoveredElementForBinding,
|
getHoveredElementForBinding,
|
||||||
isBindingEnabled,
|
isBindingEnabled,
|
||||||
updateBoundElements,
|
updateBoundElements,
|
||||||
@@ -605,6 +603,8 @@ const YOUTUBE_VIDEO_STATES = new Map<
|
|||||||
ValueOf<typeof YOUTUBE_STATES>
|
ValueOf<typeof YOUTUBE_STATES>
|
||||||
>();
|
>();
|
||||||
|
|
||||||
|
const MAX_EMBEDDABLE_VIEWPORT_SCALE = 4;
|
||||||
|
|
||||||
let IS_PLAIN_PASTE = false;
|
let IS_PLAIN_PASTE = false;
|
||||||
let IS_PLAIN_PASTE_TIMER = 0;
|
let IS_PLAIN_PASTE_TIMER = 0;
|
||||||
let PLAIN_PASTE_TOAST_SHOWN = false;
|
let PLAIN_PASTE_TOAST_SHOWN = false;
|
||||||
@@ -617,19 +617,6 @@ const gesture: Gesture = {
|
|||||||
initialScale: null,
|
initialScale: null,
|
||||||
};
|
};
|
||||||
|
|
||||||
const FREEDRAW_POINT_DECIMALS = 2;
|
|
||||||
const FREEDRAW_PRESSURE_DECIMALS = 3;
|
|
||||||
const FREEDRAW_DOT_EPSILON = 1 / 10 ** FREEDRAW_POINT_DECIMALS;
|
|
||||||
|
|
||||||
const roundFreeDrawCoordinate = (value: number) =>
|
|
||||||
round(value, FREEDRAW_POINT_DECIMALS);
|
|
||||||
|
|
||||||
const roundFreeDrawPressure = (value: number) =>
|
|
||||||
round(value, FREEDRAW_PRESSURE_DECIMALS);
|
|
||||||
|
|
||||||
const getRoundedFreeDrawPoint = (x: number, y: number) =>
|
|
||||||
pointFrom<LocalPoint>(roundFreeDrawCoordinate(x), roundFreeDrawCoordinate(y));
|
|
||||||
|
|
||||||
class App extends React.Component<AppProps, AppState> {
|
class App extends React.Component<AppProps, AppState> {
|
||||||
canvas: AppClassProperties["canvas"];
|
canvas: AppClassProperties["canvas"];
|
||||||
interactiveCanvas: AppClassProperties["interactiveCanvas"] = null;
|
interactiveCanvas: AppClassProperties["interactiveCanvas"] = null;
|
||||||
@@ -1750,6 +1737,18 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
this.state.activeEmbeddable?.element === el &&
|
this.state.activeEmbeddable?.element === el &&
|
||||||
this.state.activeEmbeddable?.state === "hover";
|
this.state.activeEmbeddable?.state === "hover";
|
||||||
|
|
||||||
|
// scale video embeds based on zoom (capped) so that smaller embeds
|
||||||
|
// on canvas when zoomed are still of legible quality
|
||||||
|
// (note: for some embed types like gdrive, the quality is poor when
|
||||||
|
// scaling mid playback and works only when you initially start the
|
||||||
|
// playback at the higher zoom level)
|
||||||
|
const shouldScaleEmbeddableViewport = src?.type === "video";
|
||||||
|
const embeddableViewportScale = clamp(
|
||||||
|
shouldScaleEmbeddableViewport ? scale : 1,
|
||||||
|
0.75,
|
||||||
|
MAX_EMBEDDABLE_VIEWPORT_SCALE,
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
key={el.id}
|
key={el.id}
|
||||||
@@ -1816,31 +1815,42 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
padding: `${el.strokeWidth}px`,
|
padding: `${el.strokeWidth}px`,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{(isEmbeddableElement(el)
|
<div
|
||||||
? this.props.renderEmbeddable?.(el, this.state)
|
className="excalidraw__embeddable__content"
|
||||||
: null) ?? (
|
style={{
|
||||||
<iframe
|
width: `${embeddableViewportScale * 100}%`,
|
||||||
ref={(ref) => this.cacheEmbeddableRef(el, ref)}
|
height: `${embeddableViewportScale * 100}%`,
|
||||||
className="excalidraw__embeddable"
|
transform: `scale(${1 / embeddableViewportScale})`,
|
||||||
srcDoc={
|
}}
|
||||||
src?.type === "document"
|
>
|
||||||
? src.srcdoc(this.state.theme)
|
{(isEmbeddableElement(el)
|
||||||
: undefined
|
? this.props.renderEmbeddable?.(el, this.state)
|
||||||
}
|
: null) ?? (
|
||||||
src={
|
<iframe
|
||||||
src?.type !== "document" ? src?.link ?? "" : undefined
|
ref={(ref) => this.cacheEmbeddableRef(el, ref)}
|
||||||
}
|
className="excalidraw__embeddable"
|
||||||
// https://stackoverflow.com/q/18470015
|
srcDoc={
|
||||||
scrolling="no"
|
src?.type === "document"
|
||||||
referrerPolicy="no-referrer-when-downgrade"
|
? src.srcdoc(this.state.theme)
|
||||||
title="Excalidraw Embedded Content"
|
: undefined
|
||||||
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
|
}
|
||||||
allowFullScreen={true}
|
src={
|
||||||
sandbox={`${
|
src?.type !== "document" ? src?.link ?? "" : undefined
|
||||||
src?.sandbox?.allowSameOrigin ? "allow-same-origin" : ""
|
}
|
||||||
} allow-scripts allow-forms allow-popups allow-popups-to-escape-sandbox allow-presentation allow-downloads`}
|
// https://stackoverflow.com/q/18470015
|
||||||
/>
|
scrolling="no"
|
||||||
)}
|
referrerPolicy="no-referrer-when-downgrade"
|
||||||
|
title="Excalidraw Embedded Content"
|
||||||
|
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
|
||||||
|
allowFullScreen={true}
|
||||||
|
sandbox={`${
|
||||||
|
src?.sandbox?.allowSameOrigin
|
||||||
|
? "allow-same-origin"
|
||||||
|
: ""
|
||||||
|
} allow-scripts allow-forms allow-popups allow-popups-to-escape-sandbox allow-presentation allow-downloads`}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -6937,7 +6947,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
y: scenePointerY,
|
y: scenePointerY,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
this.setState({ suggestedBinding: null, startBoundElement: null });
|
this.setState({ suggestedBinding: null });
|
||||||
if (!this.state.activeTool.locked) {
|
if (!this.state.activeTool.locked) {
|
||||||
resetCursor(this.interactiveCanvas);
|
resetCursor(this.interactiveCanvas);
|
||||||
this.setState((prevState) => ({
|
this.setState((prevState) => ({
|
||||||
@@ -7581,7 +7591,6 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
appState: {
|
appState: {
|
||||||
newElement: null,
|
newElement: null,
|
||||||
editingTextElement: null,
|
editingTextElement: null,
|
||||||
startBoundElement: null,
|
|
||||||
suggestedBinding: null,
|
suggestedBinding: null,
|
||||||
selectedElementIds: makeNextSelectedElementIds(
|
selectedElementIds: makeNextSelectedElementIds(
|
||||||
Object.keys(this.state.selectedElementIds)
|
Object.keys(this.state.selectedElementIds)
|
||||||
@@ -8095,7 +8104,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
|
|
||||||
setCursor(this.interactiveCanvas, CURSOR_TYPE.GRABBING);
|
setCursor(this.interactiveCanvas, CURSOR_TYPE.GRABBING);
|
||||||
let { clientX: lastX, clientY: lastY } = event;
|
let { clientX: lastX, clientY: lastY } = event;
|
||||||
const onPointerMove = ((event: PointerEvent) => {
|
const onPointerMove = withBatchedUpdatesThrottled((event: PointerEvent) => {
|
||||||
const deltaX = lastX - event.clientX;
|
const deltaX = lastX - event.clientX;
|
||||||
const deltaY = lastY - event.clientY;
|
const deltaY = lastY - event.clientY;
|
||||||
lastX = event.clientX;
|
lastX = event.clientX;
|
||||||
@@ -8161,7 +8170,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
window.removeEventListener(EVENT.POINTER_MOVE, onPointerMove);
|
window.removeEventListener(EVENT.POINTER_MOVE, onPointerMove);
|
||||||
window.removeEventListener(EVENT.POINTER_UP, teardown);
|
window.removeEventListener(EVENT.POINTER_UP, teardown);
|
||||||
window.removeEventListener(EVENT.BLUR, teardown);
|
window.removeEventListener(EVENT.BLUR, teardown);
|
||||||
// onPointerMove.flush();
|
onPointerMove.flush();
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
window.addEventListener(EVENT.BLUR, teardown);
|
window.addEventListener(EVENT.BLUR, teardown);
|
||||||
@@ -8271,14 +8280,14 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
isDraggingScrollBar = true;
|
isDraggingScrollBar = true;
|
||||||
pointerDownState.lastCoords.x = event.clientX;
|
pointerDownState.lastCoords.x = event.clientX;
|
||||||
pointerDownState.lastCoords.y = event.clientY;
|
pointerDownState.lastCoords.y = event.clientY;
|
||||||
const onPointerMove = (event: PointerEvent) => {
|
const onPointerMove = withBatchedUpdatesThrottled((event: PointerEvent) => {
|
||||||
const target = event.target;
|
const target = event.target;
|
||||||
if (!(target instanceof HTMLElement)) {
|
if (!(target instanceof HTMLElement)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.handlePointerMoveOverScrollbars(event, pointerDownState);
|
this.handlePointerMoveOverScrollbars(event, pointerDownState);
|
||||||
};
|
});
|
||||||
const onPointerUp = withBatchedUpdates(() => {
|
const onPointerUp = withBatchedUpdates(() => {
|
||||||
lastPointerUp = null;
|
lastPointerUp = null;
|
||||||
isDraggingScrollBar = false;
|
isDraggingScrollBar = false;
|
||||||
@@ -8289,7 +8298,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
this.savePointer(event.clientX, event.clientY, "up");
|
this.savePointer(event.clientX, event.clientY, "up");
|
||||||
window.removeEventListener(EVENT.POINTER_MOVE, onPointerMove);
|
window.removeEventListener(EVENT.POINTER_MOVE, onPointerMove);
|
||||||
window.removeEventListener(EVENT.POINTER_UP, onPointerUp);
|
window.removeEventListener(EVENT.POINTER_UP, onPointerUp);
|
||||||
// onPointerMove.flush();
|
onPointerMove.flush();
|
||||||
});
|
});
|
||||||
|
|
||||||
lastPointerUp = onPointerUp;
|
lastPointerUp = onPointerUp;
|
||||||
@@ -8848,13 +8857,10 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
opacity: this.state.currentItemOpacity,
|
opacity: this.state.currentItemOpacity,
|
||||||
roundness: null,
|
roundness: null,
|
||||||
simulatePressure,
|
simulatePressure,
|
||||||
strokeShape: this.state.currentItemStrokeShape,
|
|
||||||
locked: false,
|
locked: false,
|
||||||
frameId: topLayerFrame ? topLayerFrame.id : null,
|
frameId: topLayerFrame ? topLayerFrame.id : null,
|
||||||
points: [pointFrom<LocalPoint>(0, 0)],
|
points: [pointFrom<LocalPoint>(0, 0)],
|
||||||
pressures: simulatePressure
|
pressures: simulatePressure ? [] : [event.pressure],
|
||||||
? []
|
|
||||||
: [roundFreeDrawPressure(event.pressure)],
|
|
||||||
});
|
});
|
||||||
|
|
||||||
this.scene.insertElement(element);
|
this.scene.insertElement(element);
|
||||||
@@ -8872,18 +8878,8 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
const boundElement = getHoveredElementForBinding(
|
|
||||||
pointFrom<GlobalPoint>(
|
|
||||||
pointerDownState.origin.x,
|
|
||||||
pointerDownState.origin.y,
|
|
||||||
),
|
|
||||||
this.scene.getNonDeletedElements(),
|
|
||||||
this.scene.getNonDeletedElementsMap(),
|
|
||||||
);
|
|
||||||
|
|
||||||
this.setState({
|
this.setState({
|
||||||
newElement: element,
|
newElement: element,
|
||||||
startBoundElement: boundElement,
|
|
||||||
suggestedBinding: null,
|
suggestedBinding: null,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
@@ -9496,7 +9492,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
private onPointerMoveFromPointerDownHandler(
|
private onPointerMoveFromPointerDownHandler(
|
||||||
pointerDownState: PointerDownState,
|
pointerDownState: PointerDownState,
|
||||||
) {
|
) {
|
||||||
return (event: PointerEvent) => {
|
return withBatchedUpdatesThrottled((event: PointerEvent) => {
|
||||||
if (this.state.openDialog?.name === "elementLinkSelector") {
|
if (this.state.openDialog?.name === "elementLinkSelector") {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -10192,36 +10188,20 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
const points = newElement.points;
|
const points = newElement.points;
|
||||||
const dx = pointerCoords.x - newElement.x;
|
const dx = pointerCoords.x - newElement.x;
|
||||||
const dy = pointerCoords.y - newElement.y;
|
const dy = pointerCoords.y - newElement.y;
|
||||||
const nextPoint = getRoundedFreeDrawPoint(dx, dy);
|
|
||||||
const pressure = roundFreeDrawPressure(event.pressure);
|
|
||||||
const pointAction =
|
|
||||||
newElement.strokeShape === "fixed"
|
|
||||||
? getFixedFreeDrawPointAction({
|
|
||||||
points,
|
|
||||||
nextPoint,
|
|
||||||
strokeWidth: newElement.strokeWidth,
|
|
||||||
zoomValue: this.state.zoom.value,
|
|
||||||
})
|
|
||||||
: points.length > 0 &&
|
|
||||||
points[points.length - 1][0] === nextPoint[0] &&
|
|
||||||
points[points.length - 1][1] === nextPoint[1]
|
|
||||||
? "discard"
|
|
||||||
: "append";
|
|
||||||
|
|
||||||
if (pointAction !== "discard") {
|
const lastPoint = points.length > 0 && points[points.length - 1];
|
||||||
|
const discardPoint =
|
||||||
|
lastPoint && lastPoint[0] === dx && lastPoint[1] === dy;
|
||||||
|
|
||||||
|
if (!discardPoint) {
|
||||||
const pressures = newElement.simulatePressure
|
const pressures = newElement.simulatePressure
|
||||||
? newElement.pressures
|
? newElement.pressures
|
||||||
: pointAction === "replace"
|
: [...newElement.pressures, event.pressure];
|
||||||
? [...newElement.pressures.slice(0, -1), pressure]
|
|
||||||
: [...newElement.pressures, pressure];
|
|
||||||
|
|
||||||
this.scene.mutateElement(
|
this.scene.mutateElement(
|
||||||
newElement,
|
newElement,
|
||||||
{
|
{
|
||||||
points:
|
points: [...points, pointFrom<LocalPoint>(dx, dy)],
|
||||||
pointAction === "replace"
|
|
||||||
? [...points.slice(0, -1), nextPoint]
|
|
||||||
: [...points, nextPoint],
|
|
||||||
pressures,
|
pressures,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -10379,7 +10359,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns whether the pointer move happened over either scrollbar
|
// Returns whether the pointer move happened over either scrollbar
|
||||||
@@ -10424,7 +10404,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
this.removePointer(childEvent);
|
this.removePointer(childEvent);
|
||||||
pointerDownState.drag.blockDragging = false;
|
pointerDownState.drag.blockDragging = false;
|
||||||
if (pointerDownState.eventListeners.onMove) {
|
if (pointerDownState.eventListeners.onMove) {
|
||||||
// pointerDownState.eventListeners.onMove.flush();
|
pointerDownState.eventListeners.onMove.flush();
|
||||||
}
|
}
|
||||||
const {
|
const {
|
||||||
newElement,
|
newElement,
|
||||||
@@ -10661,48 +10641,23 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const points = newElement.points;
|
const points = newElement.points;
|
||||||
const dx = pointerCoords.x - newElement.x;
|
let dx = pointerCoords.x - newElement.x;
|
||||||
const dy = pointerCoords.y - newElement.y;
|
let dy = pointerCoords.y - newElement.y;
|
||||||
let nextPoint = getRoundedFreeDrawPoint(dx, dy);
|
|
||||||
|
|
||||||
// Allows dots to avoid being flagged as infinitely small
|
// Allows dots to avoid being flagged as infinitely small
|
||||||
if (nextPoint[0] === points[0][0] && nextPoint[1] === points[0][1]) {
|
if (dx === points[0][0] && dy === points[0][1]) {
|
||||||
nextPoint = getRoundedFreeDrawPoint(
|
dy += 0.0001;
|
||||||
dx + FREEDRAW_DOT_EPSILON,
|
dx += 0.0001;
|
||||||
dy + FREEDRAW_DOT_EPSILON,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const lastPoint = points[points.length - 1];
|
const pressures = newElement.simulatePressure
|
||||||
const pressure = roundFreeDrawPressure(childEvent.pressure);
|
? []
|
||||||
const pointAction =
|
: [...newElement.pressures, childEvent.pressure];
|
||||||
newElement.strokeShape === "fixed"
|
|
||||||
? getFixedFreeDrawPointAction({
|
|
||||||
points,
|
|
||||||
nextPoint,
|
|
||||||
strokeWidth: newElement.strokeWidth,
|
|
||||||
zoomValue: this.state.zoom.value,
|
|
||||||
isFinalPoint: true,
|
|
||||||
})
|
|
||||||
: !lastPoint ||
|
|
||||||
lastPoint[0] !== nextPoint[0] ||
|
|
||||||
lastPoint[1] !== nextPoint[1]
|
|
||||||
? "append"
|
|
||||||
: "discard";
|
|
||||||
|
|
||||||
if (pointAction !== "discard") {
|
this.scene.mutateElement(newElement, {
|
||||||
this.scene.mutateElement(newElement, {
|
points: [...points, pointFrom<LocalPoint>(dx, dy)],
|
||||||
points:
|
pressures,
|
||||||
pointAction === "replace"
|
});
|
||||||
? [...points.slice(0, -1), nextPoint]
|
|
||||||
: [...points, nextPoint],
|
|
||||||
pressures: newElement.simulatePressure
|
|
||||||
? []
|
|
||||||
: pointAction === "replace"
|
|
||||||
? [...newElement.pressures.slice(0, -1), pressure]
|
|
||||||
: [...newElement.pressures, pressure],
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
this.actionManager.executeAction(actionFinalize);
|
this.actionManager.executeAction(actionFinalize);
|
||||||
|
|
||||||
@@ -10777,7 +10732,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
sceneCoords,
|
sceneCoords,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
this.setState({ suggestedBinding: null, startBoundElement: null });
|
this.setState({ suggestedBinding: null });
|
||||||
if (!activeTool.locked) {
|
if (!activeTool.locked) {
|
||||||
resetCursor(this.interactiveCanvas);
|
resetCursor(this.interactiveCanvas);
|
||||||
this.setState((prevState) => ({
|
this.setState((prevState) => ({
|
||||||
@@ -10798,9 +10753,9 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
),
|
),
|
||||||
}));
|
}));
|
||||||
} else {
|
} else {
|
||||||
this.setState((prevState) => ({
|
this.setState({
|
||||||
newElement: null,
|
newElement: null,
|
||||||
}));
|
});
|
||||||
}
|
}
|
||||||
// so that the scene gets rendered again to display the newly drawn linear as well
|
// so that the scene gets rendered again to display the newly drawn linear as well
|
||||||
this.scene.triggerUpdate();
|
this.scene.triggerUpdate();
|
||||||
|
|||||||
@@ -650,8 +650,7 @@ const LayerUI = ({
|
|||||||
};
|
};
|
||||||
|
|
||||||
const stripIrrelevantAppStateProps = (appState: AppState): UIAppState => {
|
const stripIrrelevantAppStateProps = (appState: AppState): UIAppState => {
|
||||||
const { startBoundElement, cursorButton, scrollX, scrollY, ...ret } =
|
const { cursorButton, scrollX, scrollY, ...ret } = appState;
|
||||||
appState;
|
|
||||||
return ret;
|
return ret;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1164,22 +1164,11 @@ export const StrokeWidthBaseIcon = createIcon(
|
|||||||
modifiedTablerIconProps,
|
modifiedTablerIconProps,
|
||||||
);
|
);
|
||||||
|
|
||||||
export const StrokeWidthMediumIcon = createIcon(
|
|
||||||
<path
|
|
||||||
d="M5 10h10"
|
|
||||||
stroke="currentColor"
|
|
||||||
strokeWidth="2.5"
|
|
||||||
strokeLinecap="round"
|
|
||||||
strokeLinejoin="round"
|
|
||||||
/>,
|
|
||||||
modifiedTablerIconProps,
|
|
||||||
);
|
|
||||||
|
|
||||||
export const StrokeWidthBoldIcon = createIcon(
|
export const StrokeWidthBoldIcon = createIcon(
|
||||||
<path
|
<path
|
||||||
d="M5 10h10"
|
d="M5 10h10"
|
||||||
stroke="currentColor"
|
stroke="currentColor"
|
||||||
strokeWidth="3.75"
|
strokeWidth="2.5"
|
||||||
strokeLinecap="round"
|
strokeLinecap="round"
|
||||||
strokeLinejoin="round"
|
strokeLinejoin="round"
|
||||||
/>,
|
/>,
|
||||||
@@ -1190,38 +1179,7 @@ export const StrokeWidthExtraBoldIcon = createIcon(
|
|||||||
<path
|
<path
|
||||||
d="M5 10h10"
|
d="M5 10h10"
|
||||||
stroke="currentColor"
|
stroke="currentColor"
|
||||||
strokeWidth="5"
|
strokeWidth="3.75"
|
||||||
strokeLinecap="round"
|
|
||||||
strokeLinejoin="round"
|
|
||||||
/>,
|
|
||||||
modifiedTablerIconProps,
|
|
||||||
);
|
|
||||||
|
|
||||||
export const StrokeShapeVariableIcon = createIcon(
|
|
||||||
<>
|
|
||||||
<path
|
|
||||||
d="M3.5 12.5c1.8-3.5 4.1-5.2 6.8-5.2 2.4 0 4.4 1.3 6.2 3.9"
|
|
||||||
stroke="currentColor"
|
|
||||||
strokeWidth="1.25"
|
|
||||||
strokeLinecap="round"
|
|
||||||
strokeLinejoin="round"
|
|
||||||
/>
|
|
||||||
<path
|
|
||||||
d="M7.75 10.8c1-.9 2-1.35 3.05-1.35 1.2 0 2.4.57 3.7 1.72"
|
|
||||||
stroke="currentColor"
|
|
||||||
strokeWidth="2.5"
|
|
||||||
strokeLinecap="round"
|
|
||||||
strokeLinejoin="round"
|
|
||||||
/>
|
|
||||||
</>,
|
|
||||||
modifiedTablerIconProps,
|
|
||||||
);
|
|
||||||
|
|
||||||
export const StrokeShapeFixedIcon = createIcon(
|
|
||||||
<path
|
|
||||||
d="M3.5 12h13"
|
|
||||||
stroke="currentColor"
|
|
||||||
strokeWidth="2.5"
|
|
||||||
strokeLinecap="round"
|
strokeLinecap="round"
|
||||||
strokeLinejoin="round"
|
strokeLinejoin="round"
|
||||||
/>,
|
/>,
|
||||||
|
|||||||
@@ -814,6 +814,14 @@ body.excalidraw-cursor-resize * {
|
|||||||
.excalidraw__embeddable__outer {
|
.excalidraw__embeddable__outer {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.excalidraw__embeddable__content {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
transform-origin: top left;
|
||||||
|
|
||||||
|
&,
|
||||||
& > * {
|
& > * {
|
||||||
border-radius: var(--embeddable-radius);
|
border-radius: var(--embeddable-radius);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -96,12 +96,7 @@ type RestoredAppState = Omit<
|
|||||||
"offsetTop" | "offsetLeft" | "width" | "height"
|
"offsetTop" | "offsetLeft" | "width" | "height"
|
||||||
>;
|
>;
|
||||||
|
|
||||||
const normalizeFreeDrawStrokeShape = (
|
const MAX_ARROW_PX = 75_000;
|
||||||
strokeShape: unknown,
|
|
||||||
): AppState["currentItemStrokeShape"] =>
|
|
||||||
strokeShape === "fixed" || strokeShape === "stable"
|
|
||||||
? "fixed"
|
|
||||||
: undefined;
|
|
||||||
|
|
||||||
export const AllowedExcalidrawActiveTools: Record<
|
export const AllowedExcalidrawActiveTools: Record<
|
||||||
AppState["activeTool"]["type"],
|
AppState["activeTool"]["type"],
|
||||||
@@ -419,12 +414,10 @@ export const restoreElement = (
|
|||||||
|
|
||||||
return element;
|
return element;
|
||||||
case "freedraw": {
|
case "freedraw": {
|
||||||
const strokeShape = normalizeFreeDrawStrokeShape(element.strokeShape);
|
|
||||||
return restoreElementWithProperties(element, {
|
return restoreElementWithProperties(element, {
|
||||||
points: element.points,
|
points: element.points,
|
||||||
simulatePressure: element.simulatePressure,
|
simulatePressure: element.simulatePressure,
|
||||||
pressures: element.pressures,
|
pressures: element.pressures,
|
||||||
...(strokeShape ? { strokeShape } : {}),
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
case "image":
|
case "image":
|
||||||
@@ -476,8 +469,8 @@ export const restoreElement = (
|
|||||||
element.endArrowhead === undefined
|
element.endArrowhead === undefined
|
||||||
? "arrow"
|
? "arrow"
|
||||||
: normalizeArrowhead(element.endArrowhead);
|
: normalizeArrowhead(element.endArrowhead);
|
||||||
const x: number | undefined = element.x;
|
const x = element.x as number | undefined;
|
||||||
const y: number | undefined = element.y;
|
const y = element.y as number | undefined;
|
||||||
const points: readonly LocalPoint[] | undefined = // migrate old arrow model to new one
|
const points: readonly LocalPoint[] | undefined = // migrate old arrow model to new one
|
||||||
!Array.isArray(element.points) || element.points.length < 2
|
!Array.isArray(element.points) || element.points.length < 2
|
||||||
? [pointFrom(0, 0), pointFrom(element.width, element.height)]
|
? [pointFrom(0, 0), pointFrom(element.width, element.height)]
|
||||||
@@ -502,8 +495,8 @@ export const restoreElement = (
|
|||||||
startArrowhead,
|
startArrowhead,
|
||||||
endArrowhead,
|
endArrowhead,
|
||||||
points,
|
points,
|
||||||
x,
|
x: x ?? 0,
|
||||||
y,
|
y: y ?? 0,
|
||||||
elbowed: (element as ExcalidrawArrowElement).elbowed,
|
elbowed: (element as ExcalidrawArrowElement).elbowed,
|
||||||
...getSizeFromPoints(points),
|
...getSizeFromPoints(points),
|
||||||
};
|
};
|
||||||
@@ -522,12 +515,44 @@ export const restoreElement = (
|
|||||||
})
|
})
|
||||||
: restoreElementWithProperties(element as ExcalidrawArrowElement, base);
|
: restoreElementWithProperties(element as ExcalidrawArrowElement, base);
|
||||||
|
|
||||||
return {
|
const normalizedRestoredElement = {
|
||||||
...restoredElement,
|
...restoredElement,
|
||||||
...LinearElementEditor.getNormalizeElementPointsAndCoords(
|
...LinearElementEditor.getNormalizeElementPointsAndCoords(
|
||||||
restoredElement,
|
restoredElement,
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Last resort fix for extremely large arrows
|
||||||
|
if (
|
||||||
|
normalizedRestoredElement.width > MAX_ARROW_PX ||
|
||||||
|
normalizedRestoredElement.height > MAX_ARROW_PX
|
||||||
|
) {
|
||||||
|
console.error(
|
||||||
|
`Removing extremely large arrow ${
|
||||||
|
normalizedRestoredElement.id
|
||||||
|
} (type: ${
|
||||||
|
isElbowArrow(normalizedRestoredElement) ? "elbow" : "simple"
|
||||||
|
}, width: ${normalizedRestoredElement.width}, height: ${
|
||||||
|
normalizedRestoredElement.height
|
||||||
|
}, x: ${normalizedRestoredElement.x}, y: ${
|
||||||
|
normalizedRestoredElement.y
|
||||||
|
})`,
|
||||||
|
);
|
||||||
|
return {
|
||||||
|
...normalizedRestoredElement,
|
||||||
|
x: 0,
|
||||||
|
y: 0,
|
||||||
|
width: 100,
|
||||||
|
height: 100,
|
||||||
|
points: [
|
||||||
|
pointFrom<LocalPoint>(0, 0),
|
||||||
|
pointFrom<LocalPoint>(100, 100),
|
||||||
|
],
|
||||||
|
isDeleted: true,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return normalizedRestoredElement;
|
||||||
}
|
}
|
||||||
|
|
||||||
// generic elements
|
// generic elements
|
||||||
@@ -675,6 +700,7 @@ export const restoreElements = <T extends ExcalidrawElement>(
|
|||||||
const existingElementsMap = existingElements
|
const existingElementsMap = existingElements
|
||||||
? arrayToMap(existingElements)
|
? arrayToMap(existingElements)
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
const restoredElements = syncInvalidIndices(
|
const restoredElements = syncInvalidIndices(
|
||||||
(targetElements || []).reduce((elements, element) => {
|
(targetElements || []).reduce((elements, element) => {
|
||||||
// filtering out selection, which is legacy, no longer kept in elements,
|
// filtering out selection, which is legacy, no longer kept in elements,
|
||||||
@@ -771,7 +797,7 @@ export const restoreElements = <T extends ExcalidrawElement>(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// NOTE (mtolmacs): Temporary fix for extremely large arrows
|
// NOTE (mtolmacs): Temporary fix for invalid/self-bound elbow arrows
|
||||||
// Need to iterate again so we have attached text nodes in elementsMap
|
// Need to iterate again so we have attached text nodes in elementsMap
|
||||||
return restoredElements.map((element) => {
|
return restoredElements.map((element) => {
|
||||||
if (
|
if (
|
||||||
@@ -953,16 +979,6 @@ export const restoreAppState = (
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
...nextAppState,
|
...nextAppState,
|
||||||
...(normalizeFreeDrawStrokeShape(
|
|
||||||
appState.currentItemStrokeShape ?? localAppState?.currentItemStrokeShape,
|
|
||||||
)
|
|
||||||
? {
|
|
||||||
currentItemStrokeShape: normalizeFreeDrawStrokeShape(
|
|
||||||
appState.currentItemStrokeShape ??
|
|
||||||
localAppState?.currentItemStrokeShape,
|
|
||||||
),
|
|
||||||
}
|
|
||||||
: {}),
|
|
||||||
cursorButton: localAppState?.cursorButton || "up",
|
cursorButton: localAppState?.cursorButton || "up",
|
||||||
// reset on fresh restore so as to hide the UI button if penMode not active
|
// reset on fresh restore so as to hide the UI button if penMode not active
|
||||||
penDetected:
|
penDetected:
|
||||||
|
|||||||
@@ -30,9 +30,6 @@
|
|||||||
"changeBackground": "Change background color",
|
"changeBackground": "Change background color",
|
||||||
"fill": "Fill",
|
"fill": "Fill",
|
||||||
"strokeWidth": "Stroke width",
|
"strokeWidth": "Stroke width",
|
||||||
"strokeShape": "Stroke type",
|
|
||||||
"strokeShape_variable": "Variable",
|
|
||||||
"strokeShape_fixed": "Fixed",
|
|
||||||
"strokeStyle": "Stroke style",
|
"strokeStyle": "Stroke style",
|
||||||
"strokeStyle_solid": "Solid",
|
"strokeStyle_solid": "Solid",
|
||||||
"strokeStyle_dashed": "Dashed",
|
"strokeStyle_dashed": "Dashed",
|
||||||
|
|||||||
@@ -11,10 +11,10 @@ export const withBatchedUpdates = <
|
|||||||
TFunction extends ((event: any) => void) | (() => void),
|
TFunction extends ((event: any) => void) | (() => void),
|
||||||
>(
|
>(
|
||||||
func: Parameters<TFunction>["length"] extends 0 | 1 ? TFunction : never,
|
func: Parameters<TFunction>["length"] extends 0 | 1 ? TFunction : never,
|
||||||
) => func;
|
) =>
|
||||||
// ((event) => {
|
((event) => {
|
||||||
// unstable_batchedUpdates(func as TFunction, event);
|
unstable_batchedUpdates(func as TFunction, event);
|
||||||
// }) as TFunction;
|
}) as TFunction;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* barches React state updates and throttles the calls to a single call per
|
* barches React state updates and throttles the calls to a single call per
|
||||||
|
|||||||
@@ -19,8 +19,6 @@ export const renderSnaps = (
|
|||||||
}
|
}
|
||||||
|
|
||||||
// in dark mode, we need to adjust the color to account for color inversion.
|
// in dark mode, we need to adjust the color to account for color inversion.
|
||||||
// Don't change if zen mode, because we draw only crosses, we want the
|
|
||||||
// colors to be more visible
|
|
||||||
const snapColor =
|
const snapColor =
|
||||||
appState.theme === THEME.LIGHT || appState.zenModeEnabled
|
appState.theme === THEME.LIGHT || appState.zenModeEnabled
|
||||||
? SNAP_COLOR_LIGHT
|
? SNAP_COLOR_LIGHT
|
||||||
|
|||||||
@@ -376,11 +376,6 @@ const renderElementToSvg = (
|
|||||||
}
|
}
|
||||||
case "freedraw": {
|
case "freedraw": {
|
||||||
const wrapper = svgRoot.ownerDocument.createElementNS(SVG_NS, "g");
|
const wrapper = svgRoot.ownerDocument.createElementNS(SVG_NS, "g");
|
||||||
const isFixedStroke = element.strokeShape === "fixed";
|
|
||||||
const strokeColor =
|
|
||||||
renderConfig.theme === THEME.DARK
|
|
||||||
? applyDarkModeFilter(element.strokeColor)
|
|
||||||
: element.strokeColor;
|
|
||||||
|
|
||||||
const shapes = ShapeCache.generateElementShape(element, renderConfig);
|
const shapes = ShapeCache.generateElementShape(element, renderConfig);
|
||||||
// always ordered as [background, stroke]
|
// always ordered as [background, stroke]
|
||||||
@@ -389,15 +384,12 @@ const renderElementToSvg = (
|
|||||||
// stroke (SVGPathString)
|
// stroke (SVGPathString)
|
||||||
|
|
||||||
const path = svgRoot.ownerDocument.createElementNS(SVG_NS, "path");
|
const path = svgRoot.ownerDocument.createElementNS(SVG_NS, "path");
|
||||||
if (isFixedStroke) {
|
path.setAttribute(
|
||||||
path.setAttribute("fill", "none");
|
"fill",
|
||||||
path.setAttribute("stroke", strokeColor);
|
renderConfig.theme === THEME.DARK
|
||||||
path.setAttribute("stroke-width", `${element.strokeWidth}`);
|
? applyDarkModeFilter(element.strokeColor)
|
||||||
path.setAttribute("stroke-linecap", "round");
|
: element.strokeColor,
|
||||||
path.setAttribute("stroke-linejoin", "round");
|
);
|
||||||
} else {
|
|
||||||
path.setAttribute("fill", strokeColor);
|
|
||||||
}
|
|
||||||
path.setAttribute("d", shape);
|
path.setAttribute("d", shape);
|
||||||
wrapper.appendChild(path);
|
wrapper.appendChild(path);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
+538
-84
@@ -39,6 +39,14 @@ import type {
|
|||||||
} from "./types";
|
} from "./types";
|
||||||
|
|
||||||
const SNAP_DISTANCE = 8;
|
const SNAP_DISTANCE = 8;
|
||||||
|
// Keep snap candidates with effectively identical offsets together. This needs
|
||||||
|
// to be wider than the 6-decimal rounding quantum to absorb JS floating-point
|
||||||
|
// noise around values like 4 and 4.000001.
|
||||||
|
const SNAP_OFFSET_TOLERANCE = 0.00001;
|
||||||
|
// Point snaps can come from both nearby and distant references within snap
|
||||||
|
// distance. If their visual distances have a large break, prefer the nearest
|
||||||
|
// cluster before comparing offsets.
|
||||||
|
const SNAP_REFERENCE_CLUSTER_BREAK_DISTANCE = 200;
|
||||||
|
|
||||||
// do not comput more gaps per axis than this limit
|
// do not comput more gaps per axis than this limit
|
||||||
// TODO increase or remove once we optimize
|
// TODO increase or remove once we optimize
|
||||||
@@ -49,16 +57,51 @@ export const getSnapDistance = (zoomValue: number) => {
|
|||||||
return SNAP_DISTANCE / zoomValue;
|
return SNAP_DISTANCE / zoomValue;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Keeps the cluster threshold visually stable across zoom levels.
|
||||||
|
*/
|
||||||
|
const getSnapReferenceClusterBreakDistance = (zoomValue: number) => {
|
||||||
|
return SNAP_REFERENCE_CLUSTER_BREAK_DISTANCE / zoomValue;
|
||||||
|
};
|
||||||
|
|
||||||
type Vector2D = {
|
type Vector2D = {
|
||||||
x: number;
|
x: number;
|
||||||
y: number;
|
y: number;
|
||||||
};
|
};
|
||||||
|
|
||||||
type PointPair = [GlobalPoint, GlobalPoint];
|
type PointPair = [GlobalPoint, GlobalPoint];
|
||||||
|
type SnapPointType = "outer" | "center";
|
||||||
|
type SnapSourceId = string;
|
||||||
|
|
||||||
|
const SELECTION_SNAP_SOURCE_ID = "selection";
|
||||||
|
|
||||||
|
// Snap source ids let us filter redundant snaplines only within one
|
||||||
|
// selection-to-reference relationship, without mixing separate reference groups.
|
||||||
|
// For example, "selection->rectA" may collapse to its outermost snaplines,
|
||||||
|
// while "selection->rectB" still keeps its own independent snaplines.
|
||||||
|
type SnapPoint = {
|
||||||
|
point: GlobalPoint;
|
||||||
|
type: SnapPointType;
|
||||||
|
snapSourceId: SnapSourceId;
|
||||||
|
};
|
||||||
|
|
||||||
|
const outerSnapPoint = (
|
||||||
|
point: GlobalPoint,
|
||||||
|
snapSourceId = SELECTION_SNAP_SOURCE_ID,
|
||||||
|
): SnapPoint => ({
|
||||||
|
point,
|
||||||
|
type: "outer",
|
||||||
|
snapSourceId,
|
||||||
|
});
|
||||||
|
|
||||||
export type PointSnap = {
|
export type PointSnap = {
|
||||||
type: "point";
|
type: "point";
|
||||||
points: PointPair;
|
points: PointPair;
|
||||||
|
pointTypes: [SnapPointType, SnapPointType];
|
||||||
|
snapSourceIds: [SnapSourceId, SnapSourceId];
|
||||||
|
// Distance along the rendered snapline, used to group visually nearby
|
||||||
|
// references before choosing which point snaps should win.
|
||||||
|
visualDistance: number;
|
||||||
offset: number;
|
offset: number;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -120,14 +163,14 @@ export type SnapLine = PointSnapLine | GapSnapLine | PointerSnapLine;
|
|||||||
// -----------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------
|
||||||
|
|
||||||
export class SnapCache {
|
export class SnapCache {
|
||||||
private static referenceSnapPoints: GlobalPoint[] | null = null;
|
private static referenceSnapPoints: SnapPoint[] | null = null;
|
||||||
|
|
||||||
private static visibleGaps: {
|
private static visibleGaps: {
|
||||||
verticalGaps: Gap[];
|
verticalGaps: Gap[];
|
||||||
horizontalGaps: Gap[];
|
horizontalGaps: Gap[];
|
||||||
} | null = null;
|
} | null = null;
|
||||||
|
|
||||||
public static setReferenceSnapPoints = (snapPoints: GlobalPoint[] | null) => {
|
public static setReferenceSnapPoints = (snapPoints: SnapPoint[] | null) => {
|
||||||
SnapCache.referenceSnapPoints = snapPoints;
|
SnapCache.referenceSnapPoints = snapPoints;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -195,6 +238,17 @@ export const areRoughlyEqual = (a: number, b: number, precision = 0.01) => {
|
|||||||
return Math.abs(a - b) <= precision;
|
return Math.abs(a - b) <= precision;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Keeps nearly identical snap offsets in the same winner set. This prevents
|
||||||
|
* snapline flicker when rounded geometry differs by a tiny floating-point tail.
|
||||||
|
*/
|
||||||
|
const isWithinSnapOffset = (offset: number, minOffset: number) => {
|
||||||
|
return (
|
||||||
|
Math.abs(offset) <= minOffset ||
|
||||||
|
areRoughlyEqual(Math.abs(offset), minOffset, SNAP_OFFSET_TOLERANCE)
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
export const getElementsCorners = (
|
export const getElementsCorners = (
|
||||||
elements: ExcalidrawElement[],
|
elements: ExcalidrawElement[],
|
||||||
elementsMap: ElementsMap,
|
elementsMap: ElementsMap,
|
||||||
@@ -312,18 +366,81 @@ export const getElementsCorners = (
|
|||||||
return result.map((p) => pointFrom(round(p[0]), round(p[1])));
|
return result.map((p) => pointFrom(round(p[0]), round(p[1])));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const getElementsSnapPoints = (
|
||||||
|
elements: ExcalidrawElement[],
|
||||||
|
elementsMap: ElementsMap,
|
||||||
|
options: Parameters<typeof getElementsCorners>[2] = {},
|
||||||
|
snapSourceId = SELECTION_SNAP_SOURCE_ID,
|
||||||
|
): SnapPoint[] => {
|
||||||
|
const points = getElementsCorners(elements, elementsMap, options);
|
||||||
|
// getElementsCorners() appends the center point last unless omitCenter is set.
|
||||||
|
const hasCenterPoint = !options.omitCenter && points.length > 0;
|
||||||
|
|
||||||
|
return points.map((point, index) => ({
|
||||||
|
point,
|
||||||
|
type: hasCenterPoint && index === points.length - 1 ? "center" : "outer",
|
||||||
|
snapSourceId,
|
||||||
|
}));
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Builds a stable identity for one snap reference group. Sorting keeps grouped
|
||||||
|
* elements represented by the same snap source id regardless of element order.
|
||||||
|
*/
|
||||||
|
const getSnapSourceId = (elements: ExcalidrawElement[]) => {
|
||||||
|
return elements
|
||||||
|
.map((element) => element.id)
|
||||||
|
.sort()
|
||||||
|
.join(",");
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Finds frames that the current selection already belongs to. Their children
|
||||||
|
* are still valid snap references; children of unrelated frames are not.
|
||||||
|
*/
|
||||||
|
const getSelectedFrameIdsForSnapping = (
|
||||||
|
selectedElements: readonly ExcalidrawElement[],
|
||||||
|
) => {
|
||||||
|
const selectedFrameIds = new Set<ExcalidrawElement["id"]>();
|
||||||
|
|
||||||
|
for (const element of selectedElements) {
|
||||||
|
if (element.frameId) {
|
||||||
|
selectedFrameIds.add(element.frameId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return selectedFrameIds;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Frame children are only snap references when the dragged selection is inside
|
||||||
|
* the same frame. This avoids snapping external elements to internals of a
|
||||||
|
* framed diagram.
|
||||||
|
*/
|
||||||
|
const canUseElementAsSnapReference = (
|
||||||
|
element: NonDeletedExcalidrawElement,
|
||||||
|
selectedFrameIds: Set<ExcalidrawElement["id"]>,
|
||||||
|
) => {
|
||||||
|
return !element.frameId || selectedFrameIds.has(element.frameId);
|
||||||
|
};
|
||||||
|
|
||||||
const getReferenceElements = (
|
const getReferenceElements = (
|
||||||
elements: readonly NonDeletedExcalidrawElement[],
|
elements: readonly NonDeletedExcalidrawElement[],
|
||||||
selectedElements: NonDeletedExcalidrawElement[],
|
selectedElements: NonDeletedExcalidrawElement[],
|
||||||
appState: AppState,
|
appState: AppState,
|
||||||
elementsMap: ElementsMap,
|
elementsMap: ElementsMap,
|
||||||
) =>
|
) => {
|
||||||
getVisibleAndNonSelectedElements(
|
const selectedFrameIds = getSelectedFrameIdsForSnapping(selectedElements);
|
||||||
|
|
||||||
|
return getVisibleAndNonSelectedElements(
|
||||||
elements,
|
elements,
|
||||||
selectedElements,
|
selectedElements,
|
||||||
appState,
|
appState,
|
||||||
elementsMap,
|
elementsMap,
|
||||||
);
|
).filter((element) => {
|
||||||
|
return canUseElementAsSnapReference(element, selectedFrameIds);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
export const getVisibleGaps = (
|
export const getVisibleGaps = (
|
||||||
elements: readonly NonDeletedExcalidrawElement[],
|
elements: readonly NonDeletedExcalidrawElement[],
|
||||||
@@ -482,7 +599,10 @@ const getGapSnaps = (
|
|||||||
const centerOffset = round(gapMidX - centerX);
|
const centerOffset = round(gapMidX - centerX);
|
||||||
const gapIsLargerThanSelection = gap.length > maxX - minX;
|
const gapIsLargerThanSelection = gap.length > maxX - minX;
|
||||||
|
|
||||||
if (gapIsLargerThanSelection && Math.abs(centerOffset) <= minOffset.x) {
|
if (
|
||||||
|
gapIsLargerThanSelection &&
|
||||||
|
isWithinSnapOffset(centerOffset, minOffset.x)
|
||||||
|
) {
|
||||||
if (Math.abs(centerOffset) < minOffset.x) {
|
if (Math.abs(centerOffset) < minOffset.x) {
|
||||||
nearestSnapsX.length = 0;
|
nearestSnapsX.length = 0;
|
||||||
}
|
}
|
||||||
@@ -504,7 +624,7 @@ const getGapSnaps = (
|
|||||||
const distanceToEndElementX = minX - endMaxX;
|
const distanceToEndElementX = minX - endMaxX;
|
||||||
const sideOffsetRight = round(gap.length - distanceToEndElementX);
|
const sideOffsetRight = round(gap.length - distanceToEndElementX);
|
||||||
|
|
||||||
if (Math.abs(sideOffsetRight) <= minOffset.x) {
|
if (isWithinSnapOffset(sideOffsetRight, minOffset.x)) {
|
||||||
if (Math.abs(sideOffsetRight) < minOffset.x) {
|
if (Math.abs(sideOffsetRight) < minOffset.x) {
|
||||||
nearestSnapsX.length = 0;
|
nearestSnapsX.length = 0;
|
||||||
}
|
}
|
||||||
@@ -525,7 +645,7 @@ const getGapSnaps = (
|
|||||||
const distanceToStartElementX = startMinX - maxX;
|
const distanceToStartElementX = startMinX - maxX;
|
||||||
const sideOffsetLeft = round(distanceToStartElementX - gap.length);
|
const sideOffsetLeft = round(distanceToStartElementX - gap.length);
|
||||||
|
|
||||||
if (Math.abs(sideOffsetLeft) <= minOffset.x) {
|
if (isWithinSnapOffset(sideOffsetLeft, minOffset.x)) {
|
||||||
if (Math.abs(sideOffsetLeft) < minOffset.x) {
|
if (Math.abs(sideOffsetLeft) < minOffset.x) {
|
||||||
nearestSnapsX.length = 0;
|
nearestSnapsX.length = 0;
|
||||||
}
|
}
|
||||||
@@ -551,7 +671,10 @@ const getGapSnaps = (
|
|||||||
const centerOffset = round(gapMidY - centerY);
|
const centerOffset = round(gapMidY - centerY);
|
||||||
const gapIsLargerThanSelection = gap.length > maxY - minY;
|
const gapIsLargerThanSelection = gap.length > maxY - minY;
|
||||||
|
|
||||||
if (gapIsLargerThanSelection && Math.abs(centerOffset) <= minOffset.y) {
|
if (
|
||||||
|
gapIsLargerThanSelection &&
|
||||||
|
isWithinSnapOffset(centerOffset, minOffset.y)
|
||||||
|
) {
|
||||||
if (Math.abs(centerOffset) < minOffset.y) {
|
if (Math.abs(centerOffset) < minOffset.y) {
|
||||||
nearestSnapsY.length = 0;
|
nearestSnapsY.length = 0;
|
||||||
}
|
}
|
||||||
@@ -573,7 +696,7 @@ const getGapSnaps = (
|
|||||||
const distanceToStartElementY = startMinY - maxY;
|
const distanceToStartElementY = startMinY - maxY;
|
||||||
const sideOffsetTop = round(distanceToStartElementY - gap.length);
|
const sideOffsetTop = round(distanceToStartElementY - gap.length);
|
||||||
|
|
||||||
if (Math.abs(sideOffsetTop) <= minOffset.y) {
|
if (isWithinSnapOffset(sideOffsetTop, minOffset.y)) {
|
||||||
if (Math.abs(sideOffsetTop) < minOffset.y) {
|
if (Math.abs(sideOffsetTop) < minOffset.y) {
|
||||||
nearestSnapsY.length = 0;
|
nearestSnapsY.length = 0;
|
||||||
}
|
}
|
||||||
@@ -594,7 +717,7 @@ const getGapSnaps = (
|
|||||||
const distanceToEndElementY = round(minY - endMaxY);
|
const distanceToEndElementY = round(minY - endMaxY);
|
||||||
const sideOffsetBottom = gap.length - distanceToEndElementY;
|
const sideOffsetBottom = gap.length - distanceToEndElementY;
|
||||||
|
|
||||||
if (Math.abs(sideOffsetBottom) <= minOffset.y) {
|
if (isWithinSnapOffset(sideOffsetBottom, minOffset.y)) {
|
||||||
if (Math.abs(sideOffsetBottom) < minOffset.y) {
|
if (Math.abs(sideOffsetBottom) < minOffset.y) {
|
||||||
nearestSnapsY.length = 0;
|
nearestSnapsY.length = 0;
|
||||||
}
|
}
|
||||||
@@ -613,6 +736,102 @@ const getGapSnaps = (
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Narrows point snaps to the nearest visual cluster, then keeps the best offset
|
||||||
|
* inside that cluster. If all references look continuous, this preserves the
|
||||||
|
* old smallest-offset behavior.
|
||||||
|
*/
|
||||||
|
const filterPointSnapsToNearestCluster = (
|
||||||
|
snaps: Snaps,
|
||||||
|
clusterBreakDistance: number,
|
||||||
|
) => {
|
||||||
|
const pointSnaps = snaps.filter(
|
||||||
|
(snap): snap is PointSnap => snap.type === "point",
|
||||||
|
);
|
||||||
|
|
||||||
|
if (pointSnaps.length < 2) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const snapsByOffset = new Map<number, PointSnap[]>();
|
||||||
|
|
||||||
|
for (const snap of pointSnaps) {
|
||||||
|
const offset = round(snap.offset);
|
||||||
|
const offsetSnaps = snapsByOffset.get(offset) ?? [];
|
||||||
|
offsetSnaps.push(snap);
|
||||||
|
snapsByOffset.set(offset, offsetSnaps);
|
||||||
|
}
|
||||||
|
|
||||||
|
const keptPointSnaps = new Set<PointSnap>();
|
||||||
|
const offsetGroups = Array.from(snapsByOffset.entries()).map(
|
||||||
|
([offset, offsetSnaps]) => ({
|
||||||
|
offset,
|
||||||
|
snaps: offsetSnaps,
|
||||||
|
visualDistance: Math.min(
|
||||||
|
...offsetSnaps.map((snap) => snap.visualDistance),
|
||||||
|
),
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
const sortedOffsetGroups = offsetGroups
|
||||||
|
.slice()
|
||||||
|
.sort((a, b) => a.visualDistance - b.visualDistance);
|
||||||
|
let keepOffsetGroupsUntil = sortedOffsetGroups.length;
|
||||||
|
|
||||||
|
// Prefer a nearby reference cluster before comparing offset. If there is no
|
||||||
|
// clear distance break, this keeps all offsets and falls back to the old
|
||||||
|
// smallest-offset behavior.
|
||||||
|
for (let i = 1; i < sortedOffsetGroups.length; i++) {
|
||||||
|
const distanceGap =
|
||||||
|
sortedOffsetGroups[i].visualDistance -
|
||||||
|
sortedOffsetGroups[i - 1].visualDistance;
|
||||||
|
|
||||||
|
if (distanceGap > clusterBreakDistance) {
|
||||||
|
keepOffsetGroupsUntil = i;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const nearestOffsetGroups = sortedOffsetGroups.slice(
|
||||||
|
0,
|
||||||
|
keepOffsetGroupsUntil,
|
||||||
|
);
|
||||||
|
const minOffset = Math.min(
|
||||||
|
...nearestOffsetGroups.map(({ offset }) => Math.abs(offset)),
|
||||||
|
);
|
||||||
|
const selectedOffsets = nearestOffsetGroups
|
||||||
|
.filter(({ offset }) =>
|
||||||
|
areRoughlyEqual(Math.abs(offset), minOffset, SNAP_OFFSET_TOLERANCE),
|
||||||
|
)
|
||||||
|
.map(({ offset }) => offset);
|
||||||
|
|
||||||
|
for (const offsetSnaps of snapsByOffset.values()) {
|
||||||
|
if (
|
||||||
|
!selectedOffsets.some((offset) =>
|
||||||
|
areRoughlyEqual(
|
||||||
|
round(offsetSnaps[0].offset),
|
||||||
|
offset,
|
||||||
|
SNAP_OFFSET_TOLERANCE,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
offsetSnaps.forEach((snap) => keptPointSnaps.add(snap));
|
||||||
|
}
|
||||||
|
|
||||||
|
let writeIndex = 0;
|
||||||
|
|
||||||
|
for (const snap of snaps) {
|
||||||
|
if (snap.type !== "point" || keptPointSnaps.has(snap)) {
|
||||||
|
snaps[writeIndex] = snap;
|
||||||
|
writeIndex++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
snaps.length = writeIndex;
|
||||||
|
};
|
||||||
|
|
||||||
export const getReferenceSnapPoints = (
|
export const getReferenceSnapPoints = (
|
||||||
elements: readonly NonDeletedExcalidrawElement[],
|
elements: readonly NonDeletedExcalidrawElement[],
|
||||||
selectedElements: ExcalidrawElement[],
|
selectedElements: ExcalidrawElement[],
|
||||||
@@ -630,12 +849,24 @@ export const getReferenceSnapPoints = (
|
|||||||
(elementsGroup) =>
|
(elementsGroup) =>
|
||||||
!(elementsGroup.length === 1 && isBoundToContainer(elementsGroup[0])),
|
!(elementsGroup.length === 1 && isBoundToContainer(elementsGroup[0])),
|
||||||
)
|
)
|
||||||
.flatMap((elementGroup) => getElementsCorners(elementGroup, elementsMap));
|
.flatMap((elementGroup) =>
|
||||||
|
getElementsSnapPoints(
|
||||||
|
elementGroup,
|
||||||
|
elementsMap,
|
||||||
|
{},
|
||||||
|
getSnapSourceId(elementGroup),
|
||||||
|
),
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Collects point snaps within snap distance. Unlike gap snaps, point snaps first
|
||||||
|
* go through visual-cluster filtering so a nearby reference can beat a slightly
|
||||||
|
* better offset from a far-away reference.
|
||||||
|
*/
|
||||||
const getPointSnaps = (
|
const getPointSnaps = (
|
||||||
selectedElements: ExcalidrawElement[],
|
selectedElements: ExcalidrawElement[],
|
||||||
selectionSnapPoints: GlobalPoint[],
|
selectionSnapPoints: SnapPoint[],
|
||||||
app: AppClassProperties,
|
app: AppClassProperties,
|
||||||
event: KeyboardModifiersObject,
|
event: KeyboardModifiersObject,
|
||||||
nearestSnapsX: Snaps,
|
nearestSnapsX: Snaps,
|
||||||
@@ -654,39 +885,62 @@ const getPointSnaps = (
|
|||||||
if (referenceSnapPoints) {
|
if (referenceSnapPoints) {
|
||||||
for (const thisSnapPoint of selectionSnapPoints) {
|
for (const thisSnapPoint of selectionSnapPoints) {
|
||||||
for (const otherSnapPoint of referenceSnapPoints) {
|
for (const otherSnapPoint of referenceSnapPoints) {
|
||||||
const offsetX = otherSnapPoint[0] - thisSnapPoint[0];
|
const offsetX = otherSnapPoint.point[0] - thisSnapPoint.point[0];
|
||||||
const offsetY = otherSnapPoint[1] - thisSnapPoint[1];
|
const offsetY = otherSnapPoint.point[1] - thisSnapPoint.point[1];
|
||||||
|
|
||||||
if (Math.abs(offsetX) <= minOffset.x) {
|
|
||||||
if (Math.abs(offsetX) < minOffset.x) {
|
|
||||||
nearestSnapsX.length = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
if (isWithinSnapOffset(offsetX, minOffset.x)) {
|
||||||
nearestSnapsX.push({
|
nearestSnapsX.push({
|
||||||
type: "point",
|
type: "point",
|
||||||
points: [thisSnapPoint, otherSnapPoint],
|
points: [thisSnapPoint.point, otherSnapPoint.point],
|
||||||
|
pointTypes: [thisSnapPoint.type, otherSnapPoint.type],
|
||||||
|
snapSourceIds: [
|
||||||
|
thisSnapPoint.snapSourceId,
|
||||||
|
otherSnapPoint.snapSourceId,
|
||||||
|
],
|
||||||
|
visualDistance: Math.abs(
|
||||||
|
otherSnapPoint.point[1] - thisSnapPoint.point[1],
|
||||||
|
),
|
||||||
offset: offsetX,
|
offset: offsetX,
|
||||||
});
|
});
|
||||||
|
|
||||||
minOffset.x = Math.abs(offsetX);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Math.abs(offsetY) <= minOffset.y) {
|
if (isWithinSnapOffset(offsetY, minOffset.y)) {
|
||||||
if (Math.abs(offsetY) < minOffset.y) {
|
|
||||||
nearestSnapsY.length = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
nearestSnapsY.push({
|
nearestSnapsY.push({
|
||||||
type: "point",
|
type: "point",
|
||||||
points: [thisSnapPoint, otherSnapPoint],
|
points: [thisSnapPoint.point, otherSnapPoint.point],
|
||||||
|
pointTypes: [thisSnapPoint.type, otherSnapPoint.type],
|
||||||
|
snapSourceIds: [
|
||||||
|
thisSnapPoint.snapSourceId,
|
||||||
|
otherSnapPoint.snapSourceId,
|
||||||
|
],
|
||||||
|
visualDistance: Math.abs(
|
||||||
|
otherSnapPoint.point[0] - thisSnapPoint.point[0],
|
||||||
|
),
|
||||||
offset: offsetY,
|
offset: offsetY,
|
||||||
});
|
});
|
||||||
|
|
||||||
minOffset.y = Math.abs(offsetY);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const clusterBreakDistance = getSnapReferenceClusterBreakDistance(
|
||||||
|
app.state.zoom.value,
|
||||||
|
);
|
||||||
|
|
||||||
|
filterPointSnapsToNearestCluster(nearestSnapsX, clusterBreakDistance);
|
||||||
|
filterPointSnapsToNearestCluster(nearestSnapsY, clusterBreakDistance);
|
||||||
|
|
||||||
|
if (nearestSnapsX.length > 0) {
|
||||||
|
minOffset.x = Math.min(
|
||||||
|
...nearestSnapsX.map((snap) => Math.abs(snap.offset)),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (nearestSnapsY.length > 0) {
|
||||||
|
minOffset.y = Math.min(
|
||||||
|
...nearestSnapsY.map((snap) => Math.abs(snap.offset)),
|
||||||
|
);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export const snapDraggedElements = (
|
export const snapDraggedElements = (
|
||||||
@@ -720,7 +974,7 @@ export const snapDraggedElements = (
|
|||||||
y: snapDistance,
|
y: snapDistance,
|
||||||
};
|
};
|
||||||
|
|
||||||
const selectionPoints = getElementsCorners(selectedElements, elementsMap, {
|
const selectionPoints = getElementsSnapPoints(selectedElements, elementsMap, {
|
||||||
dragOffset,
|
dragOffset,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -770,7 +1024,7 @@ export const snapDraggedElements = (
|
|||||||
|
|
||||||
getPointSnaps(
|
getPointSnaps(
|
||||||
selectedElements,
|
selectedElements,
|
||||||
getElementsCorners(selectedElements, elementsMap, {
|
getElementsSnapPoints(selectedElements, elementsMap, {
|
||||||
dragOffset: newDragOffset,
|
dragOffset: newDragOffset,
|
||||||
}),
|
}),
|
||||||
app,
|
app,
|
||||||
@@ -825,12 +1079,185 @@ const dedupePoints = (points: GlobalPoint[]): GlobalPoint[] => {
|
|||||||
return Array.from(map.values());
|
return Array.from(map.values());
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Point snaplines are collected from every winning point snap first. Multiple
|
||||||
|
// snap source pairs can collapse to the same rendered line, so candidates keep
|
||||||
|
// source-pair metadata until redundant center and inner outer lines are removed.
|
||||||
|
type PointSnapLineSourcePair = {
|
||||||
|
snapSourcePairKey: string;
|
||||||
|
pointType: SnapPointType;
|
||||||
|
};
|
||||||
|
|
||||||
|
type PointSnapLineCandidate = PointSnapLine & {
|
||||||
|
sourcePairs: PointSnapLineSourcePair[];
|
||||||
|
};
|
||||||
|
|
||||||
|
type PointSnapLineBucket = {
|
||||||
|
points: GlobalPoint[];
|
||||||
|
sourcePairs: PointSnapLineSourcePair[];
|
||||||
|
};
|
||||||
|
|
||||||
|
type OuterSnapLineCoordinateRange = {
|
||||||
|
count: number;
|
||||||
|
min: number;
|
||||||
|
max: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Describes which snap source pair produced a rendered point snapline, so later
|
||||||
|
* filtering can reason about redundancy without mixing unrelated references.
|
||||||
|
* Only center-to-center snaps count as center snaplines; a center-to-outer snap
|
||||||
|
* still explains an outer edge or midpoint alignment.
|
||||||
|
*/
|
||||||
|
const getPointSnapLineSourcePair = (
|
||||||
|
snap: PointSnap,
|
||||||
|
): PointSnapLineSourcePair => {
|
||||||
|
return {
|
||||||
|
snapSourcePairKey: snap.snapSourceIds.join("->"),
|
||||||
|
pointType: snap.pointTypes.every((pointType) => pointType === "center")
|
||||||
|
? "center"
|
||||||
|
: "outer",
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Builds each snap source pair's outer coordinate range. Center snaplines use
|
||||||
|
* this range to decide whether the surrounding outer lines already explain
|
||||||
|
* them, and outer snaplines use it to keep only the two extremes.
|
||||||
|
*/
|
||||||
|
const getOuterCoordinateRangesBySnapSourcePairKey = (
|
||||||
|
snapLines: PointSnapLineCandidate[],
|
||||||
|
getCoordinate: (snapLine: PointSnapLine) => number,
|
||||||
|
) => {
|
||||||
|
const ranges = new Map<string, OuterSnapLineCoordinateRange>();
|
||||||
|
|
||||||
|
for (const snapLine of snapLines) {
|
||||||
|
const coordinate = getCoordinate(snapLine);
|
||||||
|
|
||||||
|
for (const sourcePair of snapLine.sourcePairs) {
|
||||||
|
if (sourcePair.pointType === "center") {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
const range = ranges.get(sourcePair.snapSourcePairKey);
|
||||||
|
|
||||||
|
ranges.set(sourcePair.snapSourcePairKey, {
|
||||||
|
count: (range?.count ?? 0) + 1,
|
||||||
|
min: range ? Math.min(range.min, coordinate) : coordinate,
|
||||||
|
max: range ? Math.max(range.max, coordinate) : coordinate,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return ranges;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A center snapline is redundant when outer snaplines from the same snap source
|
||||||
|
* pair exist on both sides, because the outer lines already imply center
|
||||||
|
* alignment.
|
||||||
|
*/
|
||||||
|
const isRedundantCenterSnapLine = (
|
||||||
|
coordinate: number,
|
||||||
|
outerCoordinateRange?: OuterSnapLineCoordinateRange,
|
||||||
|
) => {
|
||||||
|
if (!outerCoordinateRange) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
outerCoordinateRange.min < coordinate &&
|
||||||
|
outerCoordinateRange.max > coordinate
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* When more than two outer snaplines come from the same snap source pair, the
|
||||||
|
* inner ones are redundant; the two extremes communicate the same shape
|
||||||
|
* alignment.
|
||||||
|
*/
|
||||||
|
const isRedundantOuterSnapLine = (
|
||||||
|
coordinate: number,
|
||||||
|
outerCoordinateRange?: OuterSnapLineCoordinateRange,
|
||||||
|
) => {
|
||||||
|
if (!outerCoordinateRange || outerCoordinateRange.count <= 2) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
coordinate !== outerCoordinateRange.min &&
|
||||||
|
coordinate !== outerCoordinateRange.max
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Keeps a visual snapline if at least one snap source pair represented by the
|
||||||
|
* line still needs it. This matters when multiple snap source pairs collapse to
|
||||||
|
* the same rendered coordinate.
|
||||||
|
*/
|
||||||
|
const isPointSnapLineNeededBySourcePair = (
|
||||||
|
sourcePair: PointSnapLineSourcePair,
|
||||||
|
coordinate: number,
|
||||||
|
outerCoordinateRangesBySnapSourcePairKey: Map<
|
||||||
|
string,
|
||||||
|
OuterSnapLineCoordinateRange
|
||||||
|
>,
|
||||||
|
) => {
|
||||||
|
const outerCoordinateRange = outerCoordinateRangesBySnapSourcePairKey.get(
|
||||||
|
sourcePair.snapSourcePairKey,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (sourcePair.pointType === "center") {
|
||||||
|
return !isRedundantCenterSnapLine(coordinate, outerCoordinateRange);
|
||||||
|
}
|
||||||
|
|
||||||
|
return !isRedundantOuterSnapLine(coordinate, outerCoordinateRange);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Removes point snaplines that are visually redundant, while preserving any line
|
||||||
|
* that is still needed by at least one snap source pair represented on that
|
||||||
|
* line.
|
||||||
|
*/
|
||||||
|
const filterRedundantPointSnapLines = (
|
||||||
|
snapLines: PointSnapLineCandidate[],
|
||||||
|
getCoordinate: (snapLine: PointSnapLine) => number,
|
||||||
|
): PointSnapLine[] => {
|
||||||
|
if (snapLines.length < 3) {
|
||||||
|
return snapLines.map(({ sourcePairs, ...snapLine }) => snapLine);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Track outer-line ranges per snap source pair. The same visual snapline can
|
||||||
|
// be produced by multiple snap source pairs, so a line is removed only when
|
||||||
|
// every pair represented by that line considers it redundant.
|
||||||
|
const outerCoordinateRangesBySnapSourcePairKey =
|
||||||
|
getOuterCoordinateRangesBySnapSourcePairKey(snapLines, getCoordinate);
|
||||||
|
|
||||||
|
return snapLines
|
||||||
|
.filter((snapLine) => {
|
||||||
|
const coordinate = getCoordinate(snapLine);
|
||||||
|
|
||||||
|
return snapLine.sourcePairs.some((sourcePair) =>
|
||||||
|
isPointSnapLineNeededBySourcePair(
|
||||||
|
sourcePair,
|
||||||
|
coordinate,
|
||||||
|
outerCoordinateRangesBySnapSourcePairKey,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
})
|
||||||
|
.map(({ sourcePairs, ...snapLine }) => snapLine);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Merges point snaps that render on the same x/y coordinate, attaches their
|
||||||
|
* snap source pair metadata, then removes redundant center and inner outer
|
||||||
|
* lines.
|
||||||
|
*/
|
||||||
const createPointSnapLines = (
|
const createPointSnapLines = (
|
||||||
nearestSnapsX: Snaps,
|
nearestSnapsX: Snaps,
|
||||||
nearestSnapsY: Snaps,
|
nearestSnapsY: Snaps,
|
||||||
): PointSnapLine[] => {
|
): PointSnapLine[] => {
|
||||||
const snapsX = {} as { [key: string]: GlobalPoint[] };
|
const snapsX = {} as { [key: string]: PointSnapLineBucket };
|
||||||
const snapsY = {} as { [key: string]: GlobalPoint[] };
|
const snapsY = {} as { [key: string]: PointSnapLineBucket };
|
||||||
|
|
||||||
if (nearestSnapsX.length > 0) {
|
if (nearestSnapsX.length > 0) {
|
||||||
for (const snap of nearestSnapsX) {
|
for (const snap of nearestSnapsX) {
|
||||||
@@ -838,13 +1265,14 @@ const createPointSnapLines = (
|
|||||||
// key = thisPoint.x
|
// key = thisPoint.x
|
||||||
const key = round(snap.points[0][0]);
|
const key = round(snap.points[0][0]);
|
||||||
if (!snapsX[key]) {
|
if (!snapsX[key]) {
|
||||||
snapsX[key] = [];
|
snapsX[key] = { points: [], sourcePairs: [] };
|
||||||
}
|
}
|
||||||
snapsX[key].push(
|
snapsX[key].points.push(
|
||||||
...snap.points.map((p) =>
|
...snap.points.map((p) =>
|
||||||
pointFrom<GlobalPoint>(round(p[0]), round(p[1])),
|
pointFrom<GlobalPoint>(round(p[0]), round(p[1])),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
snapsX[key].sourcePairs.push(getPointSnapLineSourcePair(snap));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -855,44 +1283,55 @@ const createPointSnapLines = (
|
|||||||
// key = thisPoint.y
|
// key = thisPoint.y
|
||||||
const key = round(snap.points[0][1]);
|
const key = round(snap.points[0][1]);
|
||||||
if (!snapsY[key]) {
|
if (!snapsY[key]) {
|
||||||
snapsY[key] = [];
|
snapsY[key] = { points: [], sourcePairs: [] };
|
||||||
}
|
}
|
||||||
snapsY[key].push(
|
snapsY[key].points.push(
|
||||||
...snap.points.map((p) =>
|
...snap.points.map((p) =>
|
||||||
pointFrom<GlobalPoint>(round(p[0]), round(p[1])),
|
pointFrom<GlobalPoint>(round(p[0]), round(p[1])),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
snapsY[key].sourcePairs.push(getPointSnapLineSourcePair(snap));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return Object.entries(snapsX)
|
const snapLinesX = Object.entries(snapsX).map(([key, snap]) => {
|
||||||
.map(([key, points]) => {
|
return {
|
||||||
return {
|
type: "points",
|
||||||
type: "points",
|
points: dedupePoints(
|
||||||
points: dedupePoints(
|
snap.points
|
||||||
points
|
.map((p) => {
|
||||||
.map((p) => {
|
return pointFrom<GlobalPoint>(Number(key), p[1]);
|
||||||
return pointFrom<GlobalPoint>(Number(key), p[1]);
|
})
|
||||||
})
|
.sort((a, b) => a[1] - b[1]),
|
||||||
.sort((a, b) => a[1] - b[1]),
|
),
|
||||||
),
|
sourcePairs: snap.sourcePairs,
|
||||||
} as PointSnapLine;
|
} as PointSnapLineCandidate;
|
||||||
})
|
});
|
||||||
.concat(
|
|
||||||
Object.entries(snapsY).map(([key, points]) => {
|
const snapLinesY = Object.entries(snapsY).map(([key, snap]) => {
|
||||||
return {
|
return {
|
||||||
type: "points",
|
type: "points",
|
||||||
points: dedupePoints(
|
points: dedupePoints(
|
||||||
points
|
snap.points
|
||||||
.map((p) => {
|
.map((p) => {
|
||||||
return pointFrom<GlobalPoint>(p[0], Number(key));
|
return pointFrom<GlobalPoint>(p[0], Number(key));
|
||||||
})
|
})
|
||||||
.sort((a, b) => a[0] - b[0]),
|
.sort((a, b) => a[0] - b[0]),
|
||||||
),
|
),
|
||||||
} as PointSnapLine;
|
sourcePairs: snap.sourcePairs,
|
||||||
}),
|
} as PointSnapLineCandidate;
|
||||||
);
|
});
|
||||||
|
|
||||||
|
return filterRedundantPointSnapLines(
|
||||||
|
snapLinesX,
|
||||||
|
(snapLine) => snapLine.points[0][0],
|
||||||
|
).concat(
|
||||||
|
filterRedundantPointSnapLines(
|
||||||
|
snapLinesY,
|
||||||
|
(snapLine) => snapLine.points[0][1],
|
||||||
|
),
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const dedupeGapSnapLines = (gapSnapLines: GapSnapLine[]) => {
|
const dedupeGapSnapLines = (gapSnapLines: GapSnapLine[]) => {
|
||||||
@@ -917,10 +1356,13 @@ const createGapSnapLines = (
|
|||||||
dragOffset: Vector2D,
|
dragOffset: Vector2D,
|
||||||
gapSnaps: GapSnap[],
|
gapSnaps: GapSnap[],
|
||||||
): GapSnapLine[] => {
|
): GapSnapLine[] => {
|
||||||
|
// Use the same rounded bounds as getGapSnaps(). Otherwise a gap snap can be
|
||||||
|
// accepted during snapping but skipped here because the raw bounds miss the
|
||||||
|
// reference gap overlap by a tiny floating-point delta.
|
||||||
const [minX, minY, maxX, maxY] = getDraggedElementsBounds(
|
const [minX, minY, maxX, maxY] = getDraggedElementsBounds(
|
||||||
selectedElements,
|
selectedElements,
|
||||||
dragOffset,
|
dragOffset,
|
||||||
);
|
).map((bound) => round(bound));
|
||||||
|
|
||||||
const gapSnapLines: GapSnapLine[] = [];
|
const gapSnapLines: GapSnapLine[] = [];
|
||||||
|
|
||||||
@@ -1143,40 +1585,52 @@ export const snapResizingElements = (
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const selectionSnapPoints: GlobalPoint[] = [];
|
const selectionSnapPoints: SnapPoint[] = [];
|
||||||
|
|
||||||
if (transformHandle) {
|
if (transformHandle) {
|
||||||
switch (transformHandle) {
|
switch (transformHandle) {
|
||||||
case "e": {
|
case "e": {
|
||||||
selectionSnapPoints.push(pointFrom(maxX, minY), pointFrom(maxX, maxY));
|
selectionSnapPoints.push(
|
||||||
|
outerSnapPoint(pointFrom(maxX, minY)),
|
||||||
|
outerSnapPoint(pointFrom(maxX, maxY)),
|
||||||
|
);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case "w": {
|
case "w": {
|
||||||
selectionSnapPoints.push(pointFrom(minX, minY), pointFrom(minX, maxY));
|
selectionSnapPoints.push(
|
||||||
|
outerSnapPoint(pointFrom(minX, minY)),
|
||||||
|
outerSnapPoint(pointFrom(minX, maxY)),
|
||||||
|
);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case "n": {
|
case "n": {
|
||||||
selectionSnapPoints.push(pointFrom(minX, minY), pointFrom(maxX, minY));
|
selectionSnapPoints.push(
|
||||||
|
outerSnapPoint(pointFrom(minX, minY)),
|
||||||
|
outerSnapPoint(pointFrom(maxX, minY)),
|
||||||
|
);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case "s": {
|
case "s": {
|
||||||
selectionSnapPoints.push(pointFrom(minX, maxY), pointFrom(maxX, maxY));
|
selectionSnapPoints.push(
|
||||||
|
outerSnapPoint(pointFrom(minX, maxY)),
|
||||||
|
outerSnapPoint(pointFrom(maxX, maxY)),
|
||||||
|
);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case "ne": {
|
case "ne": {
|
||||||
selectionSnapPoints.push(pointFrom(maxX, minY));
|
selectionSnapPoints.push(outerSnapPoint(pointFrom(maxX, minY)));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case "nw": {
|
case "nw": {
|
||||||
selectionSnapPoints.push(pointFrom(minX, minY));
|
selectionSnapPoints.push(outerSnapPoint(pointFrom(minX, minY)));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case "se": {
|
case "se": {
|
||||||
selectionSnapPoints.push(pointFrom(maxX, maxY));
|
selectionSnapPoints.push(outerSnapPoint(pointFrom(maxX, maxY)));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case "sw": {
|
case "sw": {
|
||||||
selectionSnapPoints.push(pointFrom(minX, maxY));
|
selectionSnapPoints.push(outerSnapPoint(pointFrom(minX, maxY)));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1218,11 +1672,11 @@ export const snapResizingElements = (
|
|||||||
round(bound),
|
round(bound),
|
||||||
);
|
);
|
||||||
|
|
||||||
const corners: GlobalPoint[] = [
|
const corners: SnapPoint[] = [
|
||||||
pointFrom(x1, y1),
|
outerSnapPoint(pointFrom(x1, y1)),
|
||||||
pointFrom(x1, y2),
|
outerSnapPoint(pointFrom(x1, y2)),
|
||||||
pointFrom(x2, y1),
|
outerSnapPoint(pointFrom(x2, y1)),
|
||||||
pointFrom(x2, y2),
|
outerSnapPoint(pointFrom(x2, y2)),
|
||||||
];
|
];
|
||||||
|
|
||||||
getPointSnaps(
|
getPointSnaps(
|
||||||
@@ -1258,8 +1712,8 @@ export const snapNewElement = (
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
const selectionSnapPoints: GlobalPoint[] = [
|
const selectionSnapPoints: SnapPoint[] = [
|
||||||
pointFrom(origin.x + dragOffset.x, origin.y + dragOffset.y),
|
outerSnapPoint(pointFrom(origin.x + dragOffset.x, origin.y + dragOffset.y)),
|
||||||
];
|
];
|
||||||
|
|
||||||
const snapDistance = getSnapDistance(app.state.zoom.value);
|
const snapDistance = getSnapDistance(app.state.zoom.value);
|
||||||
@@ -1292,7 +1746,7 @@ export const snapNewElement = (
|
|||||||
nearestSnapsX.length = 0;
|
nearestSnapsX.length = 0;
|
||||||
nearestSnapsY.length = 0;
|
nearestSnapsY.length = 0;
|
||||||
|
|
||||||
const corners = getElementsCorners([newElement], elementsMap, {
|
const corners = getElementsSnapPoints([newElement], elementsMap, {
|
||||||
boundingBoxCorners: true,
|
boundingBoxCorners: true,
|
||||||
omitCenter: true,
|
omitCenter: true,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -979,7 +979,6 @@ exports[`contextMenu element > right-clicking on a group should select whole gro
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -1173,7 +1172,6 @@ exports[`contextMenu element > selecting 'Add to library' in context menu adds e
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -1388,7 +1386,6 @@ exports[`contextMenu element > selecting 'Bring forward' in context menu brings
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -1720,7 +1717,6 @@ exports[`contextMenu element > selecting 'Bring to front' in context menu brings
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -2052,7 +2048,6 @@ exports[`contextMenu element > selecting 'Copy styles' in context menu copies st
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -2265,7 +2260,6 @@ exports[`contextMenu element > selecting 'Delete' in context menu deletes elemen
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -2509,7 +2503,6 @@ exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -2813,7 +2806,6 @@ exports[`contextMenu element > selecting 'Group selection' in context menu group
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -3181,7 +3173,6 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -3675,7 +3666,6 @@ exports[`contextMenu element > selecting 'Send backward' in context menu sends e
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -3999,7 +3989,6 @@ exports[`contextMenu element > selecting 'Send to back' in context menu sends el
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -4326,7 +4315,6 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -5612,7 +5600,6 @@ exports[`contextMenu element > shows 'Group selection' in context menu for multi
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -6832,7 +6819,6 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -7786,7 +7772,6 @@ exports[`contextMenu element > shows context menu for canvas > [end of test] app
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -8786,7 +8771,6 @@ exports[`contextMenu element > shows context menu for element > [end of test] ap
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -9781,7 +9765,6 @@ exports[`contextMenu element > shows context menu for element > [end of test] ap
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
|
|||||||
@@ -1293,7 +1293,6 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -1654,7 +1653,6 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -2017,7 +2015,6 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -2280,7 +2277,40 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
"startBoundElement": {
|
||||||
|
"angle": 0,
|
||||||
|
"backgroundColor": "transparent",
|
||||||
|
"boundElements": [
|
||||||
|
{
|
||||||
|
"id": "id4",
|
||||||
|
"type": "arrow",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
"customData": undefined,
|
||||||
|
"fillStyle": "solid",
|
||||||
|
"frameId": null,
|
||||||
|
"groupIds": [],
|
||||||
|
"height": 100,
|
||||||
|
"id": "id0",
|
||||||
|
"index": "a0",
|
||||||
|
"isDeleted": false,
|
||||||
|
"link": null,
|
||||||
|
"locked": false,
|
||||||
|
"opacity": 100,
|
||||||
|
"roughness": 1,
|
||||||
|
"roundness": null,
|
||||||
|
"seed": 1,
|
||||||
|
"strokeColor": "#1e1e1e",
|
||||||
|
"strokeStyle": "solid",
|
||||||
|
"strokeWidth": 2,
|
||||||
|
"type": "rectangle",
|
||||||
|
"updated": 1,
|
||||||
|
"version": 3,
|
||||||
|
"versionNonce": 493213705,
|
||||||
|
"width": 100,
|
||||||
|
"x": -100,
|
||||||
|
"y": -50,
|
||||||
|
},
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -2735,7 +2765,6 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -3039,7 +3068,6 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -3359,7 +3387,6 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -3654,7 +3681,6 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -3941,7 +3967,6 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -4177,7 +4202,6 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -4435,7 +4459,6 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -4707,7 +4730,6 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -4937,7 +4959,6 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -5167,7 +5188,6 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -5415,7 +5435,6 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -5672,7 +5691,6 @@ exports[`history > multiplayer undo/redo > conflicts in frames and their childre
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -5930,7 +5948,6 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -6260,7 +6277,6 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -6691,7 +6707,6 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -7072,7 +7087,6 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -7667,7 +7681,6 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -7898,7 +7911,6 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -8251,7 +8263,6 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -8610,7 +8621,6 @@ exports[`history > multiplayer undo/redo > should not let remote changes to inte
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -9011,7 +9021,6 @@ exports[`history > multiplayer undo/redo > should not let remote changes to inte
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -9293,7 +9302,6 @@ exports[`history > multiplayer undo/redo > should not let remote changes to inte
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -9558,7 +9566,6 @@ exports[`history > multiplayer undo/redo > should not override remote changes on
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -9824,7 +9831,6 @@ exports[`history > multiplayer undo/redo > should not override remote changes on
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -10058,7 +10064,6 @@ exports[`history > multiplayer undo/redo > should override remotely added groups
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -10671,7 +10676,6 @@ exports[`history > multiplayer undo/redo > should redistribute deltas when eleme
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -10911,7 +10915,6 @@ exports[`history > multiplayer undo/redo > should redraw arrows on undo > [end o
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -11836,7 +11839,6 @@ exports[`history > multiplayer undo/redo > should update history entries after r
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -12095,7 +12097,6 @@ exports[`history > singleplayer undo/redo > remounting undo/redo buttons should
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": false,
|
"showWelcomeScreen": false,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -12333,7 +12334,6 @@ exports[`history > singleplayer undo/redo > should clear the redo stack on eleme
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -12569,7 +12569,6 @@ exports[`history > singleplayer undo/redo > should create entry when selecting f
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -12966,7 +12965,6 @@ exports[`history > singleplayer undo/redo > should create new history entry on e
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -13174,7 +13172,6 @@ exports[`history > singleplayer undo/redo > should create new history entry on e
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -13386,7 +13383,6 @@ exports[`history > singleplayer undo/redo > should create new history entry on i
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -13685,7 +13681,6 @@ exports[`history > singleplayer undo/redo > should create new history entry on i
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -13984,7 +13979,6 @@ exports[`history > singleplayer undo/redo > should create new history entry on s
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": false,
|
"showWelcomeScreen": false,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -14229,7 +14223,6 @@ exports[`history > singleplayer undo/redo > should disable undo/redo buttons whe
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": false,
|
"showWelcomeScreen": false,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -14467,7 +14460,6 @@ exports[`history > singleplayer undo/redo > should end up with no history entry
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": false,
|
"showWelcomeScreen": false,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -14705,7 +14697,6 @@ exports[`history > singleplayer undo/redo > should iterate through the history w
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -14953,7 +14944,6 @@ exports[`history > singleplayer undo/redo > should not clear the redo stack on s
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -15286,7 +15276,6 @@ exports[`history > singleplayer undo/redo > should not collapse when applying co
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -15459,7 +15448,6 @@ exports[`history > singleplayer undo/redo > should not end up with history entry
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -15742,7 +15730,6 @@ exports[`history > singleplayer undo/redo > should not end up with history entry
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -16006,7 +15993,6 @@ exports[`history > singleplayer undo/redo > should not modify anything on unrela
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": false,
|
"showWelcomeScreen": false,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -16161,7 +16147,6 @@ exports[`history > singleplayer undo/redo > should not override appstate changes
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -16443,7 +16428,6 @@ exports[`history > singleplayer undo/redo > should support appstate name or view
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -20170,7 +20154,6 @@ exports[`history > singleplayer undo/redo > should support changes in elements'
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -20653,7 +20636,6 @@ exports[`history > singleplayer undo/redo > should support duplication of groups
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -21160,7 +21142,6 @@ exports[`history > singleplayer undo/redo > should support element creation, del
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
|
|||||||
@@ -106,7 +106,6 @@ exports[`given element A and group of elements B and given both are selected whe
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -535,7 +534,6 @@ exports[`given element A and group of elements B and given both are selected whe
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -943,7 +941,6 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -1510,7 +1507,6 @@ exports[`regression tests > Drags selected element when hitting only bounding bo
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -1723,7 +1719,6 @@ exports[`regression tests > adjusts z order when grouping > [end of test] appSta
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -2105,7 +2100,6 @@ exports[`regression tests > alt-drag duplicates an element > [end of test] appSt
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -2349,7 +2343,6 @@ exports[`regression tests > arrow keys > [end of test] appState 1`] = `
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -2532,7 +2525,6 @@ exports[`regression tests > can drag element that covers another element, while
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -2856,7 +2848,6 @@ exports[`regression tests > change the properties of a shape > [end of test] app
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -3114,7 +3105,6 @@ exports[`regression tests > click on an element and drag it > [dragged] appState
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -3356,7 +3346,6 @@ exports[`regression tests > click on an element and drag it > [end of test] appS
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -3593,7 +3582,6 @@ exports[`regression tests > click to select a shape > [end of test] appState 1`]
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -3853,7 +3841,6 @@ exports[`regression tests > click-drag to select a group > [end of test] appStat
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -4167,7 +4154,6 @@ exports[`regression tests > deleting last but one element in editing group shoul
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -4631,7 +4617,6 @@ exports[`regression tests > deselects group of selected elements on pointer down
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -4887,7 +4872,6 @@ exports[`regression tests > deselects group of selected elements on pointer up w
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -5191,7 +5175,6 @@ exports[`regression tests > deselects selected element on pointer down when poin
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -5372,7 +5355,6 @@ exports[`regression tests > deselects selected element, on pointer up, when clic
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -5573,7 +5555,6 @@ exports[`regression tests > double click to edit a group > [end of test] appStat
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -5971,7 +5952,6 @@ exports[`regression tests > drags selected elements from point inside common bou
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -7057,7 +7037,6 @@ exports[`regression tests > given a group of selected elements with an element t
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -7392,7 +7371,6 @@ exports[`regression tests > given a selected element A and a not selected elemen
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -7671,7 +7649,6 @@ exports[`regression tests > given selected element A with lower z-index than uns
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -7907,7 +7884,6 @@ exports[`regression tests > given selected element A with lower z-index than uns
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -8146,7 +8122,6 @@ exports[`regression tests > key 2 selects rectangle tool > [end of test] appStat
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -8327,7 +8302,6 @@ exports[`regression tests > key 3 selects diamond tool > [end of test] appState
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -8508,7 +8482,6 @@ exports[`regression tests > key 4 selects ellipse tool > [end of test] appState
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -9151,7 +9124,6 @@ exports[`regression tests > key 7 selects freedraw tool > [end of test] appState
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -9579,7 +9551,6 @@ exports[`regression tests > key d selects diamond tool > [end of test] appState
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -9991,7 +9962,6 @@ exports[`regression tests > key o selects ellipse tool > [end of test] appState
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -10170,7 +10140,6 @@ exports[`regression tests > key p selects freedraw tool > [end of test] appState
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -10365,7 +10334,6 @@ exports[`regression tests > key r selects rectangle tool > [end of test] appStat
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -10554,7 +10522,6 @@ exports[`regression tests > make a group and duplicate it > [end of test] appSta
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -11080,7 +11047,6 @@ exports[`regression tests > noop interaction after undo shouldn't create history
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -11357,7 +11323,6 @@ exports[`regression tests > pinch-to-zoom works > [end of test] appState 1`] = `
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -11483,7 +11448,6 @@ exports[`regression tests > shift click on selected element should deselect it o
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -11688,7 +11652,6 @@ exports[`regression tests > shift-click to multiselect, then drag > [end of test
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -12010,7 +11973,6 @@ exports[`regression tests > should group elements and ungroup them > [end of tes
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -12444,7 +12406,6 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -13076,7 +13037,6 @@ exports[`regression tests > spacebar + drag scrolls the canvas > [end of test] a
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -13204,7 +13164,6 @@ exports[`regression tests > supports nested groups > [end of test] appState 1`]
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -13865,7 +13824,6 @@ exports[`regression tests > switches from group of selected elements to another
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -14204,7 +14162,6 @@ exports[`regression tests > switches selected element on pointer down > [end of
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -14437,7 +14394,6 @@ exports[`regression tests > two-finger scroll works > [end of test] appState 1`]
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -14926,7 +14882,6 @@ exports[`regression tests > updates fontSize & fontFamily appState > [end of tes
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
@@ -15053,7 +15008,6 @@ exports[`regression tests > zoom hotkeys > [end of test] appState 1`] = `
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": true,
|
"showWelcomeScreen": true,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
|
|||||||
@@ -160,40 +160,6 @@ describe("restoreElements", () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it("should restore fixed freedraw element correctly", () => {
|
|
||||||
const freedrawElement = API.createElement({
|
|
||||||
type: "freedraw",
|
|
||||||
id: "id-freedraw02",
|
|
||||||
strokeShape: "fixed",
|
|
||||||
points: [pointFrom(0, 0), pointFrom(10, 10)],
|
|
||||||
});
|
|
||||||
|
|
||||||
const restoredFreedraw = restore.restoreElements(
|
|
||||||
[freedrawElement],
|
|
||||||
null,
|
|
||||||
)[0] as ExcalidrawFreeDrawElement;
|
|
||||||
|
|
||||||
expect(restoredFreedraw.strokeShape).toBe("fixed");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should restore legacy stable freedraw element as fixed", () => {
|
|
||||||
const restoredFreedraw = restore.restoreElements(
|
|
||||||
[
|
|
||||||
{
|
|
||||||
...API.createElement({
|
|
||||||
type: "freedraw",
|
|
||||||
id: "id-freedraw03",
|
|
||||||
points: [pointFrom(0, 0), pointFrom(10, 10)],
|
|
||||||
}),
|
|
||||||
strokeShape: "stable",
|
|
||||||
} as any,
|
|
||||||
],
|
|
||||||
null,
|
|
||||||
)[0] as ExcalidrawFreeDrawElement;
|
|
||||||
|
|
||||||
expect(restoredFreedraw.strokeShape).toBe("fixed");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should restore line and draw elements correctly", () => {
|
it("should restore line and draw elements correctly", () => {
|
||||||
const lineElement = API.createElement({ type: "line", id: "id-line01" });
|
const lineElement = API.createElement({ type: "line", id: "id-line01" });
|
||||||
|
|
||||||
@@ -675,26 +641,6 @@ describe("restoreAppState", () => {
|
|||||||
expect(restoredAppState.name).toBe(stubImportedAppState.name);
|
expect(restoredAppState.name).toBe(stubImportedAppState.name);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("should restore fixed freedraw stroke type from app state", () => {
|
|
||||||
const restoredAppState = restore.restoreAppState(
|
|
||||||
{ currentItemStrokeShape: "fixed" } as ImportedDataState["appState"],
|
|
||||||
null,
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(restoredAppState.currentItemStrokeShape).toBe("fixed");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should restore legacy stable freedraw stroke type from app state as fixed", () => {
|
|
||||||
const restoredAppState = restore.restoreAppState(
|
|
||||||
{
|
|
||||||
currentItemStrokeShape: "stable",
|
|
||||||
} as unknown as ImportedDataState["appState"],
|
|
||||||
null,
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(restoredAppState.currentItemStrokeShape).toBe("fixed");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should return local app state when imported data state is null", () => {
|
it("should return local app state when imported data state is null", () => {
|
||||||
const stubLocalAppState = getDefaultAppState();
|
const stubLocalAppState = getDefaultAppState();
|
||||||
stubLocalAppState.cursorButton = "down";
|
stubLocalAppState.cursorButton = "down";
|
||||||
|
|||||||
@@ -1,78 +0,0 @@
|
|||||||
import React from "react";
|
|
||||||
|
|
||||||
import { Excalidraw } from "../index";
|
|
||||||
import { API } from "./helpers/api";
|
|
||||||
import { Pointer, UI } from "./helpers/ui";
|
|
||||||
import { render } from "./test-utils";
|
|
||||||
|
|
||||||
describe("freedraw", () => {
|
|
||||||
beforeEach(async () => {
|
|
||||||
await render(<Excalidraw />);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("rounds stored points and drops duplicates after rounding", () => {
|
|
||||||
const mouse = new Pointer("mouse");
|
|
||||||
|
|
||||||
UI.clickTool("freedraw");
|
|
||||||
mouse.downAt(10, 20);
|
|
||||||
mouse.moveTo(10.1234, 20.5678);
|
|
||||||
mouse.moveTo(10.1249, 20.5681);
|
|
||||||
mouse.upAt(20.9999, 30.0001);
|
|
||||||
|
|
||||||
const freedraw = window.h.elements.at(-1);
|
|
||||||
|
|
||||||
expect(freedraw).toEqual(expect.objectContaining({ type: "freedraw" }));
|
|
||||||
expect((freedraw as any).points).toEqual([
|
|
||||||
[0, 0],
|
|
||||||
[0.12, 0.57],
|
|
||||||
[11, 10],
|
|
||||||
]);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("does not snap fixed strokes closed when ending near the start point", () => {
|
|
||||||
const mouse = new Pointer("mouse");
|
|
||||||
|
|
||||||
API.setAppState({ currentItemStrokeShape: "fixed" });
|
|
||||||
UI.clickTool("freedraw");
|
|
||||||
mouse.downAt(10, 10);
|
|
||||||
mouse.moveTo(40, 10);
|
|
||||||
mouse.moveTo(30, 30);
|
|
||||||
mouse.upAt(12, 12);
|
|
||||||
|
|
||||||
const freedraw = window.h.elements.at(-1) as any;
|
|
||||||
|
|
||||||
expect(freedraw.points[0]).toEqual([0, 0]);
|
|
||||||
expect(freedraw.points.at(-1)).not.toEqual([0, 0]);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("coalesces nearly straight fixed freedraw points at the tip", () => {
|
|
||||||
const mouse = new Pointer("mouse");
|
|
||||||
|
|
||||||
API.setAppState({ currentItemStrokeShape: "fixed" });
|
|
||||||
UI.clickTool("freedraw");
|
|
||||||
mouse.downAt(10, 10);
|
|
||||||
|
|
||||||
[
|
|
||||||
[10.2, 10.01],
|
|
||||||
[10.4, 10.03],
|
|
||||||
[10.6, 10.02],
|
|
||||||
[10.8, 10.04],
|
|
||||||
[11, 10.03],
|
|
||||||
[11.2, 10.05],
|
|
||||||
[11.4, 10.04],
|
|
||||||
[11.6, 10.06],
|
|
||||||
[11.8, 10.05],
|
|
||||||
].forEach(([x, y]) => {
|
|
||||||
mouse.moveTo(x, y);
|
|
||||||
});
|
|
||||||
mouse.upAt(12, 10.05);
|
|
||||||
|
|
||||||
const freedraw = window.h.elements.at(-1) as any;
|
|
||||||
|
|
||||||
expect(freedraw.points.length).toBeLessThan(5);
|
|
||||||
expect(freedraw.points).toEqual([
|
|
||||||
[0, 0],
|
|
||||||
[2, 0.05],
|
|
||||||
]);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -201,9 +201,6 @@ export class API {
|
|||||||
? ExcalidrawTextElement["containerId"]
|
? ExcalidrawTextElement["containerId"]
|
||||||
: never;
|
: never;
|
||||||
points?: T extends "arrow" | "line" | "freedraw" ? readonly LocalPoint[] : never;
|
points?: T extends "arrow" | "line" | "freedraw" ? readonly LocalPoint[] : never;
|
||||||
strokeShape?: T extends "freedraw"
|
|
||||||
? ExcalidrawFreeDrawElement["strokeShape"]
|
|
||||||
: never;
|
|
||||||
locked?: boolean;
|
locked?: boolean;
|
||||||
fileId?: T extends "image" ? string : never;
|
fileId?: T extends "image" ? string : never;
|
||||||
scale?: T extends "image" ? ExcalidrawImageElement["scale"] : never;
|
scale?: T extends "image" ? ExcalidrawImageElement["scale"] : never;
|
||||||
@@ -321,7 +318,6 @@ export class API {
|
|||||||
type: type as "freedraw",
|
type: type as "freedraw",
|
||||||
simulatePressure: true,
|
simulatePressure: true,
|
||||||
points: rest.points,
|
points: rest.points,
|
||||||
strokeShape: rest.strokeShape ?? appState.currentItemStrokeShape,
|
|
||||||
...base,
|
...base,
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ import type { GlobalPoint, LocalPoint, Radians } from "@excalidraw/math";
|
|||||||
import type { TransformHandleType } from "@excalidraw/element";
|
import type { TransformHandleType } from "@excalidraw/element";
|
||||||
import type {
|
import type {
|
||||||
ExcalidrawElement,
|
ExcalidrawElement,
|
||||||
ExcalidrawFreeDrawElement,
|
|
||||||
ExcalidrawLinearElement,
|
ExcalidrawLinearElement,
|
||||||
ExcalidrawTextElement,
|
ExcalidrawTextElement,
|
||||||
ExcalidrawArrowElement,
|
ExcalidrawArrowElement,
|
||||||
@@ -433,10 +432,8 @@ type DrawingToolName = Exclude<
|
|||||||
"lock" | "selection" | "eraser" | "lasso"
|
"lock" | "selection" | "eraser" | "lasso"
|
||||||
>;
|
>;
|
||||||
|
|
||||||
type Element<T extends DrawingToolName> = T extends "line"
|
type Element<T extends DrawingToolName> = T extends "line" | "freedraw"
|
||||||
? ExcalidrawLinearElement
|
? ExcalidrawLinearElement
|
||||||
: T extends "freedraw"
|
|
||||||
? ExcalidrawFreeDrawElement
|
|
||||||
: T extends "arrow"
|
: T extends "arrow"
|
||||||
? ExcalidrawArrowElement
|
? ExcalidrawArrowElement
|
||||||
: T extends "text"
|
: T extends "text"
|
||||||
|
|||||||
@@ -615,6 +615,32 @@ describe("box-selection overlap mode", () => {
|
|||||||
|
|
||||||
assertSelectedElements([]);
|
assertSelectedElements([]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("should not select a framed element when selection only overlaps its clipped-out outline", () => {
|
||||||
|
const frame = API.createElement({
|
||||||
|
type: "frame",
|
||||||
|
x: 100,
|
||||||
|
y: 100,
|
||||||
|
width: 100,
|
||||||
|
height: 100,
|
||||||
|
});
|
||||||
|
const rect1 = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
x: 50,
|
||||||
|
y: 50,
|
||||||
|
width: 200,
|
||||||
|
height: 200,
|
||||||
|
frameId: frame.id,
|
||||||
|
backgroundColor: "red",
|
||||||
|
fillStyle: "solid",
|
||||||
|
});
|
||||||
|
|
||||||
|
API.setElements([frame, rect1]);
|
||||||
|
|
||||||
|
boxSelect(40, 170, 70, 220);
|
||||||
|
|
||||||
|
assertSelectedElements([]);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("inner box-selection", () => {
|
describe("inner box-selection", () => {
|
||||||
|
|||||||
@@ -0,0 +1,833 @@
|
|||||||
|
import { arrayToMap } from "@excalidraw/common";
|
||||||
|
import {
|
||||||
|
pointFrom,
|
||||||
|
rangeInclusive,
|
||||||
|
type GlobalPoint,
|
||||||
|
type Radians,
|
||||||
|
} from "@excalidraw/math";
|
||||||
|
|
||||||
|
import type { ExcalidrawElement } from "@excalidraw/element/types";
|
||||||
|
|
||||||
|
import { getDefaultAppState } from "../appState";
|
||||||
|
import {
|
||||||
|
getElementsCorners,
|
||||||
|
getVisibleGaps,
|
||||||
|
getReferenceSnapPoints,
|
||||||
|
SnapCache,
|
||||||
|
snapDraggedElements,
|
||||||
|
} from "../snapping";
|
||||||
|
|
||||||
|
import { API } from "./helpers/api";
|
||||||
|
|
||||||
|
import type {
|
||||||
|
AppClassProperties,
|
||||||
|
AppState,
|
||||||
|
NormalizedZoomValue,
|
||||||
|
} from "../types";
|
||||||
|
|
||||||
|
type ReferenceSnapPoints = NonNullable<
|
||||||
|
ReturnType<typeof SnapCache.getReferenceSnapPoints>
|
||||||
|
>;
|
||||||
|
|
||||||
|
const NO_MODIFIER_KEYS = {
|
||||||
|
altKey: false,
|
||||||
|
ctrlKey: false,
|
||||||
|
metaKey: false,
|
||||||
|
shiftKey: false,
|
||||||
|
};
|
||||||
|
|
||||||
|
const createSnappingApp = (appState: Partial<AppState> = {}) =>
|
||||||
|
({
|
||||||
|
props: {},
|
||||||
|
state: {
|
||||||
|
...getDefaultAppState(),
|
||||||
|
objectsSnapModeEnabled: true,
|
||||||
|
width: 1000,
|
||||||
|
height: 1000,
|
||||||
|
offsetLeft: 0,
|
||||||
|
offsetTop: 0,
|
||||||
|
...appState,
|
||||||
|
},
|
||||||
|
} as AppClassProperties);
|
||||||
|
|
||||||
|
const getHorizontalPointSnapLineCoordinates = (
|
||||||
|
snapLines: ReturnType<typeof snapDraggedElements>["snapLines"],
|
||||||
|
) => {
|
||||||
|
return snapLines
|
||||||
|
.filter((snapLine) => snapLine.type === "points")
|
||||||
|
.filter((snapLine) => {
|
||||||
|
const [firstPoint, lastPoint] = snapLine.points;
|
||||||
|
|
||||||
|
return firstPoint[1] === lastPoint[1];
|
||||||
|
})
|
||||||
|
.map((snapLine) => {
|
||||||
|
return snapLine.points[0][1];
|
||||||
|
})
|
||||||
|
.sort((a, b) => a - b);
|
||||||
|
};
|
||||||
|
|
||||||
|
const getVerticalPointSnapLineCoordinates = (
|
||||||
|
snapLines: ReturnType<typeof snapDraggedElements>["snapLines"],
|
||||||
|
) => {
|
||||||
|
return snapLines
|
||||||
|
.filter((snapLine) => snapLine.type === "points")
|
||||||
|
.filter((snapLine) => {
|
||||||
|
const [firstPoint, lastPoint] = snapLine.points;
|
||||||
|
|
||||||
|
return firstPoint[0] === lastPoint[0];
|
||||||
|
})
|
||||||
|
.map((snapLine) => {
|
||||||
|
return snapLine.points[0][0];
|
||||||
|
})
|
||||||
|
.sort((a, b) => a - b);
|
||||||
|
};
|
||||||
|
|
||||||
|
const getHorizontalPointSnapLineMaxX = (
|
||||||
|
snapLines: ReturnType<typeof snapDraggedElements>["snapLines"],
|
||||||
|
) => {
|
||||||
|
const horizontalSnapLine = snapLines
|
||||||
|
.filter((snapLine) => snapLine.type === "points")
|
||||||
|
.find((snapLine) => {
|
||||||
|
const [firstPoint, lastPoint] = snapLine.points;
|
||||||
|
|
||||||
|
return firstPoint[1] === lastPoint[1];
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!horizontalSnapLine) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return horizontalSnapLine.points[horizontalSnapLine.points.length - 1][0];
|
||||||
|
};
|
||||||
|
|
||||||
|
const getHorizontalPointSnapLineXRange = (
|
||||||
|
snapLines: ReturnType<typeof snapDraggedElements>["snapLines"],
|
||||||
|
) => {
|
||||||
|
const horizontalSnapLine = snapLines
|
||||||
|
.filter((snapLine) => snapLine.type === "points")
|
||||||
|
.find((snapLine) => {
|
||||||
|
const [firstPoint, lastPoint] = snapLine.points;
|
||||||
|
|
||||||
|
return firstPoint[1] === lastPoint[1];
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!horizontalSnapLine) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return [
|
||||||
|
horizontalSnapLine.points[0][0],
|
||||||
|
horizontalSnapLine.points[horizontalSnapLine.points.length - 1][0],
|
||||||
|
] as const;
|
||||||
|
};
|
||||||
|
|
||||||
|
const getHorizontalGapSnapLines = (
|
||||||
|
snapLines: ReturnType<typeof snapDraggedElements>["snapLines"],
|
||||||
|
) => {
|
||||||
|
return snapLines.filter(
|
||||||
|
(snapLine) =>
|
||||||
|
snapLine.type === "gap" && snapLine.direction === "horizontal",
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const getVerticalGapSnapLines = (
|
||||||
|
snapLines: ReturnType<typeof snapDraggedElements>["snapLines"],
|
||||||
|
) => {
|
||||||
|
return snapLines.filter(
|
||||||
|
(snapLine) => snapLine.type === "gap" && snapLine.direction === "vertical",
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const getPointKeys = (points: ReturnType<typeof getElementsCorners>) => {
|
||||||
|
return points.map((point) => point.join(","));
|
||||||
|
};
|
||||||
|
|
||||||
|
const getReferenceSnapPointKeys = (
|
||||||
|
elements: ExcalidrawElement[],
|
||||||
|
selectedElements: ExcalidrawElement[],
|
||||||
|
app: AppClassProperties,
|
||||||
|
) => {
|
||||||
|
return new Set(
|
||||||
|
getReferenceSnapPoints(
|
||||||
|
elements,
|
||||||
|
selectedElements,
|
||||||
|
app.state,
|
||||||
|
arrayToMap(elements),
|
||||||
|
).map((snapPoint) => snapPoint.point.join(",")),
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const primeReferenceSnapPoints = (
|
||||||
|
elements: ExcalidrawElement[],
|
||||||
|
selectedElements: ExcalidrawElement[],
|
||||||
|
) => {
|
||||||
|
const selectedElementIds = new Set(
|
||||||
|
selectedElements.map((element) => element.id),
|
||||||
|
);
|
||||||
|
const elementsMap = arrayToMap(elements);
|
||||||
|
|
||||||
|
SnapCache.setReferenceSnapPoints(
|
||||||
|
elements
|
||||||
|
.filter((element) => !selectedElementIds.has(element.id))
|
||||||
|
.flatMap((element) => {
|
||||||
|
const corners = getElementsCorners([element], elementsMap);
|
||||||
|
|
||||||
|
return corners.map((point, index) => ({
|
||||||
|
point,
|
||||||
|
type: index === corners.length - 1 ? "center" : "outer",
|
||||||
|
snapSourceId: element.id,
|
||||||
|
}));
|
||||||
|
}) as Parameters<typeof SnapCache.setReferenceSnapPoints>[0],
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
describe("snapping", () => {
|
||||||
|
afterEach(() => {
|
||||||
|
SnapCache.destroy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("does not use frame children as references when snapping outside elements", () => {
|
||||||
|
const frame = API.createElement({
|
||||||
|
type: "frame",
|
||||||
|
id: "frame",
|
||||||
|
x: 0,
|
||||||
|
y: 0,
|
||||||
|
width: 300,
|
||||||
|
height: 300,
|
||||||
|
});
|
||||||
|
const frameChild = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "frameChild",
|
||||||
|
x: 37,
|
||||||
|
y: 53,
|
||||||
|
width: 71,
|
||||||
|
height: 83,
|
||||||
|
frameId: frame.id,
|
||||||
|
});
|
||||||
|
const selected = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "selected",
|
||||||
|
x: 400,
|
||||||
|
y: 50,
|
||||||
|
width: 100,
|
||||||
|
height: 100,
|
||||||
|
});
|
||||||
|
const elements = [frame, frameChild, selected];
|
||||||
|
const app = createSnappingApp({
|
||||||
|
selectedElementIds: { [selected.id]: true },
|
||||||
|
});
|
||||||
|
|
||||||
|
const referenceSnapPointKeys = getReferenceSnapPointKeys(
|
||||||
|
elements,
|
||||||
|
[selected],
|
||||||
|
app,
|
||||||
|
);
|
||||||
|
const frameChildPointKeys = getPointKeys(
|
||||||
|
getElementsCorners([frameChild], arrayToMap(elements)),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(
|
||||||
|
frameChildPointKeys.some((pointKey) =>
|
||||||
|
referenceSnapPointKeys.has(pointKey),
|
||||||
|
),
|
||||||
|
).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("uses frame siblings as references when snapping elements in the same frame", () => {
|
||||||
|
const frame = API.createElement({
|
||||||
|
type: "frame",
|
||||||
|
id: "frame",
|
||||||
|
x: 0,
|
||||||
|
y: 0,
|
||||||
|
width: 300,
|
||||||
|
height: 300,
|
||||||
|
});
|
||||||
|
const sibling = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "sibling",
|
||||||
|
x: 37,
|
||||||
|
y: 53,
|
||||||
|
width: 71,
|
||||||
|
height: 83,
|
||||||
|
frameId: frame.id,
|
||||||
|
});
|
||||||
|
const selected = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "selected",
|
||||||
|
x: 150,
|
||||||
|
y: 50,
|
||||||
|
width: 100,
|
||||||
|
height: 100,
|
||||||
|
frameId: frame.id,
|
||||||
|
});
|
||||||
|
const elements = [frame, sibling, selected];
|
||||||
|
const app = createSnappingApp({
|
||||||
|
selectedElementIds: { [selected.id]: true },
|
||||||
|
});
|
||||||
|
|
||||||
|
const referenceSnapPointKeys = getReferenceSnapPointKeys(
|
||||||
|
elements,
|
||||||
|
[selected],
|
||||||
|
app,
|
||||||
|
);
|
||||||
|
const siblingPointKeys = getPointKeys(
|
||||||
|
getElementsCorners([sibling], arrayToMap(elements)),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(
|
||||||
|
siblingPointKeys.some((pointKey) => referenceSnapPointKeys.has(pointKey)),
|
||||||
|
).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("does not use frame children as references when snapping the frame itself", () => {
|
||||||
|
const frame = API.createElement({
|
||||||
|
type: "frame",
|
||||||
|
id: "frame",
|
||||||
|
x: 0,
|
||||||
|
y: 0,
|
||||||
|
width: 300,
|
||||||
|
height: 300,
|
||||||
|
});
|
||||||
|
const frameChild = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "frameChild",
|
||||||
|
x: 37,
|
||||||
|
y: 53,
|
||||||
|
width: 71,
|
||||||
|
height: 83,
|
||||||
|
frameId: frame.id,
|
||||||
|
});
|
||||||
|
const elements = [frame, frameChild];
|
||||||
|
const app = createSnappingApp({
|
||||||
|
selectedElementIds: { [frame.id]: true },
|
||||||
|
});
|
||||||
|
|
||||||
|
const referenceSnapPointKeys = getReferenceSnapPointKeys(
|
||||||
|
elements,
|
||||||
|
[frame],
|
||||||
|
app,
|
||||||
|
);
|
||||||
|
const frameChildPointKeys = getPointKeys(
|
||||||
|
getElementsCorners([frameChild], arrayToMap(elements)),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(
|
||||||
|
frameChildPointKeys.some((pointKey) =>
|
||||||
|
referenceSnapPointKeys.has(pointKey),
|
||||||
|
),
|
||||||
|
).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("does not use frame children as visible gap references when snapping outside elements", () => {
|
||||||
|
const frame = API.createElement({
|
||||||
|
type: "frame",
|
||||||
|
id: "frame",
|
||||||
|
x: 0,
|
||||||
|
y: 0,
|
||||||
|
width: 500,
|
||||||
|
height: 300,
|
||||||
|
});
|
||||||
|
const frameChildA = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "frameChildA",
|
||||||
|
x: 50,
|
||||||
|
y: 50,
|
||||||
|
width: 100,
|
||||||
|
height: 100,
|
||||||
|
frameId: frame.id,
|
||||||
|
});
|
||||||
|
const frameChildB = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "frameChildB",
|
||||||
|
x: 250,
|
||||||
|
y: 50,
|
||||||
|
width: 100,
|
||||||
|
height: 100,
|
||||||
|
frameId: frame.id,
|
||||||
|
});
|
||||||
|
const selected = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "selected",
|
||||||
|
x: 700,
|
||||||
|
y: 50,
|
||||||
|
width: 100,
|
||||||
|
height: 100,
|
||||||
|
});
|
||||||
|
const elements = [frame, frameChildA, frameChildB, selected];
|
||||||
|
const app = createSnappingApp({
|
||||||
|
selectedElementIds: { [selected.id]: true },
|
||||||
|
});
|
||||||
|
|
||||||
|
const visibleGaps = getVisibleGaps(
|
||||||
|
elements,
|
||||||
|
[selected],
|
||||||
|
app.state,
|
||||||
|
arrayToMap(elements),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(visibleGaps.horizontalGaps).toHaveLength(0);
|
||||||
|
expect(visibleGaps.verticalGaps).toHaveLength(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("filters center and inner outer point snaplines for the same reference", () => {
|
||||||
|
const angle = 0.68 as Radians;
|
||||||
|
const reference = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "reference",
|
||||||
|
x: 0,
|
||||||
|
y: 0,
|
||||||
|
width: 140,
|
||||||
|
height: 140,
|
||||||
|
angle,
|
||||||
|
});
|
||||||
|
const selected = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "selected",
|
||||||
|
x: 200,
|
||||||
|
y: 0,
|
||||||
|
width: 140,
|
||||||
|
height: 140,
|
||||||
|
angle,
|
||||||
|
});
|
||||||
|
const elements = [reference, selected];
|
||||||
|
const app = createSnappingApp({
|
||||||
|
selectedElementIds: { [selected.id]: true },
|
||||||
|
});
|
||||||
|
|
||||||
|
primeReferenceSnapPoints(elements, [selected]);
|
||||||
|
|
||||||
|
const { snapLines } = snapDraggedElements(
|
||||||
|
elements,
|
||||||
|
{ x: 0, y: 0 },
|
||||||
|
app,
|
||||||
|
NO_MODIFIER_KEYS,
|
||||||
|
arrayToMap(elements),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(getHorizontalPointSnapLineCoordinates(snapLines)).toHaveLength(2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("keeps a snapline that is redundant for one reference but needed for another", () => {
|
||||||
|
const angle = 0.68 as Radians;
|
||||||
|
const selected = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "selected",
|
||||||
|
x: 200,
|
||||||
|
y: 0,
|
||||||
|
width: 140,
|
||||||
|
height: 140,
|
||||||
|
angle,
|
||||||
|
});
|
||||||
|
const elements = [selected];
|
||||||
|
const elementsMap = arrayToMap(elements);
|
||||||
|
const selectedSnapPoints = getElementsCorners([selected], elementsMap);
|
||||||
|
const outerSnapPoints = selectedSnapPoints.slice(0, -1);
|
||||||
|
const centerSnapPoint = selectedSnapPoints[selectedSnapPoints.length - 1];
|
||||||
|
const innerOuterSnapPoint = [...outerSnapPoints].sort(
|
||||||
|
(a, b) => a[1] - b[1],
|
||||||
|
)[1];
|
||||||
|
const app = createSnappingApp({
|
||||||
|
selectedElementIds: { [selected.id]: true },
|
||||||
|
});
|
||||||
|
|
||||||
|
const referenceSnapPoints: ReferenceSnapPoints = [
|
||||||
|
...outerSnapPoints.map((point) => ({
|
||||||
|
point: pointFrom<GlobalPoint>(point[0] - 200, point[1]),
|
||||||
|
type: "outer" as const,
|
||||||
|
snapSourceId: "referenceA",
|
||||||
|
})),
|
||||||
|
{
|
||||||
|
point: pointFrom<GlobalPoint>(
|
||||||
|
centerSnapPoint[0] - 200,
|
||||||
|
centerSnapPoint[1],
|
||||||
|
),
|
||||||
|
type: "center" as const,
|
||||||
|
snapSourceId: "referenceA",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
point: pointFrom<GlobalPoint>(
|
||||||
|
innerOuterSnapPoint[0] - 300,
|
||||||
|
innerOuterSnapPoint[1],
|
||||||
|
),
|
||||||
|
type: "outer" as const,
|
||||||
|
snapSourceId: "referenceB",
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
SnapCache.setReferenceSnapPoints(referenceSnapPoints);
|
||||||
|
|
||||||
|
const { snapLines } = snapDraggedElements(
|
||||||
|
elements,
|
||||||
|
{ x: 0, y: 0 },
|
||||||
|
app,
|
||||||
|
NO_MODIFIER_KEYS,
|
||||||
|
elementsMap,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(getHorizontalPointSnapLineCoordinates(snapLines)).toHaveLength(3);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("keeps a center snapline when no outer snaplines imply it", () => {
|
||||||
|
const reference = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "reference",
|
||||||
|
x: 0,
|
||||||
|
y: 0,
|
||||||
|
width: 100,
|
||||||
|
height: 100,
|
||||||
|
});
|
||||||
|
const selected = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "selected",
|
||||||
|
x: 200,
|
||||||
|
y: 25,
|
||||||
|
width: 50,
|
||||||
|
height: 50,
|
||||||
|
});
|
||||||
|
const elements = [reference, selected];
|
||||||
|
const app = createSnappingApp({
|
||||||
|
selectedElementIds: { [selected.id]: true },
|
||||||
|
});
|
||||||
|
|
||||||
|
primeReferenceSnapPoints(elements, [selected]);
|
||||||
|
|
||||||
|
const { snapLines } = snapDraggedElements(
|
||||||
|
elements,
|
||||||
|
{ x: 0, y: 0 },
|
||||||
|
app,
|
||||||
|
NO_MODIFIER_KEYS,
|
||||||
|
arrayToMap(elements),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(getHorizontalPointSnapLineCoordinates(snapLines)).toEqual([50]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("filters center snaplines when matching outer offsets differ by rounding precision", () => {
|
||||||
|
const selected = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "selected",
|
||||||
|
x: 2532.227563984471,
|
||||||
|
y: -1553.9657067952232,
|
||||||
|
width: 140.1015625,
|
||||||
|
height: 140.1015625,
|
||||||
|
});
|
||||||
|
const reference = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "reference",
|
||||||
|
x: 2532.2275640966914,
|
||||||
|
y: -1299.4323092037737,
|
||||||
|
width: 140.1015625,
|
||||||
|
height: 140.1015625,
|
||||||
|
});
|
||||||
|
const elements = [reference, selected];
|
||||||
|
const app = createSnappingApp({
|
||||||
|
selectedElementIds: { [selected.id]: true },
|
||||||
|
});
|
||||||
|
|
||||||
|
primeReferenceSnapPoints(elements, [selected]);
|
||||||
|
|
||||||
|
const { snapLines } = snapDraggedElements(
|
||||||
|
elements,
|
||||||
|
{ x: 0, y: 0 },
|
||||||
|
app,
|
||||||
|
NO_MODIFIER_KEYS,
|
||||||
|
arrayToMap(elements),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(getVerticalPointSnapLineCoordinates(snapLines)).toEqual([
|
||||||
|
2532.227564, 2672.329126,
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("keeps outer snaplines stable while dragging a snapped element through rounding-equivalent offsets", () => {
|
||||||
|
const referenceMiddle = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "referenceMiddle",
|
||||||
|
x: 2532.22756398447,
|
||||||
|
y: -1553.9657067952237,
|
||||||
|
width: 140.1015625,
|
||||||
|
height: 140.1015625,
|
||||||
|
});
|
||||||
|
const referenceAbove = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "referenceAbove",
|
||||||
|
x: 2532.2275637826165,
|
||||||
|
y: -1779.7363232531268,
|
||||||
|
width: 140.1015625,
|
||||||
|
height: 140.1015625,
|
||||||
|
});
|
||||||
|
const selected = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "selected",
|
||||||
|
x: 2532.227563096691,
|
||||||
|
y: -1328.1950902037736,
|
||||||
|
width: 140.1015625,
|
||||||
|
height: 140.1015625,
|
||||||
|
});
|
||||||
|
const elements = [referenceAbove, referenceMiddle, selected];
|
||||||
|
const app = createSnappingApp({
|
||||||
|
selectedElementIds: { [selected.id]: true },
|
||||||
|
});
|
||||||
|
|
||||||
|
primeReferenceSnapPoints(elements, [selected]);
|
||||||
|
|
||||||
|
for (const dragOffsetX of [-4, -1, -0.1, 0, 0.1, 1, 4]) {
|
||||||
|
const { snapLines } = snapDraggedElements(
|
||||||
|
elements,
|
||||||
|
{ x: dragOffsetX, y: 0 },
|
||||||
|
app,
|
||||||
|
NO_MODIFIER_KEYS,
|
||||||
|
arrayToMap(elements),
|
||||||
|
);
|
||||||
|
const coordinates = getVerticalPointSnapLineCoordinates(snapLines);
|
||||||
|
|
||||||
|
expect(coordinates).toHaveLength(2);
|
||||||
|
expect(coordinates[1] - coordinates[0]).toBeCloseTo(selected.width, 5);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it("keeps same-offset point snaps even across distant references", () => {
|
||||||
|
const selected = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "selected",
|
||||||
|
x: 0,
|
||||||
|
y: 0,
|
||||||
|
width: 100,
|
||||||
|
height: 100,
|
||||||
|
});
|
||||||
|
const elements = [selected];
|
||||||
|
const app = createSnappingApp({
|
||||||
|
selectedElementIds: { [selected.id]: true },
|
||||||
|
});
|
||||||
|
|
||||||
|
SnapCache.setReferenceSnapPoints([
|
||||||
|
{
|
||||||
|
point: pointFrom<GlobalPoint>(220, 50),
|
||||||
|
type: "center",
|
||||||
|
snapSourceId: "near",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
point: pointFrom<GlobalPoint>(900, 50),
|
||||||
|
type: "center",
|
||||||
|
snapSourceId: "far",
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
const { snapLines } = snapDraggedElements(
|
||||||
|
elements,
|
||||||
|
{ x: 0, y: 0 },
|
||||||
|
app,
|
||||||
|
NO_MODIFIER_KEYS,
|
||||||
|
arrayToMap(elements),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(getHorizontalPointSnapLineMaxX(snapLines)).toBe(900);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("prefers a nearby point snap over a slightly better far offset", () => {
|
||||||
|
const selected = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "selected",
|
||||||
|
x: 0,
|
||||||
|
y: 0,
|
||||||
|
width: 100,
|
||||||
|
height: 100,
|
||||||
|
});
|
||||||
|
const elements = [selected];
|
||||||
|
const app = createSnappingApp({
|
||||||
|
selectedElementIds: { [selected.id]: true },
|
||||||
|
});
|
||||||
|
|
||||||
|
SnapCache.setReferenceSnapPoints([
|
||||||
|
{
|
||||||
|
point: pointFrom<GlobalPoint>(220, 54),
|
||||||
|
type: "center",
|
||||||
|
snapSourceId: "near",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
point: pointFrom<GlobalPoint>(900, 50),
|
||||||
|
type: "center",
|
||||||
|
snapSourceId: "far",
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
const { snapOffset, snapLines } = snapDraggedElements(
|
||||||
|
elements,
|
||||||
|
{ x: 0, y: 0 },
|
||||||
|
app,
|
||||||
|
NO_MODIFIER_KEYS,
|
||||||
|
arrayToMap(elements),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(snapOffset.y).toBe(4);
|
||||||
|
expect(getHorizontalPointSnapLineMaxX(snapLines)).toBe(220);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("keeps same-offset point snaps when references form a continuous cluster", () => {
|
||||||
|
const selected = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "selected",
|
||||||
|
x: 0,
|
||||||
|
y: 0,
|
||||||
|
width: 100,
|
||||||
|
height: 100,
|
||||||
|
});
|
||||||
|
const elements = [selected];
|
||||||
|
const app = createSnappingApp({
|
||||||
|
selectedElementIds: { [selected.id]: true },
|
||||||
|
});
|
||||||
|
|
||||||
|
SnapCache.setReferenceSnapPoints([
|
||||||
|
{
|
||||||
|
point: pointFrom<GlobalPoint>(200, 50),
|
||||||
|
type: "center",
|
||||||
|
snapSourceId: "referenceA",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
point: pointFrom<GlobalPoint>(350, 50),
|
||||||
|
type: "center",
|
||||||
|
snapSourceId: "referenceB",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
point: pointFrom<GlobalPoint>(500, 50),
|
||||||
|
type: "center",
|
||||||
|
snapSourceId: "referenceC",
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
const { snapLines } = snapDraggedElements(
|
||||||
|
elements,
|
||||||
|
{ x: 0, y: 0 },
|
||||||
|
app,
|
||||||
|
NO_MODIFIER_KEYS,
|
||||||
|
arrayToMap(elements),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(getHorizontalPointSnapLineMaxX(snapLines)).toBe(500);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("keeps same-source same-offset point snaps across zoom-scaled cluster breaks", () => {
|
||||||
|
const reference = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "reference",
|
||||||
|
x: 0,
|
||||||
|
y: 0,
|
||||||
|
width: 140.1015625,
|
||||||
|
height: 140.1015625,
|
||||||
|
});
|
||||||
|
const selected = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "selected",
|
||||||
|
x: 338.608871112217,
|
||||||
|
y: 0,
|
||||||
|
width: 140.1015625,
|
||||||
|
height: 140.1015625,
|
||||||
|
});
|
||||||
|
const elements = [reference, selected];
|
||||||
|
const app = createSnappingApp({
|
||||||
|
selectedElementIds: { [selected.id]: true },
|
||||||
|
zoom: { value: 1.5 as NormalizedZoomValue },
|
||||||
|
});
|
||||||
|
|
||||||
|
primeReferenceSnapPoints(elements, [selected]);
|
||||||
|
|
||||||
|
const { snapLines } = snapDraggedElements(
|
||||||
|
elements,
|
||||||
|
{ x: 0, y: 0 },
|
||||||
|
app,
|
||||||
|
NO_MODIFIER_KEYS,
|
||||||
|
arrayToMap(elements),
|
||||||
|
);
|
||||||
|
|
||||||
|
const range = getHorizontalPointSnapLineXRange(snapLines);
|
||||||
|
|
||||||
|
expect(range).not.toBe(null);
|
||||||
|
expect(range![0]).toBeCloseTo(reference.x, 6);
|
||||||
|
expect(range![1]).toBeCloseTo(selected.x + selected.width, 6);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("renders gap snaplines when rounded bounds touch the reference gap overlap", () => {
|
||||||
|
const selected = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "selected",
|
||||||
|
x: 0,
|
||||||
|
y: 0.0000004,
|
||||||
|
width: 100,
|
||||||
|
height: 100,
|
||||||
|
});
|
||||||
|
const elements = [selected];
|
||||||
|
const app = createSnappingApp({
|
||||||
|
selectedElementIds: { [selected.id]: true },
|
||||||
|
});
|
||||||
|
|
||||||
|
SnapCache.setVisibleGaps({
|
||||||
|
horizontalGaps: [
|
||||||
|
{
|
||||||
|
startBounds: [200, -100, 300, 0],
|
||||||
|
endBounds: [400, -100, 500, 0],
|
||||||
|
startSide: [pointFrom(300, -100), pointFrom(300, 0)],
|
||||||
|
endSide: [pointFrom(400, -100), pointFrom(400, 0)],
|
||||||
|
overlap: rangeInclusive(-100, 0),
|
||||||
|
length: 100,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
verticalGaps: [],
|
||||||
|
});
|
||||||
|
|
||||||
|
const { snapLines } = snapDraggedElements(
|
||||||
|
elements,
|
||||||
|
{ x: 0, y: 0 },
|
||||||
|
app,
|
||||||
|
NO_MODIFIER_KEYS,
|
||||||
|
arrayToMap(elements),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(getHorizontalGapSnapLines(snapLines)).toHaveLength(2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("renders gap snaplines when the winning gap offset only differs by rounding precision", () => {
|
||||||
|
const selected = API.createElement({
|
||||||
|
type: "rectangle",
|
||||||
|
id: "selected",
|
||||||
|
x: 0,
|
||||||
|
y: 399.999999,
|
||||||
|
width: 100,
|
||||||
|
height: 100,
|
||||||
|
});
|
||||||
|
const elements = [selected];
|
||||||
|
const app = createSnappingApp({
|
||||||
|
selectedElementIds: { [selected.id]: true },
|
||||||
|
});
|
||||||
|
|
||||||
|
SnapCache.setReferenceSnapPoints([
|
||||||
|
{
|
||||||
|
point: pointFrom<GlobalPoint>(0, 399.999999),
|
||||||
|
type: "outer",
|
||||||
|
snapSourceId: "reference",
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
SnapCache.setVisibleGaps({
|
||||||
|
horizontalGaps: [],
|
||||||
|
verticalGaps: [
|
||||||
|
{
|
||||||
|
startBounds: [0, 100, 100, 200],
|
||||||
|
endBounds: [0, 250, 100, 350],
|
||||||
|
startSide: [pointFrom(0, 200), pointFrom(100, 200)],
|
||||||
|
endSide: [pointFrom(0, 250), pointFrom(100, 250)],
|
||||||
|
overlap: rangeInclusive(0, 100),
|
||||||
|
length: 50,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
|
||||||
|
const { snapLines } = snapDraggedElements(
|
||||||
|
elements,
|
||||||
|
{ x: 0, y: 0 },
|
||||||
|
app,
|
||||||
|
NO_MODIFIER_KEYS,
|
||||||
|
arrayToMap(elements),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(getVerticalGapSnapLines(snapLines)).toHaveLength(2);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -33,7 +33,6 @@ import type {
|
|||||||
ExcalidrawNonSelectionElement,
|
ExcalidrawNonSelectionElement,
|
||||||
BindMode,
|
BindMode,
|
||||||
ExcalidrawTextElement,
|
ExcalidrawTextElement,
|
||||||
FreeDrawStrokeShape,
|
|
||||||
} from "@excalidraw/element/types";
|
} from "@excalidraw/element/types";
|
||||||
|
|
||||||
import type {
|
import type {
|
||||||
@@ -316,7 +315,10 @@ export interface AppState {
|
|||||||
bindingPreference: "enabled" | "disabled";
|
bindingPreference: "enabled" | "disabled";
|
||||||
/** user preference whether arrow snap to midpoints while binding */
|
/** user preference whether arrow snap to midpoints while binding */
|
||||||
isMidpointSnappingEnabled: boolean;
|
isMidpointSnappingEnabled: boolean;
|
||||||
startBoundElement: NonDeleted<ExcalidrawBindableElement> | null;
|
/**
|
||||||
|
* The bindable element the UI highlights for the user when an arrow is
|
||||||
|
* dragged or otherwise its endpoint being close to said element.
|
||||||
|
*/
|
||||||
suggestedBinding: {
|
suggestedBinding: {
|
||||||
element: NonDeleted<ExcalidrawBindableElement>;
|
element: NonDeleted<ExcalidrawBindableElement>;
|
||||||
midPoint?: GlobalPoint;
|
midPoint?: GlobalPoint;
|
||||||
@@ -348,8 +350,11 @@ export interface AppState {
|
|||||||
type: "selection" | "lasso";
|
type: "selection" | "lasso";
|
||||||
initialized: boolean;
|
initialized: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Pen handling
|
||||||
penMode: boolean;
|
penMode: boolean;
|
||||||
penDetected: boolean;
|
penDetected: boolean;
|
||||||
|
|
||||||
exportBackground: boolean;
|
exportBackground: boolean;
|
||||||
exportEmbedScene: boolean;
|
exportEmbedScene: boolean;
|
||||||
exportWithDarkMode: boolean;
|
exportWithDarkMode: boolean;
|
||||||
@@ -359,7 +364,6 @@ export interface AppState {
|
|||||||
currentItemFillStyle: ExcalidrawElement["fillStyle"];
|
currentItemFillStyle: ExcalidrawElement["fillStyle"];
|
||||||
currentItemStrokeWidth: number;
|
currentItemStrokeWidth: number;
|
||||||
currentItemStrokeStyle: ExcalidrawElement["strokeStyle"];
|
currentItemStrokeStyle: ExcalidrawElement["strokeStyle"];
|
||||||
currentItemStrokeShape?: FreeDrawStrokeShape;
|
|
||||||
currentItemRoughness: number;
|
currentItemRoughness: number;
|
||||||
currentItemOpacity: number;
|
currentItemOpacity: number;
|
||||||
currentItemFontFamily: FontFamilyValues;
|
currentItemFontFamily: FontFamilyValues;
|
||||||
@@ -474,6 +478,9 @@ export interface AppState {
|
|||||||
// as elements are unlocked, we remove the groupId from the elements
|
// as elements are unlocked, we remove the groupId from the elements
|
||||||
// and also remove groupId from this map
|
// and also remove groupId from this map
|
||||||
lockedMultiSelections: { [groupId: string]: true };
|
lockedMultiSelections: { [groupId: string]: true };
|
||||||
|
// Stores the current bind mode which is detemined at various points during
|
||||||
|
// a drag operation (like pointer position vs bindable element) but needed
|
||||||
|
// globally for calculating the binding strategy
|
||||||
bindMode: BindMode;
|
bindMode: BindMode;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -489,10 +496,7 @@ export type SearchMatch = {
|
|||||||
}[];
|
}[];
|
||||||
};
|
};
|
||||||
|
|
||||||
export type UIAppState = Omit<
|
export type UIAppState = Omit<AppState, "cursorButton" | "scrollX" | "scrollY">;
|
||||||
AppState,
|
|
||||||
"startBoundElement" | "cursorButton" | "scrollX" | "scrollY"
|
|
||||||
>;
|
|
||||||
|
|
||||||
export type NormalizedZoomValue = number & { _brand: "normalizedZoom" };
|
export type NormalizedZoomValue = number & { _brand: "normalizedZoom" };
|
||||||
|
|
||||||
@@ -872,8 +876,13 @@ export type PointerDownState = Readonly<{
|
|||||||
// Whether selected element(s) were duplicated, might change during the
|
// Whether selected element(s) were duplicated, might change during the
|
||||||
// pointer interaction
|
// pointer interaction
|
||||||
hasBeenDuplicated: boolean;
|
hasBeenDuplicated: boolean;
|
||||||
|
// Whether the pointer is hitting the common bounding box of selected
|
||||||
|
// elements, which is useful for discriminating between selecitng
|
||||||
|
// the entire selection vs a specific element
|
||||||
hasHitCommonBoundingBoxOfSelectedElements: boolean;
|
hasHitCommonBoundingBoxOfSelectedElements: boolean;
|
||||||
};
|
};
|
||||||
|
// This is determined on the initial pointer down event to
|
||||||
|
// set various interaction modalities
|
||||||
withCmdOrCtrl: boolean;
|
withCmdOrCtrl: boolean;
|
||||||
drag: {
|
drag: {
|
||||||
// Might change during the pointer interaction
|
// Might change during the pointer interaction
|
||||||
@@ -890,7 +899,7 @@ export type PointerDownState = Readonly<{
|
|||||||
// We need to have these in the state so that we can unsubscribe them
|
// We need to have these in the state so that we can unsubscribe them
|
||||||
eventListeners: {
|
eventListeners: {
|
||||||
// It's defined on the initial pointer down event
|
// It's defined on the initial pointer down event
|
||||||
onMove: null | ((event: PointerEvent) => void);
|
onMove: null | ReturnType<typeof throttleRAF>;
|
||||||
// It's defined on the initial pointer down event
|
// It's defined on the initial pointer down event
|
||||||
onUp: null | ((event: PointerEvent) => void);
|
onUp: null | ((event: PointerEvent) => void);
|
||||||
// It's defined on the initial pointer down event
|
// It's defined on the initial pointer down event
|
||||||
@@ -899,6 +908,7 @@ export type PointerDownState = Readonly<{
|
|||||||
onKeyUp: null | ((event: KeyboardEvent) => void);
|
onKeyUp: null | ((event: KeyboardEvent) => void);
|
||||||
};
|
};
|
||||||
boxSelection: {
|
boxSelection: {
|
||||||
|
// If the box selection tool is activated on pointer down
|
||||||
hasOccurred: boolean;
|
hasOccurred: boolean;
|
||||||
};
|
};
|
||||||
}>;
|
}>;
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
export const PRECISION = 10e-5;
|
|
||||||
|
|
||||||
// Legendre-Gauss abscissae (x values) and weights for n=24
|
// Legendre-Gauss abscissae (x values) and weights for n=24
|
||||||
// Refeerence: https://pomax.github.io/bezierinfo/legendre-gauss.html
|
// Refeerence: https://pomax.github.io/bezierinfo/legendre-gauss.html
|
||||||
export const LegendreGaussN24TValues = [
|
export const LegendreGaussN24TValues = [
|
||||||
|
|||||||
@@ -98,7 +98,6 @@ exports[`exportToSvg > with default arguments 1`] = `
|
|||||||
"showHyperlinkPopup": false,
|
"showHyperlinkPopup": false,
|
||||||
"showWelcomeScreen": false,
|
"showWelcomeScreen": false,
|
||||||
"snapLines": [],
|
"snapLines": [],
|
||||||
"startBoundElement": null,
|
|
||||||
"stats": {
|
"stats": {
|
||||||
"open": false,
|
"open": false,
|
||||||
"panels": 3,
|
"panels": 3,
|
||||||
|
|||||||
Reference in New Issue
Block a user